From 17b21cf3562a7418cae725f52dc702acda06cc60 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 29 Jul 2024 11:41:51 +0800
Subject: [PATCH] md

---
 .../panel/SiteConfirmSubBillListPanel.vue     |  53 ++-
 .../emisSettleBill/panel/SubBillListPanel.vue |  50 +--
 .../tmp/SettleMainBillMonthList copy.vue      |   2 +-
 .../tmp1/OpenBillMonthListPanel.vue           |   2 +-
 .../tmp1/PayDtlMonthListPanel.vue             |   2 +-
 .../SubBillConfirmByMoneyList.vue             |  10 +-
 .../SubBillConfirmByMonthList.vue             |  12 +-
 .../SubBillConfirmBySiteList.vue              |  10 +-
 .../emisSettleSubBill/subBillMergeMgnt.vue    |   2 +-
 .../emisTmsSiteBatch/panel/BigBatchPanel.vue  | 304 ++++--------------
 10 files changed, 167 insertions(+), 280 deletions(-)

diff --git a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
index 61c4ba1e..6aeba554 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
@@ -57,8 +57,36 @@
                >置账单异常</el-button>
              </el-col>
         </div>
-
         <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="序号" align="center" width="50">
+                <template slot-scope="scope">
+                    <span v-text="getIndex(scope.$index)"> </span>
+                </template>
+          </el-table-column> -->
+          <!-- 标准费用:<span>￥{{scope.row.waybillDetail.realFee}}</span> -->
+          <el-table-column type="expand">
+            <template slot-scope="scope">
+              <div style="padding: 8px 50px;background:white">
+                  <div style="display:inline-flex;padding: 15px 0px;" >
+                    <div style="font-weight:500;margin-right:20px">总费用(CNY):<span>￥{{scope.row.billFee}}</span> </div>
+                    <div>
+                      <el-button
+                        type="text"
+                        size="mini"
+                        style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
+                        @click="handleShowTraceInfo(scope.row)"
+                      >运单详情</el-button>
+                    </div>
+                  </div>
+                  <div style="font-weight:500;margin-bottom:20px">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
+
+                  <div style="width: 500px;">
+                    <BillFeeListPanel :key="'feeitem_'+scope.$index" :feeitemList="scope.row.feeitemList"></BillFeeListPanel>
+                  </div>
+
+              </div>
+            </template>
+          </el-table-column>
         <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
         <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -67,7 +95,7 @@
           </el-table-column>
           <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-            <span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
+            <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
           </template>
        </el-table-column>
        <el-table-column :label="$t('支付方式')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
@@ -99,12 +127,12 @@
 
         <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
-        <el-table-column  v-if="settleBillItem.settleType==2" :label="$t('月结编号')" align="center" prop="custNo" min-width="150" :show-overflow-tooltip="true">
+        <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="150" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <span  type="normal">{{ scope.row.custNo }}</span>
             </template>
         </el-table-column>
-        <el-table-column v-if="settleBillItem.settleType==2" :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
+        <el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <span  type="normal">{{ scope.row.custName }}</span>
             </template>
@@ -124,7 +152,15 @@
           <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
           <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
           <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
-          <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
+          <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
+            <template slot-scope="scope">
+                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
+                <span v-else>{{scope.row.waybillDetail.freight}}</span>
+            </template>
+          </el-table-column>
+
+
+          <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
           <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
           <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
           <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
@@ -200,6 +236,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
 
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
+import BillFeeListPanel from '@/views/emis/emisSettleSubBill/panel/BillFeeListPanel.vue';
 
 import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
 
@@ -234,10 +271,10 @@ export default {
    ProblemTypePicker,
 
    TraceWaybillDetailView,
-   MergeBillForm
+   MergeBillForm,
+   BillFeeListPanel
  },
