Browse Source

修改bug

chenrui 10 months ago
parent
commit
15b3393952
1 changed files with 92 additions and 90 deletions
  1. 92 90
      src/views/promotionRulesManagement/promotionManagement/edit.vue

+ 92 - 90
src/views/promotionRulesManagement/promotionManagement/edit.vue

@@ -254,77 +254,77 @@
               </a-form-model-item>
             </a-col>
             <div style="text-align:center;" v-if="!isShowNextStep"><a-button type="primary" size="large" :disabled="isDisabled" @click="handleSave('part')" >保存后设置产品</a-button></div>
-          </a-row>
-          <a-row v-if="form.contentType =='LINK'&&isShowNextStep">
-            <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-              <a-form-model-item label="产品范围">
-                <div id="setPromotion-productRange" style="position:relative;">
-                  <a-tree-select
-                    v-model="productRangeList"
-                    :maxTagCount="12"
-                    :tree-data="productTypeList"
-                    tree-checkable
-                    :disabled="isDisabled"
-                    :getPopupContainer="triggerNode => triggerNode.parentNode"
-                    :replaceFields="{children:'children',title: 'productTypeName',key: 'productTypeSn',value: 'productTypeSn'}"
-                    @change="onChangeTree"
-                    placeholder="请选择产品范围" />
-                </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-              <a-form-model-item label="返券产品" prop="promoRule.range">
-                <div class="productInfo flex-center">
-                  <div>
-                    返券金额<a-input-number
-                      v-model="form.promoRule.ruleValue"
-                      style="margin:0 5px;"
-                      :min="0"
-                      :step="1"
-                      :precision="2"
-                      :max="99999999"
+            <div v-if="form.contentType =='LINK'&&isShowNextStep">
+              <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                <a-form-model-item label="产品范围">
+                  <div id="setPromotion-productRange" style="position:relative;">
+                    <a-tree-select
+                      v-model="productRangeList"
+                      :maxTagCount="12"
+                      :tree-data="productTypeList"
+                      tree-checkable
                       :disabled="isDisabled"
-                      size="small"/> 元
-                    <a-button type="primary" :disabled="isDisabled" class="button-primary" size="small" @click="handleBatchAdd">批量设置</a-button>
+                      :getPopupContainer="triggerNode => triggerNode.parentNode"
+                      :replaceFields="{children:'children',title: 'productTypeName',key: 'productTypeSn',value: 'productTypeSn'}"
+                      @change="onChangeTree"
+                      placeholder="请选择产品范围" />
+                  </div>
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                <a-form-model-item label="返券产品" prop="promoRule.range">
+                  <div class="productInfo flex-center">
+                    <div>
+                      返券金额<a-input-number
+                        v-model="form.promoRule.ruleValue"
+                        style="margin:0 5px;"
+                        :min="0"
+                        :step="1"
+                        :precision="2"
+                        :max="99999999"
+                        :disabled="isDisabled"
+                        size="small"/> 元
+                      <a-button type="primary" :disabled="isDisabled" class="button-primary" size="small" @click="handleBatchAdd">批量设置</a-button>
+                    </div>
+                    <a-button type="primary" :disabled="isDisabled" @click="handleAddProduct" size="small">添加产品</a-button>
                   </div>
-                  <a-button type="primary" :disabled="isDisabled" @click="handleAddProduct" size="small">添加产品</a-button>
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                <div style="width: 83%;margin:0 auto 10px;">
+                  <productTable ref="chooseProductList" :promoActiveSn="$route.params.sn" :disabledVal="isDisabled"></productTable>
                 </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-              <div style="width: 83%;margin:0 auto 10px;">
-                <productTable ref="chooseProductList" :promoActiveSn="$route.params.sn" :disabledVal="isDisabled"></productTable>
-              </div>
-            </a-col>
-            <a-col
-              :xs="24"
-              :sm="24"
-              :md="24"
-              :lg="24"
-              :xl="24">
-              <a-form-model-item label="加盟商编辑" prop="promoRule.dealerEditFlag">
-                <a-radio-group button-style="solid" :disabled="isDisabled" v-model="form.promoRule.dealerEditFlag">
-                  <a-radio-button value="1">
-                    是
-                  </a-radio-button>
-                  <a-radio-button value="0">
-                    否
-                  </a-radio-button>
-                </a-radio-group>
-              </a-form-model-item>
-            </a-col>
-            <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-              <a-form-model-item label="是否发布" prop="promoRule.publishFlag">
-                <a-radio-group button-style="solid" v-model="form.promoRule.publishFlag">
-                  <a-radio-button value="1">
-                    是
-                  </a-radio-button>
-                  <a-radio-button value="0">
-                    否
-                  </a-radio-button>
-                </a-radio-group>
-              </a-form-model-item>
-            </a-col>
+              </a-col>
+              <a-col
+                :xs="24"
+                :sm="24"
+                :md="24"
+                :lg="24"
+                :xl="24">
+                <a-form-model-item label="加盟商编辑" prop="promoRule.dealerEditFlag">
+                  <a-radio-group button-style="solid" :disabled="isDisabled" v-model="form.promoRule.dealerEditFlag">
+                    <a-radio-button value="1">
+                      是
+                    </a-radio-button>
+                    <a-radio-button value="0">
+                      否
+                    </a-radio-button>
+                  </a-radio-group>
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                <a-form-model-item label="是否发布" prop="promoRule.publishFlag">
+                  <a-radio-group button-style="solid" v-model="form.promoRule.publishFlag">
+                    <a-radio-button value="1">
+                      是
+                    </a-radio-button>
+                    <a-radio-button value="0">
+                      否
+                    </a-radio-button>
+                  </a-radio-group>
+                </a-form-model-item>
+              </a-col>
+            </div>
           </a-row>
         </a-form-model>
       </a-card>
