From 561dcded02e28123f8df35cfe82707dc8f28a714 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 16 Mar 2025 11:48:44 +0800
Subject: [PATCH] md

---
 .../BatchCommissionDtlList.vue                | 195 ++++--------------
 1 file changed, 42 insertions(+), 153 deletions(-)

diff --git a/src/views/emis/emisCommissionDtl/BatchCommissionDtlList.vue b/src/views/emis/emisCommissionDtl/BatchCommissionDtlList.vue
index e019cca0..d2af0d52 100644
--- a/src/views/emis/emisCommissionDtl/BatchCommissionDtlList.vue
+++ b/src/views/emis/emisCommissionDtl/BatchCommissionDtlList.vue
@@ -1,12 +1,12 @@
 <template>
   <XdPageContainer class="app-container">
     <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-      <el-form-item label="运单号" prop="billCode">
+      <el-form-item label="批次号" prop="billCode">
         <el-input
           type="textarea"
           rows="2"
           v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
+          :placeholder="$t('批次号')"
           clearable
         />
       </el-form-item>
@@ -54,7 +54,7 @@
 
            ref="refTable"
 
-            storageName="emisCommissionDtl_main_240702"
+            storageName="batchEmisCommissionDtl_main_240702"
 
            :queryParams="queryParams"
            :total="total"
