浏览代码

修改bug

chenrui 10 月之前
父节点
当前提交
22fe42a676

+ 18 - 12
src/views/promotionRulesManagement/promotionManagement/edit.vue

@@ -303,7 +303,7 @@
             </a-col>
             </a-col>
             <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
             <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
               <div style="width: 83%;margin:0 auto 10px;">
               <div style="width: 83%;margin:0 auto 10px;">
-                <productTable ref="chooseProduct" :promoActiveSn="$route.params.sn" :disabledVal="isDisabled"></productTable>
+                <productTable ref="chooseProductList" :promoActiveSn="$route.params.sn" :disabledVal="isDisabled"></productTable>
               </div>
               </div>
             </a-col>
             </a-col>
             <a-col
             <a-col
@@ -444,8 +444,8 @@ export default {
         ruleBaseType: [{ required: true, message: '请选择生成方式', trigger: 'change' }],
         ruleBaseType: [{ required: true, message: '请选择生成方式', trigger: 'change' }],
         validType: [{ required: true, message: '请选择券有效期类型', trigger: 'change' }],
         validType: [{ required: true, message: '请选择券有效期类型', trigger: 'change' }],
         publishFlag: [{ required: true, message: '请选择是否发布', trigger: 'change' }],
         publishFlag: [{ required: true, message: '请选择是否发布', trigger: 'change' }],
-        dealerEditFlag: [{ required: true, message: '请选择加盟商是否可编辑', trigger: 'change' }],
-        range: [{ required: true, message: '请选择', trigger: 'blur' }]
+        dealerEditFlag: [{ required: true, message: '请选择加盟商是否可编辑', trigger: 'change' }]
+        // range: [{ required: true, message: '请选择', trigger: 'blur' }]
       }
       }
     }
     }
   },
   },
@@ -533,7 +533,6 @@ export default {
       const _this = this
       const _this = this
       if (_this.form.contentType === 'LINK') {
       if (_this.form.contentType === 'LINK') {
         _this.form.content = _this.form.contentLink
         _this.form.content = _this.form.contentLink
-        _this.sellForm.range = '1'
         // 验证组件必填项
         // 验证组件必填项
         _this.$refs.ruleForm.validate(valid => {
         _this.$refs.ruleForm.validate(valid => {
           if (valid) {
           if (valid) {
@@ -587,21 +586,28 @@ export default {
         if (formData.promoRule.productRangeList && formData.promoRule.productRangeList.length > 0) {
         if (formData.promoRule.productRangeList && formData.promoRule.productRangeList.length > 0) {
           formData.promoRule.productRangeList = formData.promoRule.productRangeList.map(item => { return { productTypeSn: item } })
           formData.promoRule.productRangeList = formData.promoRule.productRangeList.map(item => { return { productTypeSn: item } })
         }
         }
-        if (this.form.linkType === '1') {
-          if (this.sellForm.validType === 'FIXED') {
-            if (!this.sellForm.validStartDate || this.sellForm.validStartDate.validEndDate) {
-              this.$message.warning('请输入券有效期!')
+        if (_this.form.linkType === '1') {
+          if (_this.sellForm.validType === 'FIXED') {
+            if (!_this.sellForm.validStartDate || _this.sellForm.validStartDate.validEndDate) {
+              _this.$message.warning('请输入券有效期!')
               return false
               return false
             }
             }
           } else {
           } else {
-            if (!this.sellForm.validDays) {
-              this.$message.warning('请输入券有效期!')
+            if (!_this.sellForm.validDays) {
+              _this.$message.warning('请输入券有效期!')
               return false
               return false
             }
             }
           }
           }
         }
         }
-        formData.dealerEditFlag = this.sellForm.dealerEditFlag
-        formData.publishFlag = this.sellForm.publishFlag
+        formData.dealerEditFlag = _this.sellForm.dealerEditFlag
+        formData.publishFlag = _this.sellForm.publishFlag
+        const numInfo = _this.$refs.chooseProductList.getDataNum()
+        if (numInfo == 0) {
+          if (!_this.sellForm.validDays) {
+            _this.$message.warning('请选择返券产品!')
+            return false
+          }
+        }
       }
       }
       _this.spinning = true
       _this.spinning = true
       promoActivePublish(formData).then(res => {
       promoActivePublish(formData).then(res => {

+ 5 - 0
src/views/promotionRulesManagement/promotionManagement/productTable.vue

@@ -78,6 +78,7 @@ export default {
       spinning: false,
       spinning: false,
       rowSelectionInfo: null,
       rowSelectionInfo: null,
       queryParam: {},
       queryParam: {},
+      dataListQty: '0',
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -108,6 +109,7 @@ export default {
               }
               }
             }
             }
             this.disabled = false
             this.disabled = false
+            this.dataListQty = res.data.count
           }
           }
           this.spinning = false
           this.spinning = false
           return data
           return data
@@ -161,6 +163,9 @@ export default {
         }
         }
       })
       })
     },
     },
+    getDataNum () {
+      return this.dataListQty
+    },
     pageInit () {
     pageInit () {
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs.table.refresh(true)
         this.$refs.table.refresh(true)