update: 手工标签覆盖人数默认显示

src/components/tag/tag-config-options.vue

@@ -143,7 +143,7 @@
         <div class="m-b-20" :key="'tag6' + pindex">
           <el-radio v-model="parent.computeRadio" label="in">属于</el-radio>
           <el-radio v-model="parent.computeRadio" label="notIn">不属于</el-radio>
-          <el-radio v-model="parent.computeRadio" label="-1" v-if="['mainClerkId','clerkId','openClerkId'].includes(currentKey)">无归属</el-radio>
+          <el-radio v-model="parent.computeRadio" label="isEmpty" v-if="['mainClerkId','clerkId','openClerkId'].includes(currentKey)">无归属</el-radio>
         </div>
       </template>
       <!-- 7.固定时段/最近 -->

src/components/tagDetail/mixin/index.js

@@ -925,10 +925,10 @@ export default {
           // 下拉搜索添加值
           if (ele.templateCode === 'tag008') {
             if (!ele.addSelectTags.length) {
-              returnFlag = ['mainClerkId','clerkId','openClerkId'].includes(this.currentKey)&&tagValue.val[0].data.compute==='='?true:false;
+              returnFlag = ['mainClerkId','clerkId','openClerkId'].includes(this.currentKey)&&tagValue.val[0].data.compute==='isEmpty'?true:false;
             }
-            if (['mainClerkId','clerkId','openClerkId'].includes(this.currentKey)&&tagValue.val[0].data.compute==='=') {
-              tagValue.val[0].data.value = '-1';
+            if (['mainClerkId','clerkId','openClerkId'].includes(this.currentKey)&&tagValue.val[0].data.compute==='isEmpty') {
+              tagValue.val[0].data.value = '';
             }else{
               tagValue.val[0].data.value = ele.addSelectTags.map(item => item.key).join(' ');
               that.postTemplateData.selectedVal.push(ele.addSelectTags.map(item => item.value).join(','));

src/view/platformTag/member-tag.vue

@@ -181,6 +181,7 @@ export default {
 
   data() {
     return {
+      handTag: null,
       realCount: Object.create(null),
       margin60: false,
       refershList: {},
@@ -361,7 +362,7 @@ export default {
       this.params.type = -1;
       this.loadMemberTagList(this.params);
       this.tagName = '全部标签';
-      this.handTag = false;
+      this.handTag = null;
       this.$store.commit('modiftTagName', '我的用户');
     },
     checkRealTime() {
@@ -507,7 +508,7 @@ export default {
           search: opt.searchName || null, // 标签名
           tagLevelGroupId: opt.id || '', // 标签层级
           tagType: opt.type || null, // 标签类型
-          showMemberCount: opt.showMemberCount || null, // 手工标签显示覆盖人数
+          showMemberCount: this.handTag?1 : (opt.showMemberCount || null), // 手工标签显示覆盖人数
           pageNum: opt.pageNum || 1,
           pageSize: opt.pageSize || 20,
         };
@@ -564,14 +565,13 @@ export default {
       } else {
         this.tagName = '全部标签';
       }
-      this.handTag = false;
-
+      this.handTag = null;
       this.loadMemberTagList({
         searchName: this.memberTag,
         showSearchResult: true
       });
       // this.tagName = '全部标签';
-      // this.handTag = null;
+      this.handTag = null;
     },
     // 一级标签
     handleFristTag(list) {
@@ -582,9 +582,9 @@ export default {
       localStorage.setItem('groupId', '');
       this.saveHandTagData(list);
       this.saveTagLevelGroupId(list);
-      this.loadMemberTagList(this.params);
-      this.groupId = list.id;
       this.handTag = list.handTag;
+      this.groupId = list.id;
+      this.loadMemberTagList(this.params);
       this.manualTagPop.tagTwoLevelGroupId = '';
       this.manualTagPop.tagLevelGroupId = '';
       this.changeTagTitle(list.name);
@@ -609,16 +609,6 @@ export default {
         localStorage.setItem('groupId', '');
       }
     },
-    // 查询覆盖人数
-    peopleHandTag(id) {
-      this.loadMemberTagList({
-        id: id,
-        type: -1, //所有ALL(-1) 平台PLATFORM(0) 手工HAND(1)
-        showMemberCount: 1, // 显示覆盖人数 1显示 0不显示
-        pageNum: this.pageNum,
-        pageSize: this.pageSize
-      });
-    },
     // 添加手工标签后刷新标签列表
     addNewTag() {
       this.loadMemberTagList(this.params);
@@ -729,9 +719,9 @@ export default {
       localStorage.setItem('groupId', '');
       this.saveHandTagData(list);
       this.saveTagLevelGroupId(list);
-      this.loadMemberTagList(this.params);
-      this.groupId = list.id;
       this.handTag = list.handTag;
+      this.groupId = list.id;
+      this.loadMemberTagList(this.params);
       this.manualTagPop.tagTwoLevelGroupId = list.tagLevelGroupId;
       this.manualTagPop.tagLevelGroupId = '';
       this.changeTagTitle(list.name);

src/view/platformTag/tag-container.vue

@@ -24,7 +24,7 @@
               <div style="color: #303133;">
                 标签下不同标签值可能覆盖相同的会员，因此此处“标签”覆盖人数去重显示（如“喜欢的颜色-白、红、黑、蓝”，某会员身上可能同时具备“白、黑”二种标签值）
               </div>
-              <i slot="reference" class="iconfont icon-zhongzhi refresh" @click="peopleHandTag"></i>
+              <i slot="reference" class="iconfont icon-tishi refresh"></i>
             </el-popover>
           </template>
 
@@ -69,8 +69,8 @@ export default {
       }
     },
     handTag: {
-      type: Boolean,
-      default: false
+      type: Number,
+      default: null
     },
     groupId: String,
     refersh: Object,
@@ -101,9 +101,6 @@ export default {
         query: { tagId: list.tagId }
       });
     },
-    peopleHandTag(){
-      this.$emit('peopleHandTag', this.groupId);
-    },
     deleteHandTag(list) {
       this.$confirm('删除标签后，符合该标签值的会员对应标签值将同步删除。一旦删除将无法恢复，确认要删除吗？', '提示', {
         confirmButtonText: '确定',
@@ -179,7 +176,6 @@ export default {
       return { fn: () => {}, data: fn ? fn() : {} }
     },
   },
-
   watch: {
     data: {
       immediate: true,
@@ -197,7 +193,7 @@ export default {
         }
       }
     }
-  }
+  },
 };
 </script>
 
@@ -217,7 +213,6 @@ export default {
 }
 .refresh {
     color: #909399;
-    cursor: pointer;
     &:hover {
       color: #1890ff;
     }