From 2ebcee74c08d0410e91a8a51c3d8b6df092ff06d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 1 Jul 2025 00:54:39 +0800
Subject: [PATCH] md

---
 src/views/emis/emisTmsCostFeeSplit/index.vue | 23 ++++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/emis/emisTmsCostFeeSplit/index.vue b/src/views/emis/emisTmsCostFeeSplit/index.vue
index 14b760c9..8206ce47 100644
--- a/src/views/emis/emisTmsCostFeeSplit/index.vue
+++ b/src/views/emis/emisTmsCostFeeSplit/index.vue
@@ -183,7 +183,7 @@
             <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.calcFeeType"/>
           </template>
       </el-table-column> -->
-      <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :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">
             <span v-if="scope.row.waybillDetail.paymentType==1 || scope.row.waybillDetail.paymentType==3 || scope.row.waybillDetail.paymentType==6">现金</span>
             <span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">月结</span>
@@ -196,7 +196,7 @@
         </template>
       </el-table-column> -->
 
-        <el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
+        <el-table-column :label="$t('月结客户')" align="center" prop="waybillDetail.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-else></span>
@@ -263,8 +263,10 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 export default {
   name: "emisTmsCostFeeSplit",
   components: { elDateAdvPicker,emisTmsCostFeeSplitForm },
-  dicts: ['emis_cost_fee_type','emis_cost_split_type'
-  ],
+  dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_commission_fee_type','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+       'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+       'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
+ ],
   data() {
     return {
       // 遮罩层
@@ -447,7 +449,7 @@ export default {
           qExportParam.pageNum=1;
           qExportParam.pageSize=20000;
 
-          listEmisSettleSubBill(qExportParam).then(response => {
+          listEmisTmsCostFeeSplit(qExportParam).then(response => {
             if (response.code === 200) {
               this.exportData(response.rows,loadingInstance);
             }
@@ -474,11 +476,18 @@ export default {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
 
-        console.log("===>1111===>",v);
-
         if (j === 'index') {
           return ++index
         }
+
+        if (j === 'feeType') {
+          return this.selectDictLabel(this.dict.type.emis_cost_fee_type,v['feeType']);
+        }
+
+        if (j === 'splitType') {
+          return this.selectDictLabel(this.dict.type.emis_cost_split_type,v['splitType']);
+        }
+
         if (j === 'kjlx') {
           return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
         }