chenrui 1 tahun lalu
induk
melakukan
8ee0f97faf

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

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

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