浏览代码

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

lilei 1 年之前
父节点
当前提交
554693cf24

+ 4 - 4
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -12,7 +12,7 @@
       </a-page-header>
       <!-- 基础信息 -->
       <a-card size="small" title="基础信息" :bordered="false" v-show="!isShowBisiceInfo" class="salesDetail-cont">
-        <a-descriptions size="small" :column="2" v-if="detailData">
+        <a-descriptions size="small" v-if="detailData">
           <a-descriptions-item label="促销名称">{{ detailData.title || '--' }}</a-descriptions-item>
           <a-descriptions-item label="促销简称">{{ detailData.description || '--' }}</a-descriptions-item>
           <a-descriptions-item label="促销时间" v-if="detailData.promotionDateStart&& detailData.promotionDateEnd">{{ detailData.promotionDateStart }}-{{ detailData.promotionDateEnd }}</a-descriptions-item>
@@ -22,11 +22,11 @@
           <a-descriptions-item label="参与客户" v-if="detailData.dealerScope!='ALL_DEALER'"><div @click="handleSee">共<span class="link-bule">{{ detailData.dealerQty }}</span>个</div></a-descriptions-item>
           <a-descriptions-item label="参与客户" v-else>全部客户</a-descriptions-item>
           <a-descriptions-item label="活动订单起订金额(元)">{{ detailData.minOrderFlag ==='0'?'不限':detailData.minOrderAmount?detailData.minOrderAmount:'--' }}</a-descriptions-item>
-          <a-descriptions-item label="活动经费上限(元)">{{ detailData.upperLimitFlag ==='0'?'不限':detailData.upperLimitAmount? detailData.upperLimitAmount:'--' }}</a-descriptions-item>
-          <a-descriptions-item label="促销描述" :span="2">
+          <a-descriptions-item label="活动经费上限(元)" :span="2">{{ detailData.upperLimitFlag ==='0'?'不限':detailData.upperLimitAmount? detailData.upperLimitAmount:'--' }}</a-descriptions-item>
+          <a-descriptions-item label="促销描述" :span="3">
             <div class="descItem">{{ detailData.content || '' }}</div>
           </a-descriptions-item>
-          <a-descriptions-item label="附件" :span="2">
+          <a-descriptions-item label="附件" :span="3">
             <div class="attachmentBox" v-if="detailData.attachmentList&&detailData.attachmentList.length>0">
               <a
                 class="link-bule"

+ 10 - 4
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-dealerNameLike" v-model.trim="queryParam.dealerNameLike" allowClear placeholder="请输入经销商名称"/>
+                <custList ref="custList" id="promotionList-tenantSn" @change="custChange"></custList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -253,11 +253,12 @@ import creatorList from '@/views/common/creatorList.vue'
 import editActiveEndTime from './editActiveEndTime.vue'
 import supplier from '@/views/common/supplier.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import custList from '@/views/common/custList.vue'
 import { dealerPromotionList, dealerPromotionDel, modifyEnabledFlag, promotionAudit, promotionIsOver, handleCopyData, midwaySubmit, dealerMidwayAudit, updateDealerSnList } from '@/api/promotion'
 export default {
   name: 'PromotionManagementList',
   mixins: [commonMixin],
-  components: { STable, supplier, VSelect, rangeDate, warehouse, lookUpCustomersModal, addModal, editActiveEndTime, creatorList },
+  components: { STable, supplier, VSelect, rangeDate, warehouse, lookUpCustomersModal, addModal, editActiveEndTime, creatorList, custList },
   data () {
     return {
       spinning: false,
@@ -276,7 +277,7 @@ export default {
         state: undefined,
         creatorId: undefined,
         dealerAuditFlag: undefined,
-        dealerNameLike: ''
+        dealerSn: undefined
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
@@ -318,6 +319,10 @@ export default {
     }
   },
   methods: {
+    // 经销商列表查询
+    custChange (val) {
+      this.queryParam.dealerSn = val.key
+    },
     // 创建人
     creatorChange (val) {
       this.queryParam.creatorId = val.key
@@ -541,8 +546,9 @@ export default {
         state: undefined,
         creatorId: creatorObj.userid,
         dealerAuditFlag: undefined,
-        dealerNameLike: ''
+        dealerSn: undefined
       }
+      this.$refs.custList.resetForm()
       this.$refs.rangeDate.resetDate()
       this.$refs.table.refresh(true)
     },

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

@@ -76,7 +76,7 @@
           <a-tooltip title="数量叠加:(如:满1000送200,金额叠加则:满2000送400,以此类推)" v-if="form.giveRuleType=='SUM_MONEY'">
             <a-icon type="question-circle" theme="filled" :style="{ fontSize: '14px', color: 'gray' ,'margin-left':'5px'}"/>
           </a-tooltip>
-          <a-tooltip title="按比例:(如满100元送2%,按比例则:满120送12元)" v-else>
+          <a-tooltip title="按比例:(如满100元送2%,按比例则:满120送2.4元)" v-else>
             <a-icon type="question-circle" theme="filled" :style="{ fontSize: '14px', color: 'gray' ,'margin-left':'5px'}"/>
           </a-tooltip>
           <div class="ruleDescList" v-if="form.giveRuleType==='SUM_MONEY'">
@@ -111,7 +111,7 @@
               :max="999999"
               :precision="2"
               size="small"/>
-            元<span v-if="form.regularUnit==='YUAN'">({{ scaleNum }}%促销品采购额)</span>
+            元<span>({{ form.regularUnit==='YUAN'? scaleNum+'%':'' }}促销品采购额)</span>
           </div>
           <div class="fullGiftRuleBox" v-else>
             <div class="ruleDescList" v-for="(con,i) in fullGiftRuleList" :key="i">

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

@@ -92,7 +92,7 @@
                 :precision="form.regularUnit==='YUAN'?2:0"
                 size="small"/>
               <a-select
-                default-value="YUAN"
+                default-value="GE"
                 :disabled="i!=0"
                 v-model="form.regularUnit"
                 style="width: 50px;margin-left:5px;"
@@ -240,7 +240,7 @@ export default {
         gateValue: undefined,
         quotaAmount: undefined,
         regularSameFlag: '1', // 满赠规则  同款不同款商品
-        regularUnit: 'YUAN',
+        regularUnit: 'GE',
         restrictFlag: '0', // 限制正价产品款数
         convertExpenseFlag: '0', // 转费用报销标记
         restrictCategory: '',