فهرست منبع

Merge branch 'develop_yh44' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh44

# Conflicts:
#	src/views/promotionRulesManagement/promotionManagement/edit.vue
lilei 10 ماه پیش
والد
کامیت
50da60a395

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

@@ -61,6 +61,11 @@
               {{ form.publishFlag?form.publishFlag==='1'?'是':'否':'--' }}
             </a-form-model-item>
           </div>
+          <div v-if="form.contentType==='LINK'">
+            <a-form-model-item label="内容" prop="ruleType">
+              {{ form.content }}
+            </a-form-model-item>
+          </div>
           <div v-show="form.contentType==='LINK'&&form.content === '/pagesB/promoDetail'">
             <a-form-model-item label="基本规则" prop="ruleType">
               {{ form.promoRule&&form.promoRule.ruleType?form.promoRule.ruleType==='ticket'?'指定产品返代金券':'--':'--' }}

+ 17 - 11
src/views/promotionRulesManagement/promotionManagement/edit.vue

@@ -216,6 +216,7 @@
                   id="promotionEdit-validType"
                   code="PROMO_RULE_TICKET_TYPE"
                   :disabled="isDisabled"
+                  @change="handleValidType"
                   allowClear></v-select>
                 <a-range-picker
                   v-show="form.promoRule.validType==='FIXED'"
@@ -452,7 +453,6 @@ export default {
       }
       this.showProModal = true
     },
-
     closeProductModal () {
       this.showProModal = false
     },
@@ -523,6 +523,17 @@ export default {
         }
       })
     },
+    // 券有效期 change
+    handleValidType (con) {
+      this.sellForm.validType = con
+      if (con === 'FIXED') {
+        this.sellForm.validDays = undefined
+      } else {
+        this.time = []
+        this.sellForm.validStartDate = undefined
+        this.sellForm.validEndDate = undefined
+      }
+    },
     savePartInfo (type) {
       const _this = this
       _this.form.promoActiveSn = this.$route.params.sn
@@ -634,9 +645,6 @@ export default {
       }
       this.isShowNextStep = false
       this.isDisabled = false
-      if (this.$refs.setContent) {
-        this.$refs.setContent.clearContent()
-      }
       if (this.$refs.ruleForm) {
         this.$refs.ruleForm.resetFields()
       }
@@ -687,11 +695,11 @@ export default {
     },
     // 批量添加
     handleBatchAdd () {
-      if (!this.form.promoRule.ruleValue) {
-        this.$message.warning('请输入返券金额(必须大于0)!')
+      if (!this.sellForm.ruleValue) {
+        this.$message.warning('请输入返券金额(大于0)!')
         return
       }
-      this.$refs.chooseProduct.editMorePrice(this.form.promoRule.ruleValue)
+      this.$refs.chooseProductList.editMorePrice(this.sellForm.ruleValue)
     },
     // 添加产品成功
     addProductSuccess (list) {
@@ -709,16 +717,14 @@ export default {
         if (res.status == 200) {
           this.showProModal = false
           // 获取产品列表 有分页
-          this.$refs.chooseProduct.pageInit()
+          this.$refs.chooseProductList.pageInit()
         }
       })
-
-      this.$refs.setContent.setProductSn(productArr)
     },
     onChangeTree (e) {
       deleteByProductType({ promoActiveSn: this.$route.params.sn, productTypeSnList: this.form.promoRule.productRangeList || [] }).then(res => {
         if (res.status == 200) {
-          this.$refs.chooseProduct.pageInit()
+          this.$refs.chooseProductList.pageInit()
         }
       })
       // 保存产品范围