Browse Source

bug修复

chenrui 4 năm trước cách đây
mục cha
commit
72c7d420dc
1 tập tin đã thay đổi với 11 bổ sung9 xóa
  1. 11 9
      src/views/salesManagement/urgentItemsOffset/detail.vue

+ 11 - 9
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -18,14 +18,13 @@
       <a-card size="small" :bordered="false" class="urgentItemsOffsetDetail-info-wrapper">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3" v-if="detailData">
-              <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="客户地址">{{ detailData.shippingAddressProvinceName || '--' }}{{ detailData.shippingAddressCityName || '--' }}{{ detailData.shippingAddressCountyName || '--' }}{{ detailData.shippingAddress || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="支付方式">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系电话">{{ detailData.consigneeTel || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收款方式">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="急件单号">{{ detailData.urgentBillNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="状态">{{ detailData.statusDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions :column="3">
+              <a-descriptions-item label="客户名称">{{ (detailData&&detailData.buyerName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="客户地址">{{ (detailData&&detailData.shippingAddressProvinceName) || '' }}{{ (detailData&&detailData.shippingAddressCityName) || '' }}{{ (detailData&&detailData.shippingAddressCountyName) || '' }}{{ (detailData&&detailData.shippingAddress) || '' }}</a-descriptions-item>
+              <a-descriptions-item label="联系电话">{{ detailData&&detailData.consigneeTel || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收款方式">{{ (detailData&&detailData.settleStyleEntity&&detailData.settleStyleEntity.name) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="急件单号">{{ (detailData&&detailData.urgentBillNo) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="状态">{{ (detailData&&detailData.statusDictValue) || '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -34,7 +33,10 @@
       <a-card size="small" :bordered="false" class="urgentItemsOffsetDetail-table-wrapper">
         <!-- 合计 -->
         <a-alert type="info" showIcon style="margin-bottom:15px" v-if="detailData">
-          <div class="ftext" slot="message">总款数:<strong>{{ detailData.totalCategory || 0 }}</strong>;总数量:<strong>{{ detailData.totalQty || 0 }}</strong>。</div>
+          <div class="ftext" slot="message">
+            总款数:<strong>{{ (detailData&&(detailData.totalCategory || detailData.totalCategory == 0)) ? detailData.totalCategory : '--' }}</strong>;
+            总数量:<strong>{{ (detailData&&(detailData.totalQty || detailData.totalQty == 0)) ? detailData.totalQty : '--' }}</strong>。
+          </div>
         </a-alert>
         <s-table
           class="sTable"