update: 卡券修改

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

@@ -637,13 +637,14 @@
       <!-- 会员标签嵌入卡券选择器 com023 -->
       <!-- v-if="parent.templateCode == 'com023'" -->
       <div v-if="parent.templateCode == 'com023'">
-        选择卡券：<el-radio-group v-model="cardRadioType">
-          <el-radio :label="0">全部卡券</el-radio>
-          <el-radio :label="1">部分卡券</el-radio>
-        </el-radio-group>
+        <div style="margin-bottom:20px" v-if="templateDataList.columnKey == 'pendingCard' || templateDataList.columnKey == 'receivedCard'">
+          选择卡券：<el-radio-group v-model="cardRadioType">
+            <el-radio :label="0">全部卡券</el-radio>
+            <el-radio :label="1">部分卡券</el-radio>
+          </el-radio-group>
+        </div>
         <vue-gic-card
           v-show="cardRadioType"
-          style="margin-top:20px"
           @reciver-card-list="reciverCardList"
           :disabledList="disabledList"
           :cardLimit="cardLimit"
@@ -1935,7 +1936,7 @@ export default {
     },
     onChangeTime(val) {
       if(isNaN(val)) {
-        this.expiration = 1;
+        this.expiration = '1';
         return;
       }
       if(val < 1) this.expiration = '1';

src/components/tagDetail/mixin/index.js

@@ -331,7 +331,7 @@ export default {
       that.postTemplateData.selectedVal = [];
       let returnFlag = true; // 判断标志
       let tagParams = [];
-      
+
       let tagValue = {
         val: [
           {
@@ -551,7 +551,7 @@ export default {
         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 最近/之后
@@ -757,7 +757,7 @@ export default {
           }
         }
       }
-     
+
       // 数字区间 = >= <= qu区间
       if (code == 'com001') {
         for (let k of this.templateData) {
@@ -1061,7 +1061,7 @@ export default {
        * 已领取卡券       receivedCard
        * 已核销指定卡券   writeOffCard
        */
-    
+
       if (this.templateData.length) {
         if (code === 'com023' || code === 'com024') {
           tagValue.val[0].data.compute = code === 'com024' ? 'in' : this[code].postCompute;
@@ -1081,7 +1081,7 @@ export default {
             ]
           })
       }
-      
+
 
       // 门店参数修改
       that.templateData.forEach(function(ele, index) {
@@ -1101,7 +1101,7 @@ export default {
           }
         }
       }
-      
+
       that.postTemplateData.template = that.templateData;
       tagParams = that.postTemplateData;
       if (Array.isArray(tagParams.selectedVal) && tagParams.selectedVal.length) {
@@ -1130,11 +1130,17 @@ export default {
      */
     addToTemp(tagValue, tagParams) {
       const that = this;
+      // 判断是全部模板还是部分模板 0 all (compute: existOfAll) 1 part (compute: in)
+      if(this.cardRadioType == 0) {
+        tagValue.val[0].data.value = '';
+        tagValue.val[0].data.compute = 'existOfAll';
+      }
       const para = {
         tagId: that.tagShortId || this.tagId,
         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;
@@ -1162,7 +1168,7 @@ export default {
           }
         })
         .catch(function(error) {
-          
+
         });
     },
 
@@ -1756,7 +1762,7 @@ export default {
              */
             setTimeout(_ => {
               this.templateCode = this.templateData.map(el => el.templateCode);
-              
+
               if (this.templateDataList.editCondition) {
                 this.replaceTemplateValue();
               } else {
@@ -1904,7 +1910,7 @@ export default {
               }
             }
             break;
-            
+
           case 'tag012':
             for (let i = 0; i < this.templateData.length; i++) {
               if (this.templateData[i].templateCode === 'tag012') {
@@ -2093,7 +2099,7 @@ export default {
           let resData = res.data;
           if (that.tagData.tagType != 1 && that.currentKey != 'tag') {
             if (resData.errorCode == 0) {
-              
+
               data.options = resData.result;
               that.templateData.push(data);
               that.getExistData(that.tagData.tagId).then(items => {