From 7bfec582f1f5fb797f7c34176c007904d71c5119 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 25 Nov 2024 14:21:21 +0800
Subject: [PATCH] md

---
 .../emis/emisSettleInvoiceChRecord/index.vue  | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/emis/emisSettleInvoiceChRecord/index.vue b/src/views/emis/emisSettleInvoiceChRecord/index.vue
index 725c23be..6b2d2712 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/index.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/index.vue
@@ -215,17 +215,20 @@
 
       <!-- <el-table-column :label="$t('账期')" align="center" prop="settleBill.billMonth" width="80" :show-overflow-tooltip="true" /> -->
       <el-table-column :label="$t('账期')" align="center" prop="billMonth" width="80" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('代垫费用')" align="center" prop="ddfy" width="80" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('折让')" align="center" prop="zr" width="80" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('赔偿等杂费')" align="center" prop="pc" width="120" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('实际运费')" align="center" prop="sjyf" width="80" :show-overflow-tooltip="true" />
-
-      <el-table-column :label="$t('备注')" align="center" prop="dcbz" width="80" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('付款日期')" align="center" prop="fkrq" width="80" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('快递公司')" align="center" prop="kdgs" width="80" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('面单单号')" align="center" prop="mddh" width="80" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('快递单号')" align="center" prop="mddh" width="80" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('业务员')" align="center" prop="salemen" width="80" :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('代垫费用')" align="center" prop="ddfy" width="80" :show-overflow-tooltip="true" /> -->
+      <!-- <el-table-column :label="$t('折让')" align="center" prop="zr" width="80" :show-overflow-tooltip="true" /> -->
+      <!-- <el-table-column :label="$t('赔偿等杂费')" align="center" prop="pc" width="120" :show-overflow-tooltip="true" /> -->
+      <!-- <el-table-column :label="$t('实际运费')" align="center" prop="sjyf" width="80" :show-overflow-tooltip="true" /> -->
+      <el-table-column :label="$t('备注')" align="center" prop="remark" width="80" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+          <span>{{scope.row.applyRemark}} / {{scope.row.remark}}</span>
+          </template>
+        </el-table-column>
+      <!-- <el-table-column :label="$t('付款日期')" align="center" prop="fkrq" width="80" :show-overflow-tooltip="true" /> -->
+      <!-- <el-table-column :label="$t('快递公司')" align="center" prop="kdgs" width="80" :show-overflow-tooltip="true" /> -->
+      <el-table-column :label="$t('面单单号')" align="center" prop="billCode" width="80" :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('快递单号')" align="center" prop="mddh" width="80" :show-overflow-tooltip="true" /> -->
+      <el-table-column :label="$t('业务员')" align="center" prop="salesmen" width="80" :show-overflow-tooltip="true" />
 
       <el-table-column :label="$t('开票金额')" align="center" prop="openMoney" width="80" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('公司抬头')" align="center" prop="companyName" width="170" :show-overflow-tooltip="true" />