From 6862c625f4b15e17fde7d2be1961aecec7daf6d6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 8 Oct 2024 08:46:18 +0800
Subject: [PATCH] md

---
 .../emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue b/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
index e31a9ecf..36e9d817 100644
--- a/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
+++ b/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
@@ -25,7 +25,7 @@
                             </el-table-column>
                             <el-table-column prop="billFee"  :label="$t('运费')"  align="center" width="100">
                               <template slot-scope="scope">
-                                {{scope.row.waybillDetail.freight}}
+                                <span v-if="scope.row.waybillDetail!=null">{{scope.row.waybillDetail.freight}}</span>
                               </template>
                             </el-table-column>
                             <!-- <el-table-column prop="canApplyFee"  :label="$t('可开票金额')"  align="center" width="100">
@@ -41,19 +41,19 @@
                             <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170"    :show-overflow-tooltip="true"/>
                             <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
-                                  <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
+                                  <span  v-if="scope.row.waybillDetail!=null">{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column :label="$t('发件人')" align="center" prop="waybillDetail.sendName" width="100" :show-overflow-tooltip="true"/>
                             <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" width="150"  :show-overflow-tooltip="true"/>
                             <el-table-column :label="$t('支付方式')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true"   >
                               <template slot-scope="scope">
-                                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
+                                <dict-tag  v-if="scope.row.waybillDetail!=null" :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
                               </template>
                             </el-table-column>
                             <el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
-                                  <span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.custName}}</span>
+                                  <span v-if="scope.row.waybillDetail!=null&&(scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5)">{{scope.row.waybillDetail.custName}}</span>
                                   <span v-else></span>
                                 </template>
                               </el-table-column>