瀏覽代碼

修改bug

chenrui 1 年之前
父節點
當前提交
d4fc221f81
共有 1 個文件被更改,包括 31 次插入34 次删除
  1. 31 34
      src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

+ 31 - 34
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -68,9 +68,6 @@
           <div class="fullGiftRuleBox">
             <div class="ruleDescList" v-for="(con,i) in fullGiftRuleList" :key="i">
               <span>{{ i*1+1 }}、</span>
-              <a-input type="hidden" name="scopeLevel" :value="i*1+1"/>
-              <a-input type="hidden" name="regularSameFlag" :value="con.regularSameFlag"/>
-              <a-input type="hidden" name="regularUnit" :value="con.regularUnit"/>
               <a-select
                 default-value="1"
                 :disabled="i!=0"
@@ -166,7 +163,7 @@
               正价产品
             </a-radio-button>
             <a-radio-button :value="'c'+i" v-for="(item,i) in fullGiftRuleList" :key="i" v-show="form.regularPromotionSameFlag==='0'">
-              {{ i==0?'促销产品':'阶梯'+(i*1+1)+'促销产品' }}
+              {{ i==0?'促销产品':'阶梯'+i+'促销产品' }}
             </a-radio-button>
           </a-radio-group>
           <a-button
@@ -224,10 +221,6 @@ export default {
         wrapperCol: { span: 17 }
       },
       fullGiftRuleList: [{
-        scopeLevel: undefined,
-        regularSameFlag: '1',
-        regularQty: undefined,
-        regularUnit: 'YUAN',
         regularValue: undefined,
         promotionValue: undefined
       }],
@@ -245,7 +238,8 @@ export default {
         convertExpenseFlag: '0', // 转费用报销标记
         restrictCategory: '',
         accrualFlag: '1', // 数量叠加
-        regularPromotionSameFlag: '1'
+        regularPromotionSameFlag: '1',
+        giftProductMap: {}
       },
       rules: {
         description: [ { required: true, message: '请输入规则简称', trigger: 'blur' } ],
@@ -265,10 +259,6 @@ export default {
     // 新增  满减规则  最多能添加五个
     addFullGiftRule () {
       const obj = {
-        scopeLevel: undefined,
-        regularSameFlag: '1',
-        regularQty: undefined,
-        regularUnit: 'YUAN',
         regularValue: undefined,
         promotionValue: undefined
       }
@@ -305,16 +295,14 @@ export default {
     },
     // 门槛切换  tab 按钮默认显示问题
     changeGateFlag (e) {
-      // if (this.chooseVal != 'c') {
-      //   if (e.target.value == '0') {
-      //     this.chooseVal = 'b'
-      //     this.form.gateType = undefined
-      //     this.form.gateAmount = undefined
-      //     this.form.quotaAmount = undefined
-      //   } else {
-      //     this.chooseVal = 'a'
-      //   }
-      // }
+      if (e.target.value == '0') {
+        this.chooseVal = 'b'
+        this.form.gateType = undefined
+        this.form.gateAmount = undefined
+        this.form.quotaAmount = undefined
+      } else {
+        this.chooseVal = 'a'
+      }
     },
     changeGateTypeFlag (val) {
       this.form.gateType = val
@@ -324,7 +312,6 @@ export default {
     //  保存
     handleSave () {
       const _this = this
-      debugger
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           // 验证必填
@@ -346,11 +333,11 @@ export default {
             _this.$message.warning('请输入限制正价产品款数个数!')
             return
           }
-          const form = JSON.parse(JSON.stringify(_this.form))
+          var form = JSON.parse(JSON.stringify(_this.form))
           let rowFlag1 = null
           let rowFlag2 = null
-          let rowFlag3 = null
-          if (form.gateFlag == '1') {
+          const rowFlag3 = null
+          if (form.gateFlag == '1') { // 门槛产品
             form.gateProductList = this.$refs.cillProduct.getResultVal()
             form.gateAmount = form.gateType === 'RATIO_AMOUNT' ? form.gateAmount / 100 : form.gateAmount
             if (form.gateProductList.length == 0) {
@@ -366,11 +353,9 @@ export default {
             }
           } else {
             form.gateProductList = []
-            form.gateAmount = ''
-            form.quotaAmount = ''
             form.gateType = undefined
           }
-
+          // 正价产品
           form.regularProductList = this.$refs.normalPriceProduct.getResultVal()
           // 判断表格必填
           if (form.regularProductList.length == 0) {
@@ -382,10 +367,22 @@ export default {
               _this.$message.warning('订单起订量设置不能为空!')
               return
             }
-            rowFlag3 = _this.isJudge(form.regularProductList)
+            rowFlag2 = _this.isJudge(form.regularProductList)
           }
-          if (form.regularPromotionSameFlag == '0') {
-            form.giftProductList = this.$refs.offerProduct.getResultVal()
+          if (form.regularPromotionSameFlag === '0') { // 促销产品   阶梯促销产品
+            const allGiftObj = {}
+            // _this.fullGiftRuleList.forEach((val, i) => {
+            //   allGiftObj['GIFT' + i] = []
+            // })
+            console.log('222222:', _this.fullGiftRuleList)
+            // console.log('333333:', allGiftObj)
+            _this.fullGiftRuleList.forEach((val, i) => {
+              allGiftObj['GIFT' + i] = _this.$refs['offerProduct' + i][0].getResultVal()
+              // _this.$set(allGiftObj, ('GIFT' + i), _this.$refs['offerProduct' + i].getResultVal())
+            })
+            // _this.$forceUpdate()
+            console.log('111111111:', allGiftObj)
+            debugger
             if (form.giftProductList.length == 0) {
               _this.$message.warning('请添加促销产品!')
               return
@@ -464,7 +461,7 @@ export default {
         this.$refs.ruleForm.resetFields()
         this.$refs.cillProduct.reSetTableData()
         this.$refs.normalPriceProduct.reSetTableData()
-        this.$refs.offerProduct.reSetTableData()
+        this.$refs.offerProduct0.reSetTableData()
       })
     },
     // 获取编辑详情