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

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

@@ -16,7 +16,7 @@
           <span class="tabs">开启后，客户添加该企业微信时，无需好友验证，将会自动添加成功</span>
         </el-form-item>
         <el-form-item label="活码标签" prop="memberLabelId" class="memberTag-form-item">
-          <el-button v-if="!form.memberLabelId" plain class="ylbtn" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button>
+          <el-button v-if="!form.memberLabelId || !form.memberLabelName" 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> -->
           <el-tooltip :disabled="form.memberLabelStatus != 0" content="已删除" placement="top" v-else>
             <el-tag closable @close="handleTagCloseTag" :type="isEdit && form.memberLabelStatus == 0 ? 'warning' : ''">{{ form.memberLabelName }}</el-tag>
@@ -24,7 +24,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" :welcomeIdP="form.welcomeId" ref="welcomeItem"></welcomeItem>
+        <welcomeItem @getWelcomeId="getWelcomeId" :welcomeIdP="form.welcomeId" ref="welcomeItem" :welcomeSetType="welcomeSetType"></welcomeItem>
       </el-form>
     </div>
     <div class="saveBtn">
@@ -60,6 +60,7 @@ export default {
   },
   data() {
     return {
+      welcomeSetType: 1,
       form: {
         // hmType: 1, //1单人 2多人
         // name: '', // 名称
@@ -176,6 +177,7 @@ export default {
     actCodeData: {
       handler: function(val) {
         if (val) {
+          this.welcomeSetType = 2;
           this.form.hmGroupId = val.hmGroupId;
           // this.form.passFlag = val.passFlag == 1 ? true : false;
           this.form.memberLabelId = val.memberLabelId ? val.memberLabelId : '';

src/views/salesleads/components/welcomesItem.vue

@@ -81,6 +81,10 @@ export default {
     welcomeType: {
       type: String,
       default: 'code'
+    },
+    welcomeSetType: {
+      type: Number,
+      default: 1
     }
   },
   data() {
@@ -181,7 +185,7 @@ export default {
       // 获取选中数据   row表示选中这一行的数据，可以从里面提取所需要的值
       this.templateSelection = row;
       this.welcomeContent = row.welcomeContent;
-      // this.welcomeId = row.welcomeId;
+      this.welcomeId = row.welcomeId;
       // this.$emit('getWelcomeId', this.welcomeId);
     },
     // 单选框点击事件
@@ -204,6 +208,15 @@ export default {
     }
   },
   watch: {
+    welcomeSetType: {
+      handler: function(val) {
+        console.log(val);
+        if (val == 1) {
+          this.welcomesType = 1;
+        }
+      },
+      immediate: true
+    },
     welcomeIdP: {
       handler: async function(val) {
         if (val) {