-  dicts: [
-  ],
+ dicts: ['emis_payment_type'],
   data() {
     return {
       activeTab:'billList',
diff --git a/src/views/emis/emisSettleBill/panel/SubBillListPanel.vue b/src/views/emis/emisSettleBill/panel/SubBillListPanel.vue
index c3fcd4b5..c83f83e5 100644
--- a/src/views/emis/emisSettleBill/panel/SubBillListPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SubBillListPanel.vue
@@ -147,28 +147,28 @@
                 </template>
           </el-table-column>
           <el-table-column type="expand">
-       <template slot-scope="scope">
-         <div style="padding: 8px 50px;background:white">
-            <div style="display:inline-flex;padding: 15px 0px;" >
-              <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
-              <div>
-                <el-button
-                  type="text"
-                  size="mini"
-                  style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
-                  @click="handleShowTraceInfo(scope.row)"
-                >运单详情</el-button>
+            <template slot-scope="scope">
+              <div style="padding: 8px 50px;background:white">
+                  <div style="display:inline-flex;padding: 15px 0px;" >
+                    <div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
+                    <div>
+                      <el-button
+                        type="text"
+                        size="mini"
+                        style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
+                        @click="handleShowTraceInfo(scope.row)"
+                      >运单详情</el-button>
+                    </div>
+                  </div>
+                  <div style="font-weight:500">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
+
+                  <div style="width: 500px;">
+                    <BillFeeListPanel :key="'feeitem_'+scope.$index" :feeitemList="scope.row.feeitemList"></BillFeeListPanel>
+                  </div>
+
               </div>
-            </div>
-            <div style="font-weight:500">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
-
-            <div style="width: 500px;">
-              <BillFeeListPanel :key="'feeitem_'+scope.$index" :feeitemList="scope.row.feeitemList"></BillFeeListPanel>
-            </div>
-
-         </div>
-       </template>
-     </el-table-column>
+            </template>
+          </el-table-column>
 
         <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
         <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
@@ -235,7 +235,13 @@
           <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
           <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
           <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
-          <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
+          <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
+            <template slot-scope="scope">
+                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
+                <span v-else>{{scope.row.waybillDetail.freight}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
           <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
           <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
           <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
diff --git a/src/views/emis/emisSettleBill/tmp/SettleMainBillMonthList copy.vue b/src/views/emis/emisSettleBill/tmp/SettleMainBillMonthList copy.vue
index 1d39e304..10fe42e9 100644
--- a/src/views/emis/emisSettleBill/tmp/SettleMainBillMonthList copy.vue	
+++ b/src/views/emis/emisSettleBill/tmp/SettleMainBillMonthList copy.vue	
@@ -248,7 +248,7 @@
           <template slot-scope="scope">
               <div style="padding: 8px 50px;background: white;">
                 <div style="display:inline-flex;padding: 15px 0px;" >
-                  <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
+                  <div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
                   <div>
                     <el-button
                       type="text"
diff --git a/src/views/emis/emisSettleBill/tmp1/OpenBillMonthListPanel.vue b/src/views/emis/emisSettleBill/tmp1/OpenBillMonthListPanel.vue
index 9c56c41d..d153a8c7 100644
--- a/src/views/emis/emisSettleBill/tmp1/OpenBillMonthListPanel.vue
+++ b/src/views/emis/emisSettleBill/tmp1/OpenBillMonthListPanel.vue
@@ -119,7 +119,7 @@
           <template slot-scope="scope">
               <div style="padding: 8px 50px;background: white;">
                 <div style="display:inline-flex;padding: 15px 0px;" >
-                  <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
+                  <div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
                   <div>
                     <el-button
                       type="text"
diff --git a/src/views/emis/emisSettleBill/tmp1/PayDtlMonthListPanel.vue b/src/views/emis/emisSettleBill/tmp1/PayDtlMonthListPanel.vue
index 9c56c41d..d153a8c7 100644
--- a/src/views/emis/emisSettleBill/tmp1/PayDtlMonthListPanel.vue
+++ b/src/views/emis/emisSettleBill/tmp1/PayDtlMonthListPanel.vue
@@ -119,7 +119,7 @@
           <template slot-scope="scope">
               <div style="padding: 8px 50px;background: white;">
                 <div style="display:inline-flex;padding: 15px 0px;" >
-                  <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
+                  <div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
                   <div>
                     <el-button
                       type="text"
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index 7a68d8f3..928d9d13 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -344,7 +344,7 @@
        <template slot-scope="scope">
            <div style="padding: 8px 50px;background: white;">
               <div style="display:inline-flex;padding: 15px 0px;" >
-                <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
+                <div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
                 <div>
                   <el-button
                     type="text"
@@ -426,7 +426,13 @@
        <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
        <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
        <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
-       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
+       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
+            <template slot-scope="scope">
+                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
+                <span v-else>{{scope.row.waybillDetail.freight}}</span>
+            </template>
+          </el-table-column>
+       <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" 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">
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index b2b4f0e2..be2d8c4e 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -344,7 +344,7 @@
        <template slot-scope="scope">
          <div style="padding: 8px 50px;background:white">
             <div style="display:inline-flex;padding: 15px 0px;" >
-              <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
+              <div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
               <div>
                 <el-button
                   type="text"
@@ -426,7 +426,15 @@
        <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
        <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
        <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
-       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
+       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
+            <template slot-scope="scope">
+                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
+                <span v-else>{{scope.row.waybillDetail.freight}}</span>
+            </template>
+          </el-table-column>
+       <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
+
+
        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" 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">
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 1f22caf8..155167e1 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -197,7 +197,7 @@
        <template slot-scope="scope">
         <div style="padding: 8px 50px;background: white;">
               <div style="display:inline-flex;padding: 15px 0px;" >
-                <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
+                <div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
                 <div>
                   <el-button
                     type="text"
@@ -278,7 +278,13 @@
        <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
        <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
        <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
-       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
+       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
+            <template slot-scope="scope">
+                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
+                <span v-else>{{scope.row.waybillDetail.freight}}</span>
+            </template>
+          </el-table-column>
+       <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" 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">
diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
index 4500301b..782e0e14 100644
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@@ -185,7 +185,7 @@
            <div style="padding: 8px 50px;background:white">
 
              <div style="display:inline-flex;padding: 15px 0px;" >
-               <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
+               <div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
                <div>
                  <el-button
                    type="text"
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
index ff07a232..53f63fe1 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
@@ -1,6 +1,5 @@
 <template>
   <XdPageContainer class="app-container">
-    <!-- <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
     <el-form slot="pageHeader" ref="form" size="mini"  :model="queryParams"  label-width="100px">
       <el-row  :gutter="0" style="display: flex;flex-wrap: wrap;">
         <el-col :span="8">
@@ -19,11 +18,7 @@
             />
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="8">
-          <el-form-item label="批次号" prop="batchNo" label-width="100px">
-            <el-input v-model="queryParams.batchNo" clearable="" placeholder="单号输入后按回车"></el-input>
-          </el-form-item>
-        </el-col> -->
+
         <el-col :span="8">
           <el-form-item label="目的国" prop="receiveCountry">
               <CountryPicker :placeholder="$t('目的国')" v-model="queryParams.receiveCountry" ></CountryPicker>
@@ -46,251 +41,31 @@
             </el-select>
           </el-form-item>
         </el-col> -->
-        <el-col :span="8">
+        <el-col :span="12">
           <!-- <el-form-item label="签收时间" prop="dateTimeRange">
             <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
           </el-form-item> -->
           <el-form-item label="" prop="dateTimeRange">
             <div slot="label">
               <el-radio-group  class="query-label" v-model="queryParams.params.queryOrderDateType">
-                <el-radio label="1">下单时间</el-radio>
+                <el-radio label="1">创建时间</el-radio>
                 <!-- <el-radio label="0">录单时间</el-radio> -->
               </el-radio-group>
             </div>
-            <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+            <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" style="width:260px" ></elDateAdvPicker>
           </el-form-item>
         </el-col>
       </el-row>
     <!-- </SearchForm> -->
     </el-form>
 
-    <div slot="pageContent"
-      slot-scope="slotProps"
-      :style="'height:'+(slotProps.contentHeight)+'px'"
-    >
-      <div>
-        <el-button style="margin-right: 5px;"
-          type="primary"
-          plain
-          size="mini"
-          v-hasPermi="['emis:emisTmsSiteBatch:query']"
-          @click="getQuery"
-        >查询</el-button>
-        <el-button style="margin-right: 5px;"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['emis:emisTmsSiteBatch:add']"
-        >去组批次</el-button>
-        <!-- <el-button style="margin-right: 5px;"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['emis:emisTmsSiteBatch:add']"
-        >新增组批次</el-button> -->
-        <el-button style="margin-right: 5px;"
-          type="danger"
-          plain
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['emis:emisTmsSiteBatch:edit']"
-        >修改</el-button>
-        <el-button style="margin-right: 5px;"
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDeleteCoPack"
-          v-hasPermi="['emis:emisTmsSiteBatch:remove']"
-        >删除</el-button>
-        <el-button style="margin-right: 5px;"
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['emis:emisTmsSiteBatch:export']"
-        >下载批次文件</el-button>
-      </div>
+      <XdTable
+            v-loading="loading"
+          slot="pageContent"
+          slot-scope="slotProps"
+          :style="'height:'+(slotProps.contentHeight)+'px'"
+
 
-      <el-tabs v-model="activeName" style="margin-top: 10px;" @tab-click="getQuery">
-        <el-tab-pane label="待组批次" name="first">
-          <XdTable v-loading="loadingWait"
-            :height="(slotProps.contentHeight-200)+'px'"
-            border
-            size="small"
-            :data="emisTmsWaitPackList"
-            :showSearch.sync="showSearch"
-            :queryParams="queryWaitParams"
-            :total="waitTotal"
-            :showRightButton="false"
-            @queryTable="handleQueryWait"
-            @selection-change="handleWaitSelectionChange"
-            @sort-change="handleSortChange"
-          >
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-            <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
-            <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
-            <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
-            <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
-            <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
-            <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
-            <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.estimateDate || '', '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-            <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-            <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
-            <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
-            <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
-            <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
-            <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
-            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
-            <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
-            <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCompany }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.remark }}</span>
-              </template>
-            </el-table-column>
-          </XdTable>
-        </el-tab-pane>
-        <el-tab-pane label="已组批次" name="second">
-          <XdTable v-loading="loadingDone"
-            :height="(slotProps.contentHeight-200)+'px'"
-            border
-            size="small"
-            :data="emisTmsDonePackList"
-            :showSearch.sync="showSearch"
-            :queryParams="queryDoneParams"
-            :total="doneTotal"
-            :showRightButton="false"
-            @queryTable="handleQueryDone"
-            @selection-change="handleDoneSelectionChange"
-            @sort-change="handleSortChange"
-          >
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column :label="$t('组批次号')" align="center" prop="packNo" min-width="170" />
-            <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-            <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
-            <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
-            <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
-            <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
-            <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
-            <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
-            <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.estimateDate || "", '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-            <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-            <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
-            <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
-            <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
-            <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
-            <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" />
-            <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
-            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
-            <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
-            <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCompany }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.remark }}</span>
-              </template>
-            </el-table-column>
-          </XdTable>
-        </el-tab-pane>
-        <el-tab-pane label="合包列表" name="fourth">
-          <packListView ref="packListView" propType="batch" :propParams="queryParams" :slotProps="slotProps"></packListView>
-        </el-tab-pane>
-        <el-tab-pane label="批次列表" name="third">
-          <XdTable v-loading="loading"
-            :height="(slotProps.contentHeight-200)+'px'"
             border
             size="small"
             :data="emisTmsPackList"
