Browse Source

bug修复

chenrui 3 năm trước cách đây
mục cha
commit
22ea81cf8b
1 tập tin đã thay đổi với 23 bổ sung14 xóa
  1. 23 14
      src/views/salesManagement/salesQuery/detail.vue

+ 23 - 14
src/views/salesManagement/salesQuery/detail.vue

@@ -34,27 +34,36 @@
       <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-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.settleStyleEntity.name || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="联系电话">{{ detailData.consigneeTel || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注">{{ detailData.remarks || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="销售单号">{{ detailData.salesBillNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="制单人">{{ detailData.operatorName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务员">{{ detailData.salesManName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ detailData.billStatusDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务状态">{{ detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions size="small" :column="3">
+              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName? detailData.buyerName : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="客户地址">{{ detailData&&detailData.shippingAddressProvinceName ? detailData.shippingAddressProvinceName : '--' }}{{ detailData.shippingAddressCityName || '--' }}{{ detailData.shippingAddressCountyName || '--' }}{{ detailData.shippingAddress || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleEntity&&detailData.settleStyleEntity.name?detailData.settleStyleEntity.name: '--' }}</a-descriptions-item>
+              <a-descriptions-item label="联系电话">{{ detailData&&detailData.consigneeTel ? detailData.consigneeTel : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="备注">{{ detailData&&detailData.remarks ? detailData.remarks : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="销售单号">{{ detailData&&detailData.salesBillNo ? detailData.salesBillNo : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="制单人">{{ detailData&&detailData.operatorName ? detailData.operatorName : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="业务员">{{ detailData&&detailData.salesManName ? detailData.salesManName : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue ? detailData.billStatusDictValue : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue ? detailData.financialStatusDictValue : '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
       </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;">
           <div slot="message">
-            总款数:<strong>{{ detailData.totalCategory || 0 }}</strong>;总数量:<strong>{{ detailData.totalQty || 0 }}</strong>;总赠品数量:<strong>{{ detailData.giftQty || 0 }}</strong>;急件总款数:<strong>{{ detailData.oosCategory || 0 }}</strong>;急件总数量:<strong>{{ detailData.oosQty || 0 }}</strong>;<br/>
-            总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;折后总售价:<strong>{{ detailData.discountedAmount || 0 }}</strong>;折扣:<strong>{{ detailData.discountRate || 0 }}%</strong>;折扣金额:<strong>{{ detailData.discountAmount || 0 }}</strong>;
+            总款数:<strong>{{ detailData&&detailData.totalCategory ? detailData.totalCategory : 0 }}</strong>;
+            总数量:<strong>{{ detailData&&detailData.totalQty ? detailData.totalQty : 0 }}</strong>;
+            总赠品数量:<strong>{{ detailData&&detailData.giftQty ? detailData.giftQty : 0 }}</strong>;
+            急件总款数:<strong>{{ detailData&&detailData.oosCategory ? detailData.oosCategory : 0 }}</strong>;
+            急件总数量:<strong>{{ detailData&&detailData.oosQty ? detailData.oosQty : 0 }}</strong>;<br/>
+            总售价:<strong>{{ detailData&&detailData.totalAmount ? detailData.totalAmount : 0 }}</strong>;
+            总成本:<strong>{{ detailData&&detailData.totalCost ? detailData.totalCost : 0 }}</strong>;
+            总毛利:<strong>{{ detailData&&detailData.grossProfit ? detailData.grossProfit : 0 }}</strong>;
+            折后总售价:<strong>{{ detailData&&detailData.discountedAmount ? detailData.discountedAmount : 0 }}</strong>;
+            折扣:<strong>{{ detailData&&detailData.discountRate ? detailData.discountRate : 0 }}%</strong>;
+            折扣金额:<strong>{{ detailData&&detailData.discountAmount ? detailData.discountAmount : 0 }}</strong>;
           </div>
         </a-alert>
         <!-- 列表 -->