Merge branch 'bugfix/卡券复制' into master

src/views/goods/coupon/detail.vue

@@ -122,14 +122,14 @@
                 <span slot="suffix">{{ proNameLen }}/30</span>
               </el-input>
             </el-form-item>
-            <el-form-item label="数据对话">
+            <!-- <el-form-item label="数据对话">
               <dm-activity-select
                 :repProjectName="projectName"
                 width="300"
                 :actId.sync="couponForm.dataDialogueId"
                 :showAdd="false"
               />
-            </el-form-item>
+            </el-form-item> -->
           </div>
           <div class="section-content">
             <h3>图文信息</h3>
@@ -609,7 +609,6 @@ export default {
         exchangeDateWeekArr: [],
         timeRangeList: [{ timeRange: '' }], // 部分时段数组
         timeZones: ['', ''],
-        dataDialogueId: '', // 数据对话id
         ladder: [],
       },
       uploadAction: getInputVal.uploadAction(),
@@ -997,8 +996,6 @@ export default {
             }
             this.couponForm.timeRangeList = timeRangeList;
           }
-          // 数据对话id
-          this.couponForm.dataDialogueId = res.data.result.dataDialogueId;
         } else {
           this.submitLoading = false;
           this.$message.error(res.data.message);
@@ -1105,6 +1102,8 @@ export default {
     // 子组件触发方法
     selectCard (arr) {
       console.log(arr);
+      console.log(this.cardList);
+
       if (arr.length + this.cardList.length > 15) {
         this.$message.error(`最多支持添加15张卡券,目前一共选择${arr.length + this.cardList.length}张卡券`);
         return;
@@ -1127,6 +1126,7 @@ export default {
             });
             this.limitTimesNumArr.push(val.cardLimit);
             this.couponCardStockArr.push(val.couponStock);
+            console.log(this.couponCardStockArr);
             this.limitTimes = Math.min.apply(null, this.limitTimesNumArr);
             this.limitTimesNum = Math.min.apply(null, this.limitTimesNumArr);
             this.couponCardStock = Math.min.apply(null, this.couponCardStockArr);
@@ -1139,6 +1139,7 @@ export default {
         };
         this.getCardCost(params);
       }
+      console.log(this.limitTimesNumArr);
     },
     async getCardCost (params) {
       const res = await request.post('/api-integral-mall/get-integral-mall-CashCost', qs.stringify(params));
@@ -1162,6 +1163,8 @@ export default {
       this.cardList.splice(index, 1);
       this.cardCouponList.splice(index, 1);
       this.costValueArr.splice(index, 1);
+      this.couponCardStockArr.splice(index, 1);// 删除对应 卡券库存数组中的值
+      this.limitTimesNumArr.splice(index, 1);// 删除对应 卡券领取限制数组中的值
       if (this.costValueArr.length) {
         const sum = this.costValueArr.reduce(function (prev, cur, index, array) {
           return prev + cur;
@@ -1186,6 +1189,8 @@ export default {
         this.couponCardStock = '';
         this.couponForm.limitTimesStatus = false;
       }
+      console.log(this.limitTimesNumArr);
+      console.log(this.cardList);
     },
     // 券包积分计算
     handleIntegralCostTotal () {
@@ -1376,7 +1381,6 @@ export default {
             integralMallProId: this.isCopy ? '' : (this.mallProId === '-1' ? '' : this.mallProId), // 礼品id
             proType: 1, // 优惠券
             proReferId: proReferIdArr.join(','), // 卡券id
-            dataDialogueId: this.couponForm.dataDialogueId, // 数据对话id
             cardCostList: this.cardCouponList.length > 1 ? this.cardCouponList : null,
             detailDescription: this.couponForm.detailDescription, // 图文详情
             giftImageUrls: giftImageUrls.join(','), // 礼品主图

src/views/goods/gift/detail.vue

@@ -99,14 +99,14 @@
                 新建分类
               </el-button>
             </el-form-item>
-            <el-form-item label="数据对话">
+            <!-- <el-form-item label="数据对话">
               <dm-activity-select
                 :repProjectName="projectName"
                 width="300"
                 :actId.sync="giftForm.dataDialogueId"
                 :showAdd="false"
               />
-            </el-form-item>
+            </el-form-item> -->
           </div>
           <div class="section-content">
             <h3>销售信息</h3>
@@ -764,7 +764,6 @@ export default {
         proReferId: '', // 礼品关联id
         proName: '',
         proCategoryId: '', // 分类id
-        dataDialogueId: '', // 数据对话id
         images: [],
         gradeType: 1,
         memberGrade: [], // 适用会员
@@ -1260,7 +1259,6 @@ export default {
           this.giftForm.proName = data.proName; // 名称
           this.proNameLen = getInputVal.getZhLen(this.giftForm.proName);
           this.giftForm.proCategoryId = data.proCategoryId; // 分类
-          this.giftForm.dataDialogueId = data.dataDialogueId; // 数据对话id
           this.giftForm.proCode = data.proCode; // 编码
           this.giftForm.integralCost = data.integralCost; // 积分
           this.giftForm.cashCost = data.cashCost; // 现金
@@ -2265,7 +2263,6 @@ export default {
             proReferId: this.giftForm.proReferId, //关联id
             cardType: this.giftForm.changeType === 1 ? this.giftForm.cardType : '', //卡券类型
             proCategoryId: this.giftForm.proCategoryId, //礼品分类
-            dataDialogueId: this.giftForm.dataDialogueId, // 数据对话id
             detailDescription: this.giftForm.detailDescription, //图文详情
             gradeType: this.giftForm.gradeType,
             memberGrade: this.giftForm.memberGrade.join(','), //适用会员