Browse Source

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

lilei 11 months ago
parent
commit
5015840f5c

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

@@ -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?toThousands(detailData.minOrderAmount):'--' }}</a-descriptions-item>
-          <a-descriptions-item label="活动经费上限(元)">{{ detailData.upperLimitFlag ==='0'?'不限':detailData.upperLimitAmount? toThousands(detailData.upperLimitAmount):'--' }}</a-descriptions-item>
-          <a-descriptions-item label="终止说明">{{ detailData.overInfo||'--' }}</a-descriptions-item>
+          <a-descriptions-item label="活动经费上限(元)":span="2">{{ detailData.upperLimitFlag ==='0'?'不限':detailData.upperLimitAmount? toThousands(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="3" v-if="detailData.state === 'IS_OVER'&&detailData.overInfo">{{ detailData.overInfo }}</a-descriptions-item>
           <a-descriptions-item label="附件" :span="3">
             <div class="attachmentBox" v-if="detailData.attachmentList&&detailData.attachmentList.length>0">
               <a

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

@@ -16,7 +16,7 @@
         :model="form"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
-        <a-form-model-item label="促销称" prop="name">
+        <a-form-model-item label="促销称" prop="name">
           <span>{{ form.name }}</span>
         </a-form-model-item>
         <a-form-model-item label="终止说明" prop="newTimeEnd">

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

@@ -82,7 +82,7 @@
           ref="table"
           :style="{ height: tableHeight+70+'px' }"
           size="small"
-          :rowKey="(record) => record.sparePartsReturnNo"
+          :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
           :scroll="{ y: tableHeight }"
@@ -473,7 +473,7 @@ export default {
     handleEnd (row) {
       this.endObj = {
         sn: row.promotionSn,
-        name: row.title,
+        name: row.description,
         desc: row.overInfo || undefined
       }
       this.openEndActivityModal = true