@@ -383,14 +383,13 @@ export default {
         imageSet: '', // 图片
         contentType: 'IMAGE_CONTENT', // 内容类型
         content: '', // 内容
-        ruleEnableFlag: '1', // 参属配置  1 是  0否
         contentLink: '', // 链接内容
         sort: undefined, // 排序
         publishFlag: '0', // 是否发布
+        linkType: '1',
         dealerEditFlag: '0', // 加盟商编辑 1是 0否
         promoRule: {
           ruleType: 'ticket', // 基本规则类型
-
           ruleName: '', // 券名称
           ruleTitle: '', // 副标题
           ruleBaseType: 'category', // 券生成方式
@@ -400,7 +399,8 @@ export default {
           validEndDate: undefined, // 券失效时间
           validDays: undefined, // 券有效期天数
           dealerEditFlag: '0', // 加盟商编辑 1是 0否
-          publishFlag: '0' // 是否发布
+          publishFlag: '0', // 是否发布
+          range: '1'
         }
       },
       time: [], // 有效期
@@ -427,8 +427,8 @@ export default {
         'promoRule.validType': [{ required: true, message: '请选择券有效期类型', trigger: 'change' }],
         'promoRule.publishFlag': [{ required: true, message: '请选择是否发布', trigger: 'change' }],
         'promoRule.dealerEditFlag': [{ required: true, message: '请选择加盟商是否可编辑', trigger: 'change' }],
+        'promoRule.range': [{ required: true, message: '请选择', trigger: 'blur' }],
         dealerEditFlag: [{ required: true, message: '请选择加盟商是否可编辑', trigger: 'change' }]
-        // range: [{ required: true, message: '请选择', trigger: 'blur' }]
       }
     }
   },
@@ -508,7 +508,18 @@ export default {
         }
       })
     },
-    //  确定保存
+    // 券有效期 change
+    handleValidType (con) {
+      this.form.promoRule.validType = con
+      if (con === 'FIXED') {
+        this.form.promoRule.validDays = undefined
+      } else {
+        this.time = []
+        this.form.promoRule.validStartDate = undefined
+        this.form.promoRule.validEndDate = undefined
+      }
+    },
+    //  确定保存  验证必填
     handleSave (type) {
       const _this = this
       if (_this.form.contentType === 'LINK') {
@@ -521,17 +532,7 @@ export default {
         }
       })
     },
-    // 券有效期 change
-    handleValidType (con) {
-      this.form.promoRule.validType = con
-      if (con === 'FIXED') {
-        this.form.promoRule.validDays = undefined
-      } else {
-        this.time = []
-        this.form.promoRule.validStartDate = undefined
-        this.form.promoRule.validEndDate = undefined
-      }
-    },
+    // 保存
     savePartInfo (type) {
       const _this = this
       _this.form.promoActiveSn = this.$route.params.sn
@@ -540,9 +541,8 @@ export default {
       // 跳转链接
       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 } })
+        if (_this.productRangeList && _this.productRangeList.length > 0) {
+          formData.promoRule.productRangeList = _this.productRangeList.map(item => { return { productTypeSn: item } })
         }
         // 促销活动
         if (_this.form.linkType === '1') {
@@ -567,12 +567,13 @@ export default {
             return
           }
         }
+        formData.publishFlag = _this.form.promoRule.publishFlag
+        formData.dealerEditFlag = _this.form.promoRule.dealerEditFlag
       } else {
         formData.promoRule = undefined
       }
       _this.spinning = true
-      formData.publishFlag = _this.form.promoRule.publishFlag
-      formData.dealerEditFlag = _this.form.promoRule.dealerEditFlag
+
       promoActivePublish(formData).then(res => {
         if (res.status == 200) {
           _this.$message.success(res.message)
@@ -625,8 +626,8 @@ export default {
         contentLink: '', // 链接内容
         sort: undefined, // 排序
         publishFlag: '0', // 是否发布
+        linkType: '1',
         dealerEditFlag: '0', // 加盟商编辑 1是 0否
-        ruleEnableFlag: '1',
         productRangeList: [], // 产品范围列表
         promoRule: {
           ruleType: 'ticket', // 基本规则类型
@@ -677,6 +678,7 @@ export default {
     },
     // 填入link内容
     handleLink (con) {
+      debugger
       if (!con.target.value || con.target.value != '/pagesB/promoDetail') {
         this.form.linkType = '2'
       } else {