@@ -181,9 +181,8 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 export default {
   name: "BatchCommissionDtlList",
   components: { elDateSimplePicker,emisCommissionDtlForm,EmisUserSimplePicker0,PayeePicker },
-  dicts: ['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'
+  dicts: [
+    'emis_commission_fee_type','emis_big_batch_type','emis_biz_shipping_method',
  ],
   data() {
     return {
@@ -425,168 +424,58 @@ export default {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
 
-        console.log("===>1111===>",v);
-
         if (j === 'index') {
           return ++index
         }
-        if (j === 'kjlx') {
-          return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
-        }
-        if (j === 'fjr') {
-          return v['sendName']+'--'+v['receiveName'];
+
+        if (j === 'batchDetail.batchName') {
+          return  v['batchDetail']['batchName'];
         }
 
-        if (j === 'waybillDetail.sendSiteName') {
-          return  v['waybillDetail']['sendSiteName'];
+        if (j === 'batchDetail.batchType') {
+          return this.selectDictLabel(this.dict.type.emis_big_batch_type,v['batchDetail']['batchType']);
         }
 
-        if (j === 'waybillDetail.sendCountryName') {
-          return  v['waybillDetail']['sendCountryName'];
+        if (j === 'batchDetail.transType') {
+          return this.selectDictLabel(this.dict.type.emis_biz_shipping_method,v['batchDetail']['transType']);
         }
 
-        if (j === 'waybillDetail.receiveCountryName') {
-          return  v['waybillDetail']['receiveCountryName'];
+        if (j === 'batchDetail.carNo') {
+          return  v['batchDetail']['carNo'];
         }
 
-        if (j === 'waybillDetail.sendDate') {
-          return  v['waybillDetail']['sendDate'];
+        if (j === 'batchDetail.transWeight') {
+          return  v['batchDetail']['transWeight'];
         }
 
-        if (j === 'waybillDetail.sendCompany') {
-          return  v['waybillDetail']['sendCompany'];
+        if (j === 'batchDetail.packNum') {
+          return  v['batchDetail']['packNum'];
+        }
+        if (j === 'batchDetail.etd') {
+          return  v['batchDetail']['etd'];
+        }
+        if (j === 'batchDetail.startSiteName') {
+          return  v['batchDetail']['startSiteName'];
+        }
+        if (j === 'batchDetail.nextSiteName') {
+          return  v['batchDetail']['nextSiteName'];
+        }
+        if (j === 'batchDetail.destCountryName') {
+          return  v['batchDetail']['destCountryName'];
+        }
+        if (j === 'batchDetail.supplierName') {
+          return  v['batchDetail']['supplierName'];
+        }
+        if (j === 'batchDetail.totalWaybillQty') {
+          return  v['batchDetail']['totalWaybillQty'];
+        }
+        if (j === 'batchDetail.totalParcelQty') {
+          return  v['batchDetail']['totalParcelQty'];
+        }
+        if (j === 'batchDetail.totalWeight') {
+          return  v['batchDetail']['totalWeight'];
         }
 
-        if (j === 'waybillDetail.transLineTypeName') {
-          return  v['waybillDetail']['transLineTypeName'];
-        }
-
-        if (j === 'waybillDetail.productTypeName') {
-          return  v['waybillDetail']['productTypeName'];
-        }
-
-
-        if (j === 'waybillDetail.sendName') {
-          return  v['waybillDetail']['sendName'];
-        }
-
-        if (j === 'waybillDetail.parcelQty') {
-          return  v['waybillDetail']['parcelQty'];
-        }
-
-        if (j === 'waybillDetail.billWeight') {
-          return  v['waybillDetail']['billWeight'];
-        }
-
-        if (j === 'waybillDetail.volumeWeight') {
-          return  v['waybillDetail']['volumeWeight'];
-        }
-
-        if (j === 'waybillDetail.totalVolume') {
-          return  v['waybillDetail']['totalVolume'];
-        }
-
-        if (j === 'waybillDetail.settlementWeight') {
-          return  v['waybillDetail']['settlementWeight'];
-        }
-
-        if (j === 'waybillDetail.freight') {
-          return  v['waybillDetail']['freight'];
-        }
-
-        if (j === 'waybillDetail.realFee') {
-          return  v['waybillDetail']['realFee'];
-        }
-
-        if (j === 'waybillDetail.remark') {
-          return  v['waybillDetail']['remark'];
-        }
-
-        if (j === 'waybillDetail.feeRemark') {
-          return  v['waybillDetail']['feeRemark'];
-        }
-
-        if (j === 'waybillDetail.salesmen') {
-          return  v['waybillDetail']['salesmen'];
-        }
-
-        if (j === 'waybillDetail.payee') {
-          return  v['waybillDetail']['payee'];
-        }
-
-        if (j === 'waybillDetail.payee') {
-          return  v['waybillDetail']['payee'];
-        }
-
-        if (j === 'waybillDetail.problemTypeName') {
-          return  v['waybillDetail']['problemTypeName'];
-        }
-
-        if (j === 'waybillDetail.problemCause') {
-          return  v['waybillDetail']['problemCause'];
-        }
-
-        if (j === 'waybillDetail.sendMobile') {
-          return "";
-        }
-
-        if (j === 'waybillDetail.calcFeeType') {
-          return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
-        }
-
-        if (j === 'waybillDetail.paymentStatus') {
-          return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
-        }
-
-        if (j === 'waybillDetail.pickupMethod') {
-          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
-        }
-        if (j === 'waybillDetail.customsEclaration') {
-          return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
-        }
-        if (j === 'waybillDetail.customsClear') {
-          return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
-        }
-        if (j === 'waybillDetail.packType') {
-          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
-        }
-
-        if (j === 'waybillDetail.dispatchMethod') {
-          if(v['waybillDetail']['dispatchMethod'] == 1){
-            return '派送';
-          }else{
-            return '自提';
-          }
-        }
-
-
-
-
-
-        if (j === 'waybillDetail.blMessage') {
-          if(v['waybillDetail']['blMessage']  == 1){
-            return '发送';
-          }else{
-            return '不发送';
-          }
-        }
-        if (j === 'waybillDetail.blAcceptMessage') {
-          if(v['waybillDetail']['blAcceptMessage']   == 1){
-            return '发送';
-          }else{
-            return '不发送';
-          }
-        }
-        if (j === 'waybillDetail.blSign') {
-          if(v['waybillDetail']['blSign'] == 1){
-            return '已签收';
-          }else{
-            return '未签收';
-          }
-        }
-        if (j === 'waybillDetail.paymentType') {
-          return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
-        }
         return v[j]
       }))
     },