chenrui 10 kuukautta sitten
vanhempi
commit
8423294631

+ 12 - 9
src/views/promotionRulesManagement/promotionManagement/detailModal.vue

@@ -70,15 +70,18 @@
           {{ form.publishFlag?form.publishFlag==='1'?'是':'否':'--' }}
         </a-form-model-item>
         <a-form-model-item label="产品范围" prop="scopeFlag" >
-          <a-tree-select
-            v-model="form.promoRule.productRangeList"
-            :maxTagCount="12"
-            :tree-data="productTypeList"
-            tree-checkable
-            :disabled="true"
-            :getPopupContainer="triggerNode => triggerNode.parentNode"
-            :replaceFields="{children:'children',title: 'productTypeName',key: 'productTypeSn',value: 'productTypeSn'}"
-            placeholder="请选择产品范围" />
+          <div v-if="form.promoRule&&form.promoRule.productRangeList">
+            <a-tree-select
+              v-model="form.promoRule.productRangeList"
+              :maxTagCount="12"
+              :tree-data="productTypeList"
+              tree-checkable
+              :disabled="true"
+              :getPopupContainer="triggerNode => triggerNode.parentNode"
+              :replaceFields="{children:'children',title: 'productTypeName',key: 'productTypeSn',value: 'productTypeSn'}"
+              placeholder="请选择产品范围" />
+          </div>
+          <div>--</div>
         </a-form-model-item>
       </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">

+ 9 - 2
src/views/promotionRulesManagement/promotionManagement/edit.vue

@@ -430,6 +430,7 @@ export default {
       chooseTypeList: [],
       chooseProductList: [],
       imageSet: [], // 回显显示图片数据
+      productTypeList: [],
       rules: {
         title: [
           { required: true, message: '请输入标题名称', trigger: 'blur' }
@@ -531,9 +532,12 @@ export default {
             _this.form.linkType = '1'
             if (res.data.promoRule) {
               _this.isShowNextStep = true
-              _this.sellForm = res.data.promoRule
               _this.sellForm.range = '1'
               _this.time = [res.data.promoRule.validStartDate, res.data.promoRule.validEndDate]
+              if (res.data.promoRule.productRangeList && res.data.promoRule.productRangeList.productRangeList.length > 0) {
+                _this.sellForm.productRangeList = res.data.promoRule.productRangeList.map(item => { return item.productTypeSn })
+              }
+              _this.sellForm = res.data.promoRule
             }
           }
         }
@@ -602,10 +606,13 @@ export default {
       _this.form.promoActiveSn = this.$route.params.sn
       var formData = JSON.parse(JSON.stringify(_this.form))
       formData.imageSet = formData.imageSet ? formData.imageSet.split(',') : []
+      formData.promoRule = _this.sellForm
       if (formData.contentType == 'LINK') {
         delete formData.contentLink
+        if (formData.promoRule.productRangeList && formData.promoRule.productRangeList.length > 0) {
+          formData.promoRule.productRangeList = formData.promoRule.productRangeList.map(item => { return { productTypeSn: item } })
+        }
       }
-      formData.promoRule = _this.sellForm
       _this.spinning = true
       promoActivePublish(formData).then(res => {
         if (res.status == 200) {