Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -315,7 +315,7 @@ export default {
     };
   },
   created() {
-    this.getTableList();
+    // this.getTableList();
     this.searchGroup();
     this.getStraff();
     this.getStore();

src/views/salesleads/actCodeManage/staffActCode/views/batchAddCode.vue

@@ -78,13 +78,13 @@ export default {
       };
       await postJsonRequest('/haoban-manage3-web/hm/qrcode/addList', obj).then(res => {
         if (res.data.code == 0) {
-          this.form = {
-            hmType: 1,
-            clerkIdList: [],
-            hmUserNum: null //多人活码人数
-          };
           setTimeout(() => {
             this.$router.go(-1);
+            this.form = {
+              hmType: 1,
+              clerkIdList: [],
+              hmUserNum: null //多人活码人数
+            };
           }, 1000);
         } else {
           return this.$message.error(res.data.message);

src/views/salesleads/actCodeManage/staffActCode/views/setActCode.vue

@@ -110,14 +110,14 @@ export default {
         // 编辑
         await postJsonRequest('/haoban-manage3-web/hm/qrcode/update', obj).then(res => {
           if (res.data.code == 0) {
-            this.form = {
-              hmType: 1,
-              name: '',
-              clerkIdList: [],
-              hmUserNum: null //多人活码人数
-            };
             setTimeout(() => {
               this.$router.go(-1);
+              this.form = {
+                hmType: 1,
+                name: '',
+                clerkIdList: [],
+                hmUserNum: null //多人活码人数
+              };
             }, 1000);
           } else {
             return this.$message.error(res.data.message);
@@ -127,14 +127,14 @@ export default {
         // 新增
         await postJsonRequest('/haoban-manage3-web/hm/qrcode/add', obj).then(res => {
           if (res.data.code == 0) {
-            this.form = {
-              hmType: 1,
-              name: '',
-              clerkIdList: [],
-              hmUserNum: null //多人活码人数
-            };
             setTimeout(() => {
               this.$router.go(-1);
+              this.form = {
+                hmType: 1,
+                name: '',
+                clerkIdList: [],
+                hmUserNum: null //多人活码人数
+              };
             }, 1000);
           } else {
             return this.$message.error(res.data.message);

src/views/salesleads/components/welcomesItem.vue

@@ -52,16 +52,6 @@
                   </el-popover>
                   <div v-else>--</div>
                 </template>
-                <!-- <template slot-scope="{ row }">
-                  <div class="enclosureBox" v-for="item in row.welcomeMediaList" :key="item.welcomeId">
-                    <el-image class="img" :src="item.mediaUrl">
-                      <div slot="error" class="image-slot img">
-                        <i class="el-icon-picture-outline" style="font-size:40px;"></i>
-                      </div>
-                    </el-image>
-                    <p>{{ item.mediaTitle ? item.mediaTitle : '--' }}</p>
-                  </div>
-                </template> -->
               </el-table-column>
             </el-table>
             <el-pagination class="paginationBox" background @current-change="handleCurrentChange" :current-page="welcomePage.pageNum" layout=" prev, pager, next " :page-size="welcomePage.pageSize" :total="totalNum"></el-pagination>
@@ -203,8 +193,7 @@ export default {
       }
     },
     submit() {
-      if (this.welcomesType == 2) this.welcomeId = '';
-      // if (this.welcomeType == 2) ;
+      if (this.welcomesType == 2) return true;
       this.$emit('getWelcomeId', this.welcomeId);
       if (this.welcomesType == 1 && !this.welcomeId) {
         this.$message.error('请选择欢迎语');
@@ -229,13 +218,15 @@ export default {
             }
           });
         }
+        // if (val == null) {
+        //   this.welcomesType = 2;
+        // }
       },
       immediate: true,
       deep: true
     },
     welcomesType: {
       handler: function(val) {
-        console.log(val, '909090hjhj');
         if (val == 2) {
           this.welcomeId = '';
         }
@@ -305,21 +296,6 @@ export default {
     margin-top: 46px;
     margin-right: -4px;
   }
-  .enclosureBox {
-    display: flex;
-    align-items: center;
-    .img {
-      width: 40px;
-      height: 40px;
-      margin-right: 10px;
-    }
-    p {
-      width: 143px;
-      max-width: 143px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
   .flexBox {
     display: flex;
     justify-content: flex-start;