lilei 1 week ago
parent
commit
848ade43ff

+ 1 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -114,7 +114,7 @@
                 <div v-if="isCityPrice">&nbsp;&nbsp;市级总售价:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? toThousands(detailData.totalCityAmount) : '--' }}</strong>;</div>
               </div>
               <div class="tongji-bar-col">
-                <div v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalDiscountAmount" style="color: red;">优惠金额:<strong>{{ Number(detailData.totalDiscountAmount).toFixed(2) }}</strong>;</div>
+                <div v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalUsePromoGiftsAmount" style="color: red;">优惠金额:<strong>{{ Number(detailData.totalUsePromoGiftsAmount).toFixed(2) }}</strong>;</div>
                 <div v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalConvertPromoGiftsAmount" style="color: red;width:170px;">促销产品转采购额金额:<strong>{{ Number(detailData.totalConvertPromoGiftsAmount).toFixed(2) }}</strong>;</div>
               </div>
             </div>

+ 2 - 2
src/views/salesManagement/salesQueryNew/edit.vue

@@ -123,9 +123,9 @@
             产品总款数:<strong style="margin-right: 10px;"> {{ detailData.totalCategory }} </strong>
             总数量:<strong style="margin-right: 10px;"> {{ detailData.totalQty }} </strong>
             <!-- 总售价:¥<strong> {{ toThousands(detailData.totalOrigAmount) }}</strong> -->
-            <span style="margin:0 10px;" v-if="detailData.totalDiscountAmount">优惠金额:¥<strong>-{{ Number(detailData.totalDiscountAmount).toFixed(2) }}</strong></span>
+            <span style="margin:0 10px;" v-if="detailData.totalUsePromoGiftsAmount">优惠金额:¥<strong>-{{ Number(detailData.totalUsePromoGiftsAmount).toFixed(2) }}</strong></span>
             <a-popover title="优惠明细" @visibleChange="(visible)=>{visible&&getPromYhDetail()}">
-              <a-button shape="round" size="small" v-if="detailData.totalDiscountAmount">优惠明细</a-button>
+              <a-button shape="round" size="small" v-if="detailData.totalUsePromoGiftsAmount">优惠明细</a-button>
               <div slot="content">
                 <div v-if="yhDetail">
                   <div