update: 专属导购

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

@@ -143,6 +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'].includes(currentKey)">无归属</el-radio>
         </div>
       </template>
       <!-- 7.固定时段/最近 -->
@@ -187,7 +188,7 @@
         </div>
       </template>
       <!-- 9.输入搜索下拉多选 添加值 -->
-      <template v-if="parent.templateCode == 'tag008'">
+      <template v-if="parent.templateCode == 'tag008'?(currentKey==='mainClerkId'?(templateData[0].computeRadio!='-1'?true:false):true):false">
         <div class="m-b-20" :key="'tag9' + pindex">
           <div class="add-search-select">
             <el-select

src/components/tagDetail/mixin/index.js

@@ -553,14 +553,12 @@ export default {
             .replace(/\s+/g, '');
         }
         that.postTemplateData.selectedVal.push(that.templateData[0].dateRangeValue[0].split(' ')[0] + '至' + that.templateData[0].dateRangeValue[1].split(' ')[0]);
-        console.log(that.postTemplateData.selectedVal);
       }
 
       if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData.length === 1 && that.templateData[0].radio == 2) {
         // 天
         // timeAfterChecked 最近/之后
         // timeChecked 当天/年/月
-        console.log(that.templateData[0].timeRadio );
         if (that.templateData[0].timeRadio == 1) {
           /**  同时选择
            * lastdayHasToday          最近几天包含今天
@@ -825,7 +823,6 @@ export default {
           this.$message.warning('商品选择器未选择条件！')
           return false;
         }
-        console.log(this.com022.conditionsList);
         tagValue.val.push({
           type: 'data', //类型
           data: {
@@ -858,11 +855,14 @@ export default {
           }
           // 属于/不属于
           if (ele.templateCode === 'tag002') {
-            tagValue.val[0].data.compute = ele.computeRadio;
+            tagValue.val[0].data.compute = ele.computeRadio=='-1'?'=':ele.computeRadio;
+            tagValue.val[0].data.value = ele.computeRadio=='-1'?'-1':tagValue.val[0].data.value;
             if (ele.computeRadio == 'in') {
               that.postTemplateData.selectedVal.unshift('属于');
-            } else {
+            } else if (ele.computeRadio == 'notIn'){
               that.postTemplateData.selectedVal.unshift('不属于');
+            }else {
+              that.postTemplateData.selectedVal=['无归属'];
             }
           }
           // 数字区间
@@ -925,10 +925,14 @@ export default {
           // 下拉搜索添加值
           if (ele.templateCode === 'tag008') {
             if (!ele.addSelectTags.length) {
-              returnFlag = false;
+              returnFlag = this.currentKey==='mainClerkId'&&tagValue.val[0].data.compute==='='?true:false;
+            }
+            if (this.currentKey==='mainClerkId'&&tagValue.val[0].data.compute==='=') {
+              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(','));
             }
-            tagValue.val[0].data.value = ele.addSelectTags.map(item => item.key).join(' ');
-            that.postTemplateData.selectedVal.push(ele.addSelectTags.map(item => item.value).join(','));
           }
           // 多选项(城市选择) ( 全部选项/已选选项 )
           if (ele.templateCode === 'tag010') {
@@ -1145,7 +1149,6 @@ export default {
         tagValue: JSON.stringify(tagValue), // 标签选择保存值
         tagParams: JSON.stringify(tagParams) // 标签前端选择
       };
-      console.log(2222, para);
       postRequest('/member-tag-value/add.json', para)
         .then(res => {
           let resData = res.data;
@@ -1168,7 +1171,6 @@ export default {
                 isActive: that.tagData.isActive,
                 templateCode: this.templateCode
               };
-              console.log(sendObj);
               this.$emit('returnTagData', sendObj);
           }
         })
@@ -1837,7 +1839,6 @@ export default {
       let selectVal = null;
       let checkedCount = null;
 
-      console.log(this.templateDataList, 'asdsd');
 
       // compute 是计算属性的区间值 value是选中的值
       for(let i = 0; i < this.templateDataList.templateCode.length; i++) {
@@ -1886,7 +1887,6 @@ export default {
             break;
 
           case 'tag013':
-            console.log(this.templateData, 'asdsad')
             value = tagValue.val[0].data.value.split(' ');
             for (let i = 0; i < this.templateData.length; i++) {
               if (this.templateData[i].templateCode === 'tag013') {

src/view/memberGroup/memberGroupEdit.vue

@@ -231,7 +231,6 @@ export default {
   name: 'memberGroupEdit',
   data() {
     const rateOneValid = (rule, value, callback) => {
-      console.log(value);
       if (this.ruleForm.isActive == 0 && value == '') {
         callback(new Error('请选择更新频率'));
       } else {
@@ -239,9 +238,7 @@ export default {
       }
     };
     const rateValid = (rule, value, callback) => {
-      console.log(value, this.ruleForm);
       if (this.ruleForm.isActive == 0 && (this.ruleForm.updateType != '1' || this.ruleForm.updateType == '') && value == '') {
-        console.log(value, this.ruleForm);
         callback(new Error('请选择更新频率'));
       } else {
         callback();
@@ -618,7 +615,6 @@ export default {
           this.tagsGroupList = [];
           this.total = 0;
         }
-        console.log('tagsGroupList', this.tagsGroupList);
       });
     },
     // 搜索标签
@@ -660,7 +656,6 @@ export default {
           const resData = res.data;
           if (resData.errorCode == 1) {
             let tagGroupDto = resData.result.tagGroupDto;
-            console.log('tagGroupDto', tagGroupDto);
             this.creatorId = tagGroupDto.createUser || '';
             if (!!tagGroupDto) {
               this.ruleForm.memberTagGroupClassifyId = tagGroupDto.memberTagGroupClassifyId || '0';
@@ -713,11 +708,10 @@ export default {
           result = result || [];
           result.forEach(item => {
             if (item.memberTagGroupClassifyId === 'b3a45c4711134c939b5f8ee31a10f646') {
-              console.log(item);
+              // console.log(item);
             }
           });
           this.memberGroupList = result.slice(0);
-          console.log('memberTagGroupClassifyId', this.ruleForm.memberTagGroupClassifyId);
           this.ruleForm.memberTagGroupClassifyId = this.ruleForm.memberTagGroupClassifyId || '0';
         })
         .catch(err => {