فهرست منبع

买产品送产品

chenrui 1 سال پیش
والد
کامیت
7e33fd7727

+ 21 - 4
src/views/promotionRulesManagement/dealerPromotions/addModal.vue

@@ -187,7 +187,11 @@ export default {
         content: '', // 活动描述
         attachmentList: '', // 附件
         promotionDealerList: [], // 参与客户
-        dealerScope: 'SOME_DEALER' // 全部客户   部分客户
+        dealerScope: 'SOME_DEALER', // 全部客户   部分客户
+        minOrderFlag: undefined, // 订单起订金额
+        minOrderAmount: undefined,
+        upperLimitFlag: undefined, // 活动经费上限
+        upperLimitAmount: undefined
       },
       openDealerModal: false,
       chooseDealerList: [],
@@ -195,7 +199,7 @@ export default {
       dateFormat: 'YYYY-MM-DD',
       rules: {
         title: [{ required: true, message: '请输入促销名称', trigger: 'blur' }],
-        activeDate: [{ required: true, message: '请选择促销时间', trigger: 'change' } ],
+        activeDate: [{ required: true, message: '请选择促销时间', trigger: 'change' }],
         expenseDepartmentSn: [{ required: true, message: '请选择费用所属部门', trigger: 'change' }],
         dealerScope: [{ required: true, message: '请选择参与客户', trigger: 'change' }],
         description: [{ required: true, message: '请输入促销简称', trigger: 'blur' }],
@@ -273,10 +277,18 @@ export default {
         _this.form.promotionDealerList = [{ dealerScope: _this.form.dealerScope }]
         _this.form.dealerList = []
       }
-
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))
+          // 判断起订金额、活动经费上限
+          if (form.minOrderFlag === '1' && !form.minOrderAmount) {
+            _this.$message.error('请输入订单起订限制金额数!')
+            return
+          }
+          if (form.upperLimitFlag == 1 && !form.upperLimitAmount) {
+            _this.$message.warning('请输入活动经费上限金额!')
+            return
+          }
           form.attachmentList = _this.attachList
           delete form.activeDate
           _this.spinning = true
@@ -298,6 +310,7 @@ export default {
         }
       })
     },
+    // 选择全部客户时,清空之前选择的客户列表
     changeDealerScope (val) {
       if (val === 'ALL_DEALER') {
         this.chooseDealerList = []
@@ -313,7 +326,11 @@ export default {
         content: '', // 活动描述
         attachmentList: '', // 附件
         promotionDealerList: [], // 参与客户
-        dealerScope: 'SOME_DEALER'
+        dealerScope: 'SOME_DEALER',
+        minOrderFlag: undefined, // 订单起订金额
+        minOrderAmount: undefined,
+        upperLimitFlag: undefined, // 活动经费上限
+        upperLimitAmount: undefined
       }
       this.attachList = []
       this.chooseDealerList = []

+ 9 - 2
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -43,6 +43,11 @@
                 <creatorList ref="creatorList" id="promotionList-creatorId" @change="creatorChange" />
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="经销商名称">
+                <a-input id="promotionList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="promotionList-refresh">查询</a-button>
@@ -271,7 +276,8 @@ export default {
         enabledFlag: undefined, // 发布状态
         state: undefined,
         creatorId: undefined,
-        dealerAuditFlag: undefined
+        dealerAuditFlag: undefined,
+        dealerName: ''
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
@@ -535,7 +541,8 @@ export default {
         enabledFlag: undefined, // 发布状态
         state: undefined,
         creatorId: creatorObj.userid,
-        dealerAuditFlag: undefined
+        dealerAuditFlag: undefined,
+        dealerName: ''
       }
       this.$refs.rangeDate.resetDate()
       this.$refs.table.refresh(true)

+ 19 - 19
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -16,23 +16,14 @@
         :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
-        <a-form-model-item label="规则简称" prop="description">
-          <a-input
-            size="small"
-            id="promotionList-description"
-            v-model.trim="form.description"
-            allowClear
-            placeholder="请输入规则简称(最多20个字符)"
-            :maxLength="20"></a-input>
-        </a-form-model-item>
         <a-form-model-item label="规则门槛" prop="gateFlag">
           <a-radio-group v-model="form.gateFlag" button-style="solid" size="small" @change="changeGateFlag">
-            <a-radio value="1">
+            <a-radio-button value="1">
-            </a-radio>
-            <a-radio value="0">
+            </a-radio-button>
+            <a-radio-button value="0">
-            </a-radio>
+            </a-radio-button>
           </a-radio-group>
           <div v-if="form.gateFlag && form.gateFlag === '1'">
             <v-select
@@ -62,9 +53,18 @@
             </div>
           </div>
         </a-form-model-item>
+        <a-form-model-item label="规则简称" prop="description">
+          <a-input
+            size="small"
+            id="promotionList-description"
+            v-model.trim="form.description"
+            allowClear
+            placeholder="请输入规则简称(最多20个字符)"
+            :maxLength="20"></a-input>
+        </a-form-model-item>
         <a-form-model-item label="满赠规则" prop="regularSameFlag">
           <div class="fullGiftRuleBox">
-            <div class="ruleDescList" v-for="(con,i) in fullGiftRuleList" :key="i">
+            <div class="ruleDescList" v-for="(con,i) in form.giveRuleList" :key="i">
               <span>{{ i*1+1 }}、</span>
               <a-select default-value="1" v-model="con.regularSameFlag" style="width: 100px" size="small" @change="handleFullGift">
                 <a-select-option value="1">
@@ -76,23 +76,23 @@
               </a-select>
               产品购买满
               <a-input-number
-                v-model="con.regularQty"
+                v-model="con.regularValue"
                 :min="0"
                 :step="1"
                 :max="999999"
                 :precision="0"
                 size="small"/>
-              <a-select default-value="1" v-model="con.regularSameFlag" style="width: 50px;margin-left:5px;" size="small" @change="handleFullGift">
-                <a-select-option value="1">
+              <a-select default-value="YUAN" v-model="con.regularUnit" style="width: 50px;margin-left:5px;" size="small">
+                <a-select-option value="YUAN">
                 </a-select-option>
-                <a-select-option value="0">
+                <a-select-option value="GE">
                 </a-select-option>
               </a-select>
               正价产品,送
               <a-input-number
-                v-model="con.promotionQty"
+                v-model="con.promotionValue"
                 :min="0"
                 :step="1"
                 :precision="0"