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

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

@@ -33,13 +33,13 @@ export default {
   data() {
     return {
       loading: false,
-      welcomeType: 1,
       form: {
-        passFlag: true,
-        welcomeId: '1',
+        passFlag: 1,
+        welcomeId: '',
         hmType: 1,
         name: '',
         clerkIdList: [],
+        welcomeType: 1,
         hmUserNum: null //多人活码人数
       },
       multiple: false,
@@ -58,7 +58,7 @@ export default {
       this.data = [];
       this.dataArr = [];
       if (e == 2) {
-        this.multiple = true;
+        this.multiple = 1;
         this.clerkDisabled = false;
       } else if (e == 1) {
         this.multiple = false;
@@ -86,6 +86,12 @@ export default {
       if (this.$route.query.hmId) {
         await getRequest('/haoban-manage3-web/hm/qrcode/detail', { hmId: this.$route.query.hmId }).then(res => {
           this.form = res.data.result;
+          if (this.form.welcomeId) {
+            this.form.welcomeType = 1;
+          } else {
+            this.form.welcomeType = 2;
+          }
+          this.form.passFlag = this.form.passFlag == 1 ? true : false;
           this.form.clerkIdList = this.form.clerkList.map(i => i.clerkId);
           this.form.hmUserNum = this.form.clerkIdList.length;
           this.data = res.data.result.clerkList;

src/views/salesleads/components/act-code-set.vue

@@ -23,7 +23,7 @@
           <dm-memberTag-group isHb :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
         </el-form-item>
         <dm-sub-title text="欢迎语设置" type="line" class="mt40b20" />
-        <welcomeItem @getWelcomeId="getWelcomeId" :welcomeId.sync="form.welcomeId" ref="welcomeItem" :welcomeType.sync="welcomeType" welcomeName="code"></welcomeItem>
+        <welcomeItem @getWelcomeId="getWelcomeId" :welcomeId.sync="form.welcomeId" ref="welcomeItem" :welcomeType.sync="form.welcomeType" welcomeName="code"></welcomeItem>
       </el-form>
     </div>
     <div class="saveBtn">
@@ -61,7 +61,6 @@ export default {
     return {
       btnLoading: false,
       saveLoading: false,
-      welcomeType: 1,
       form: {
         // hmType: 1, //1单人 2多人
         // name: '', // 名称
@@ -73,7 +72,8 @@ export default {
         // clerkIdList: '', // 选择导购id
         // storeId: '' //门店id
         // hmUserNum: null //多人活码人数
-        memberLabelStatus: -1
+        memberLabelStatus: -1,
+        welcomeType: 1
       },
       rules: {
         hmGroupId: [{ required: true, message: '请选择活码分组', trigger: 'blur' }]
@@ -177,6 +177,7 @@ export default {
           // this.form.passFlag = this.form.passFlag ? 1 : 0;
           this.btnLoading = true;
           this.saveLoading = true;
+          delete this.form.welcomeType;
           this.$emit('sumbit', this.form);
         }
       });
@@ -189,15 +190,16 @@ export default {
         if (val) {
           this.form = val;
           // this.form.hmGroupId = val.hmGroupId;
-          this.form.passFlag = val.passFlag == 1 ? true : false;
+          // this.form.passFlag = val.passFlag == 1 ? true : false;
           this.form.memberLabelId = val.memberLabelId ? val.memberLabelId : '';
           this.form.memberLabelName = val.memberLabelName ? val.memberLabelName : '';
+          // this.welcomeType = this.form.welcomeType;
           // this.form.welcomeId = val.welcomeId;
-          if (this.form.welcomeId) {
-            this.welcomeType = 1;
-          } else {
-            this.welcomeType = 2;
-          }
+          // if (this.form.welcomeId) {
+          //   this.welcomeType = 1;
+          // } else {
+          //   this.welcomeType = 2;
+          // }
         }
       }
     }