Merge branch 'feature/520迭代' into master

src/views/ecm/form.js

@@ -160,8 +160,11 @@ export default {
         marke_days: 14
       },
       xsxsFlag: 0,
+      allList: [],
+      gicList: [],
       paymentList: [],
-      checkList: []
+      checkList: [],
+      paymentFlag: 1
     };
   },
   components: {
@@ -279,9 +282,26 @@ export default {
     // 支付方式
     gicPaymentList() {
       gicPaymentList({ pageSize: 100 }).then(res => {
-        this.paymentList = res.result.result || [];
+        const {
+          result: { result }
+        } = res;
+        this.allList = result;
+        let gicArr = [];
+        let arr = [];
+        result.forEach(item => {
+          item.isGic ? arr.push(item) : gicArr.push(item);
+        });
+        this.gicList = gicArr;
+        this.paymentList = arr;
       });
     },
+    radioChange() {
+      this.checkList = [];
+      this.gicPaymentList();
+    },
+    wen(val) {
+      console.log(val);
+    },
     // 获取商户卡券自动领取配置
     getCardManualSetting() {
       getCardManualSetting().then(res => {
@@ -414,9 +434,9 @@ export default {
           // 支付方式回显
           this.consumeChecked.payment = consumTrigger.gic_payment_flag ? true : false;
           if (consumTrigger.gic_payment_flag) {
+            this.paymentFlag = consumTrigger.gic_payment_flag;
             this.checkList = (consumTrigger.gic_payment_list && JSON.parse(consumTrigger.gic_payment_list)) || [];
             this.checkList = this.checkList.map(i => i.payCode);
-            console.log(this.checkList);
           }
         }
 
@@ -540,7 +560,6 @@ export default {
     close() {
       this.editDialogShow = false;
     },
-
     // 保存 校验
     submit: _debounce(async function(formName) {
       if (this.$refs.marketingEvent.list.length < 1) {
@@ -769,8 +788,8 @@ export default {
             }
             // 支付方式
             if (this.consumeChecked.payment) {
-              params.gic_payment_list = JSON.stringify(this.paymentList.filter(i => this.checkList.includes(i.payCode)));
-              params.gic_payment_flag = 1;
+              params.gic_payment_list = JSON.stringify(this.allList.filter(i => this.checkList.includes(i.payCode)));
+              params.gic_payment_flag = this.paymentFlag;
             } else {
               params.gic_payment_flag = 0;
             }

src/views/ecm/form.vue

@@ -191,14 +191,25 @@
         </el-form-item>
         <el-form-item>
           <div class="no_label_form_label">
-            <el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.payment" v-if="paymentList.length">支付方式(包含)</el-checkbox>
+            <el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.payment" v-if="paymentList.length">支付方式</el-checkbox>
             <div>
               <span class="fz14 gray" v-if="!consumeChecked.payment">任意支付方式</span>
               <div class="sysp__content clearfix" v-else>
-                <el-checkbox-group v-model="checkList">
+                <el-radio-group v-model="paymentFlag" @change="radioChange" v-if="gicList.length" :disabled="!isAdd">
+                  <el-radio :label="1">包含</el-radio>
+                  <el-radio :label="2">剔除</el-radio>
+                </el-radio-group>
+                <p v-if="gicList.length" class="gray">商户支付方式</p>
+                <el-checkbox-group v-model="checkList" @change="wen">
                   <el-checkbox v-for="item in paymentList" :disabled="!isAdd" :label="item.payCode" :key="item.payCode">{{ item.payName || '--' }}</el-checkbox>
                 </el-checkbox-group>
-                <div class="fz12 gray">勾选具体支付方式后，只要订单包含所勾选任意一项即满足</div>
+                <div v-if="gicList.length">
+                  <p class="gray">GIC支付方式</p>
+                  <el-checkbox-group v-model="checkList">
+                    <el-checkbox v-for="item in gicList" :disabled="!isAdd" :label="item.payCode" :key="item.payCode">{{ item.payName || '--' }}</el-checkbox>
+                  </el-checkbox-group>
+                </div>
+                <div class="fz12 gray">{{ `勾选具体支付方式后，只要订单${paymentFlag == 1 ? '' : '不'}包含所勾选任意一项即满足` }}</div>
               </div>
             </div>
           </div>