@@ -302,6 +77,58 @@
             @selection-change="handleSelectionChange"
             @sort-change="handleSortChange"
           >
+
+          <div slot="toolbar">
+              <el-button style="margin-right: 5px;"
+                type="primary"
+                plain
+                size="mini"
+                v-hasPermi="['emis:emisTmsSiteBatch:query']"
+                @click="getQuery"
+              >查询</el-button>
+              <el-button style="margin-right: 5px;"
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['emis:emisTmsSiteBatch:add']"
+              >去组批次</el-button>
+              <!-- <el-button style="margin-right: 5px;"
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['emis:emisTmsSiteBatch:add']"
+              >新增组批次</el-button> -->
+              <el-button style="margin-right: 5px;"
+                type="danger"
+                plain
+                size="mini"
+                :disabled="single"
+                @click="handleUpdate"
+                v-hasPermi="['emis:emisTmsSiteBatch:edit']"
+              >修改</el-button>
+              <el-button style="margin-right: 5px;"
+                type="danger"
+                plain
+                icon="el-icon-delete"
+                size="mini"
+                :disabled="multiple"
+                @click="handleDeleteCoPack"
+                v-hasPermi="['emis:emisTmsSiteBatch:remove']"
+              >删除</el-button>
+              <el-button style="margin-right: 5px;"
+                type="warning"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['emis:emisTmsSiteBatch:export']"
+              >下载批次文件</el-button>
+            </div>
+
             <el-table-column type="selection" width="55" align="center" />
 
             <el-table-column :label="$t('批次号')" align="center" prop="batchNo" min-width="170" />
@@ -334,8 +161,8 @@
                 <span class="ellipsis">{{ scope.row.destCountryName }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
-            <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
+            <!-- <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" /> -->
             <el-table-column :label="$t('总票数')" align="center" prop="totalWaybillQty" min-width="100" />
             <el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
             <el-table-column :label="$t('总重量(kg)')" align="center" prop="totalWeight" min-width="100" />
@@ -356,9 +183,6 @@
               </template>
             </el-table-column> -->
           </XdTable>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" style="height: 80%" :destroy-on-close="true" @close="handleCancelCo" v-dialogDrag append-to-body>
       <el-form ref="formCo" size="mini" :model="coData" label-width="100px" class="overflowhidden" >