lilei před 4 roky
rodič
revize
eb3f96813d

+ 7 - 7
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -12,12 +12,12 @@
     <a-card size="small" :bordered="false" class="salesDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions size="small" :column="3" v-if="detailData">
+          <a-descriptions size="small" :column="3" v-if="detailData!=null">
             <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货地址">{{ detailData.salesBillExtEntity.shippingAddrProvinceName || '--' }}{{ detailData.salesBillExtEntity.shippingAddrCityName || '--' }}{{ detailData.salesBillExtEntity.shippingAddrCountyName || '--' }}{{ detailData.salesBillExtEntity.shippingAddr || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货地址" v-if="detailData.salesBillExtEntity">{{ detailData.salesBillExtEntity.shippingAddrProvinceName || '--' }}{{ detailData.salesBillExtEntity.shippingAddrCityName || '--' }}{{ detailData.salesBillExtEntity.shippingAddrCountyName || '--' }}{{ detailData.salesBillExtEntity.shippingAddr || '--' }}</a-descriptions-item>
             <a-descriptions-item label="收款方式">{{ detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货人">{{ detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货电话">{{ detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货人" v-if="detailData.salesBillExtEntity">{{ detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货电话" v-if="detailData.salesBillExtEntity">{{ detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
             <a-descriptions-item label="备注">{{ detailData.remarks || '--' }}</a-descriptions-item>
             <a-descriptions-item label="业务状态">{{ detailData.billStatusDictValue || '--' }}</a-descriptions-item>
           </a-descriptions>
@@ -26,10 +26,9 @@
     </a-card>
     <a-card size="small" :bordered="false" class="pages-wrap">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
+      <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData!=null">
         <div slot="message">
-          总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;已发货数量:<strong>{{ detailData.totalDispatchQty || 0 }}</strong>;待发货数量:<strong>{{ detailData.totalUndispatchQty || 0 }}</strong>;<br/>
-          总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }};已发货金额:<strong>{{ detailData.totalDispatchAmount || 0 }};待发货金额:<strong>{{ detailData.totalUndispatchAmount || 0 }}</strong>;
+          总销售数量:<strong>{{ detailData.totalSalesQty || 0 }}</strong>;本次下推数量:<strong>{{ detailData.totalQty || 0 }}</strong>;
           </strong></strong></div>
       </a-alert>
       <!-- 列表 -->
@@ -105,6 +104,7 @@ export default {
     //  详情
     getDetail () {
       dispatchFindBySn({ dispatchBillSn: this.$route.params.sn }).then(res => {
+        console.log(res.data)
         if (res.status == 200) {
           this.detailData = res.data
         } else {