Bläddra i källkod

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

# Conflicts:
#	src/views/promotionRulesManagement/dealerPromotions/list.vue
lilei 1 år sedan
förälder
incheckning
cfb9cd83fd

+ 5 - 7
src/api/promotion.js

@@ -64,7 +64,7 @@ export const getRuleQueryList = (params) => {
 // 新增一行
 export const getNewScopeSn = (params) => {
   return axios({
-    url: '/promotion/rule/getNewScopeSn',
+    url: '/promotion/getNewSn',
     data: params,
     method: 'get'
   })
@@ -129,9 +129,8 @@ export const promotionIsOver = (params) => {
 
 // 导出门槛产品错误项
 export const downNormalFail = (params) => {
-  const url = `/promotion/downNormalFail`
   return axios.request({
-    url: url,
+    url: '/promotion/rule/downNormalFail',
     method: 'post',
     data: params,
     responseType: 'blob'
@@ -139,18 +138,17 @@ export const downNormalFail = (params) => {
 }
 // 导出促销产品错误项
 export const downSpecialFail = (params) => {
-  const url = `/promotion/downSpecialFail`
   return axios.request({
-    url: url,
+    url: '/promotion/rule/downSpecialFail',
     method: 'post',
     data: params,
     responseType: 'blob'
   })
 }
 
-// 导入参与客户   导出错误项
+// 参与客户   导出错误项 (经销商)
 export const downDealerFail = (params) => {
-  const url = `/promotion/downDealerFail`
+  const url = `/promotion/dealer/downDealerFail`
   return axios.request({
     url: url,
     method: 'post',

+ 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 = []

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/importDealerModa.vue

@@ -85,7 +85,7 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  导入
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/promotion/importDealer', // 导入门槛、正价、促销产品
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/promotion/dealer/importDealer', // 导入门槛、正价、促销产品
       paramsData: null,
       filePath: ''
     }

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/importGuideModal.vue

@@ -91,8 +91,8 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  导入
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/promotion/importNormalProduct', // 导入门槛、正价、促销产品
-      attachAction1: process.env.VUE_APP_API_BASE_URL + '/promotion/importSpecialProduct', // 导入特价产品
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/promotion/rule/importNormalProduct', // 导入门槛、正价、促销产品
+      attachAction1: process.env.VUE_APP_API_BASE_URL + '/promotion/rule/importSpecialProduct', // 导入特价产品
       paramsData: null,
       filePath: ''
     }

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -45,7 +45,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="经销商名称">
-                <a-input id="promotionList-purchaseBillNo" v-model="queryParam.dealerName" placeholder="请输入经销商名称" allowClear/>
+                <a-input id="promotionList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 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"