Merge branch 'feature/act-code' into dev

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

@@ -18,7 +18,7 @@
         <el-form-item label="使用成员" :rules="[{ required: true, message: '请选择使用成员', trigger: 'blur' }]">
           <p class="tabs" v-if="form.hmType == 1">单人活码仅可选择一名成员</p>
           <p class="tabs" v-if="form.hmType == 2">若选择多名成员，则随机分配企微员工</p>
-          <select-clerk :multiple="multiple" :data="data" @change="onChange"></select-clerk>
+          <select-clerk :multiple="multiple" :data="data" @change="onChange" :disabled="clerkDisabled"></select-clerk>
         </el-form-item>
       </template>
     </setActCode>
@@ -42,7 +42,8 @@ export default {
       multiple: false,
       data: [],
       dataArr: [],
-      detailCode: []
+      detailCode: [],
+      clerkDisabled: false
     };
   },
   created() {
@@ -84,6 +85,9 @@ export default {
           this.form.clerkIdList = this.detailCode.clerkList.map(i => i.clerkId);
           this.form.hmUserNum = this.form.clerkIdList.length;
           this.data = this.detailCode.clerkList;
+          if (this.form.hmType == 1) {
+            this.clerkDisabled = true;
+          }
           that.loading = false;
         });
       }

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

@@ -17,6 +17,7 @@
         </el-form-item>
         <el-form-item label="活码标签" prop="memberLabelId">
           <el-button v-if="!form.memberLabelId" plain class="ylbtn" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button>
+          <el-tag v-else closable @close="handleTagCloseTag">{{ form.memberLabelName }}</el-tag>
           <dm-memberTag-group :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
         </el-form-item>
         <dm-sub-title text="欢迎语设置" type="line" class="mt40b20" />
@@ -62,6 +63,7 @@ export default {
         hmGroupId: '', //活码分组id
         passFlag: true, // 1自动通过 0否
         memberLabelId: 'fd6b44967aa647bcadfad10706244c56', //会员活动标签id
+        memberLabelName: '',
         welcomeId: '' // 欢迎语id
         // clerkIdList: '', // 选择导购id
         // storeId: '' //门店id
@@ -86,10 +88,15 @@ export default {
     this.searchGroup();
   },
   methods: {
+    handleTagCloseTag() {
+      this.form.memberLabelName = '';
+      this.form.memberLabelId = '';
+    },
     saveTagPop(data) {
       console.log(data, 'tagItemId');
-      const { tagItemId } = data;
+      const { tagItemId, tagItemName } = data;
       this.form.memberLabelId = tagItemId;
+      this.form.memberLabelName = tagItemName;
     },
     onLoadmore() {
       if (this.pageParam.pageNum >= this.total) return;
@@ -151,6 +158,7 @@ export default {
           this.form.hmGroupId = val.hmGroupId;
           this.form.passFlag = val.passFlag == 1 ? true : false;
           this.form.memberLabelId = val.memberLabelId ? val.memberLabelId : '';
+          this.form.memberLabelName = val.memberLabelName ? val.memberLabelName : '';
           this.form.welcomeId = val.welcomeId;
         }
       },