lilei 1 tahun lalu
induk
melakukan
58cba1f5b7

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

@@ -83,7 +83,7 @@
                 <span v-if="$hasPermissions(authCode + '_salesPrice')">已发货金额:<strong>{{ detailData&&(detailData.totalDispatchAmount || detailData.totalDispatchAmount==0) ? toThousands(detailData.totalDispatchAmount) : '--' }}</strong>;</span>
                 <span v-if="$hasPermissions(authCode + '_salesPrice')">待发货金额:<strong>{{ detailData&&(detailData.totalUndispatchAmount || detailData.totalUndispatchAmount==0) ? toThousands(detailData.totalUndispatchAmount) : '--' }}</strong>;</span>
                 <span v-if="isCityPrice">市级总售价:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? toThousands(detailData.totalCityAmount) : '--' }}</strong>;</span>
-                <span v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalLossAmount" style="color: red;">优惠金额:<strong>{{ toThousands(detailData.totalLossAmount) }}</strong>;</span>
+                <span v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalDiscountAmount" style="color: red;">优惠金额:<strong>{{ toThousands(detailData.totalDiscountAmount) }}</strong>;</span>
               </div>
               <div>
                 <a-button v-if="detailData && (detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'HQ_CHANGE')" type="link" @click="openStockOut">缺货明细</a-button>
@@ -285,6 +285,7 @@ export default {
       salesDetailBySn({ salesBillSn: this.bizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data || null
+          this.detailData.totalDiscountAmount = Number(this.detailData.totalOrigAmount||0) - Number(this.detailData.totalAmount||0)
         }
         this.$refs.productList.pageInit()
       })

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

@@ -83,9 +83,9 @@
           <div>
             产品总款数:<strong style="margin-right: 10px;"> {{ detailData.totalCategory }} </strong>
             总数量:<strong> {{ detailData.totalQty }} </strong>
-            <span style="margin:0 0 0 10px;" v-if="detailData.totalLossAmount">优惠金额:¥<strong>{{ toThousands(detailData.totalLossAmount) }}</strong></span>
+            <span style="margin:0 10px;" v-if="detailData.totalDiscountAmount">优惠金额:¥-<strong>{{ toThousands(detailData.totalDiscountAmount) }}</strong></span>
             <a-popover title="优惠明细" @visibleChange="(visible)=>{visible&&getPromYhDetail()}">
-              <a-button shape="round" size="small" v-if="detailData.totalLossAmount">优惠明细</a-button>
+              <a-button shape="round" size="small" v-if="detailData.totalDiscountAmount">优惠明细</a-button>
               <div slot="content">
                 <div v-if="yhDetail">
                     <div 
@@ -224,6 +224,7 @@ export default {
       salesDetailBySn({ salesBillSn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data
+          this.detailData.totalDiscountAmount = Number(this.detailData.totalOrigAmount||0) - Number(this.detailData.totalAmount||0)
         }
         if(flag){
           this.getActiveList()

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.113:8660/ocs-admin',
+        target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {