From 0061d27f46ec428f3511524032acd8803df62fb0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 7 Aug 2024 09:00:41 +0800
Subject: [PATCH] md

---
 .../panel/ChargeBillMoneyPanel.vue            |  10 +-
 .../panel/ChargeBillMonthPanel.vue            |  11 +-
 .../emis/emisSettleBill/panel/MoneyPanel.vue  |  11 +-
 .../emis/emisSettleBill/panel/MonthPanel.vue  |  11 +-
 .../emisSettleBill/panel/SiteConfimPanel.vue  |   6 +-
 .../panel/SiteConfirmSubBillListPanel.vue     |   4 -
 .../panel/SiteWaitOpenBillPanel.vue           |  13 +-
 .../CenterInvoiceRecordDealListPanel.vue      |  13 +-
 .../panel/InvoiceRecordApplyListPanel.vue     |  14 +-
 .../SubBillConfirmByMonthList.vue             | 212 ++++++++---------
 .../SubBillConfirmBySiteList.vue              | 217 +++++++++---------
 .../emisSettleSubBill/subBillMergeMgnt.vue    |   6 +-
 12 files changed, 285 insertions(+), 243 deletions(-)

diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
index 02b60cdc..527a2de9 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
           <el-form-item label="" prop="billCode" label-width="80px">
                   <div slot="label">
                       <el-radio-group class="query-label" v-model="queryOrderType">
@@ -51,6 +51,10 @@
           </SearchForm>
          <!-- 账单表 -->
           <XdTable
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                 v-loading="loading"
                 border stripe
                 size="mini"
@@ -195,7 +199,7 @@
         </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
index 2e1315ff..281c3de3 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
           <el-form-item label="" prop="billCode" label-width="80px">
                   <div slot="label">
                       <el-radio-group class="query-label" v-model="queryOrderType">
@@ -60,6 +60,11 @@
           </SearchForm>
          <!-- 账单表 -->
           <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
                 v-loading="loading"
                 border stripe
                 size="mini"
@@ -219,7 +224,7 @@
         </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
index cff2311e..8083c561 100644
--- a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm slot="pageHeader"   :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
             <el-form-item label="" prop="billCode" label-width="80px">
                   <div slot="label">
                       <el-radio-group class="query-label" v-model="queryOrderType">
@@ -55,6 +55,11 @@
           </SearchForm>
          <!-- 账单表 -->
           <XdTable
+
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                 v-loading="loading"
                 border stripe
                 size="mini"
@@ -186,7 +191,7 @@
         </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisSettleBill/panel/MonthPanel.vue b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
index 94d6bb67..de69686f 100644
--- a/src/views/emis/emisSettleBill/panel/MonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm slot="pageHeader"    :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
           <el-form-item label="" prop="settleBillNo" label-width="80px">
                   <div slot="label">
                       <el-radio-group class="query-label" v-model="queryOrderType">
@@ -55,6 +55,11 @@
           </SearchForm>
          <!-- 账单表 -->
           <XdTable
+
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                 v-loading="loading"
                 border stripe
                 size="mini"
@@ -181,7 +186,7 @@
         </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index ff46e7f6..406cc837 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -1,6 +1,6 @@
 <template>
   <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+        <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
             <el-form-item label="" prop="billCode" label-width="80px">
                   <div slot="label">
                       <el-radio-group class="query-label" v-model="queryOrderType">
@@ -60,6 +60,10 @@
           </SearchForm>
          <!-- 账单表 -->
           <XdTable
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                 v-loading="loading"
                 border stripe
                 size="mini"
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
index 761f2dbf..5bfc11bf 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
@@ -21,10 +21,6 @@
 
         </el-descriptions>
       </div>
-
-
-
-
              <!-- 账单明细数据表 -->
           <XdTable
               v-loading="loading"
diff --git a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
index ae6736d7..ef6e28d3 100644
--- a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
             <el-form-item label="" prop="billCode" label-width="80px">
                   <div slot="label">
                       <el-radio-group class="query-label" v-model="queryOrderType">
@@ -29,6 +29,11 @@
           </SearchForm>
          <!-- 账单表 -->
           <XdTable
+
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                 v-loading="loading"
                 border stripe
                 size="mini"
@@ -143,7 +148,7 @@
             <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
             <el-table-column :label="$t('生成账单时间')" align="center" prop="createTime" min-width="170" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
-            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" :disabled="this.$store.getters.ownerSiteCode !='88888'"/>
+            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" :disabled="$store.getters.ownerSiteCode !='88888'"/>
 
             <!-- <el-table-column :label="$t('理赔原因')" align="center" prop="satisfyMoney" min-width="100" /> -->
             <!-- <el-table-column :label="$t('抵让原因')" align="center" prop="deductionReason" min-width="100" /> -->
@@ -171,7 +176,7 @@
         </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
index 2cf0ef4e..7e3575e5 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+    <SearchForm  slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="申请序号" prop="applySeqNo">
         <el-input
@@ -318,7 +318,12 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border stripe
            size="small"
 
@@ -459,7 +464,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
index 4c505484..496c5e31 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+    <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="申请序号" prop="applySeqNo">
         <el-input
@@ -317,7 +317,13 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border stripe
            size="small"
 
@@ -467,7 +473,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index b6bc20c2..c3108bb6 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -11,117 +11,117 @@
       </el-tabs>
 
 
-   <SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
-     size="mini" :maxShow="12"  label-width="100px"
-     v-show="showSearch"
-     @search="handleQuery"
-     @reset="resetQuery"
-     :isShowSearchBtn="true"
-     >
-        <el-form-item label="运单号" prop="billCode">
-           <XdTextareaInput
-             v-model="queryParams.billCode"
-             :placeholder="$t('多个流水号逗号或换行隔开')"
-             clearable
-             :rows="1"
-           />
-         </el-form-item>
-       <el-form-item label="寄件日期" prop="sendDate">
-           <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
-       </el-form-item>
-       <el-form-item label="寄件网点" prop="params.sendSiteCode">
-       <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
-     </el-form-item>
-     <el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
-       <EmisSiteSimplePicker2  v-model="queryParams.params.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
-     </el-form-item>
-     <el-form-item label="账单类型"  v-if="actionType==3 || actionType==4" prop="settleType">
-      <el-select  clearable v-model="queryParams.settleType" placeholder="账单类型">
-           <el-option key="1" label="现金" value="1"></el-option>
-           <el-option key="2" label="月结" value="2"></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item label="是否特殊报价"  prop="params.blSpecialQuote">
-      <el-select  clearable v-model="queryParams.params.blSpecialQuote" placeholder="">
-           <el-option key="1" label="是" value="1"></el-option>
-           <el-option key="0" label="否" value="0"></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item label="确认状态"  prop="confirmStatus">
-      <el-select  clearable v-model="queryParams.confirmStatus" placeholder="">
-           <el-option key="1" label="财务未确认" value="1"></el-option>
-           <el-option key="2" label="业务未确认" value="2"></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item label="线路" prop="params.transLineType">
-              <TransLinePicker v-model="queryParams.params.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
-     </el-form-item>
+      <SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
+        size="mini" :maxShow="12"  label-width="100px"
+        v-show="showSearch"
+        @search="handleQuery"
+        @reset="resetQuery"
+        :isShowSearchBtn="true"
+        >
+            <el-form-item label="运单号" prop="billCode">
+              <XdTextareaInput
+                v-model="queryParams.billCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                :rows="1"
+              />
+            </el-form-item>
+          <el-form-item label="寄件日期" prop="sendDate">
+              <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
+          </el-form-item>
+          <el-form-item label="寄件网点" prop="params.sendSiteCode">
+          <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
+        </el-form-item>
+        <el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
+          <EmisSiteSimplePicker2  v-model="queryParams.params.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
+        </el-form-item>
+        <el-form-item label="账单类型"  v-if="actionType==3 || actionType==4" prop="settleType">
+          <el-select  clearable v-model="queryParams.settleType" placeholder="账单类型">
+              <el-option key="1" label="现金" value="1"></el-option>
+              <el-option key="2" label="月结" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否特殊报价"  prop="params.blSpecialQuote">
+          <el-select  clearable v-model="queryParams.params.blSpecialQuote" placeholder="">
+              <el-option key="1" label="是" value="1"></el-option>
+              <el-option key="0" label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认状态"  prop="confirmStatus">
+          <el-select  clearable v-model="queryParams.confirmStatus" placeholder="">
+              <el-option key="1" label="财务未确认" value="1"></el-option>
+              <el-option key="2" label="业务未确认" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="线路" prop="params.transLineType">
+                  <TransLinePicker v-model="queryParams.params.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
+        </el-form-item>
 
-    <el-form-item label="产品类型" prop="productType">
-      <TransProductPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" @onChange="handleQuery"></TransProductPicker>
-    </el-form-item>
-     <el-form-item label="计费方式"  prop="params.calcFeeType">
-         <el-select   clearable v-model="queryParams.params.calcFeeType" placeholder="请选择">
-           <el-option
-             v-for="dict in dict.type.emis_calc_fee_type"
-             :key="dict.value"
-             :label="dict.label"
-             :value="dict.value"
-           ></el-option>
-        </el-select>
-     </el-form-item>
+        <el-form-item label="产品类型" prop="productType">
+          <TransProductPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" @onChange="handleQuery"></TransProductPicker>
+        </el-form-item>
+        <el-form-item label="计费方式"  prop="params.calcFeeType">
+            <el-select   clearable v-model="queryParams.params.calcFeeType" placeholder="请选择">
+              <el-option
+                v-for="dict in dict.type.emis_calc_fee_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+        </el-form-item>
 
-     <el-form-item v-if="actionType==2 || actionType==3 || actionType==4" label="月结客户" prop="custNo">
-       <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
-     </el-form-item>
-     <el-form-item label="付款方式" prop="params.paymentType" >
-         <el-select  v-if="actionType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
-           <el-option
-             v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))"
-             :key="dict.value"
-             :label="dict.label"
-             :value="dict.value"
-           ></el-option>
-       </el-select>
+        <el-form-item v-if="actionType==2 || actionType==3 || actionType==4" label="月结客户" prop="custNo">
+          <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
+        </el-form-item>
+        <el-form-item label="付款方式" prop="params.paymentType" >
+            <el-select  v-if="actionType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
+              <el-option
+                v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+          </el-select>
 
-       <el-select  v-if="actionType==2 || actionType==3 || actionType==4" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
-         <el-option
-           v-for="dict in dict.type.emis_payment_type.filter(item=>['2','4','5'].includes(item.value))"
-           :key="dict.value"
-           :label="dict.label"
-           :value="dict.value"
-         ></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item :label="$t('回款联系人')" prop="params.payee">
-       <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee"  ></PayeePicker>
-     </el-form-item>
-   <el-form-item :label="$t('销售联系人')" prop="params.salesmen">
-     <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" :disabled="actionType==3" ></SalemanPicker>
-   </el-form-item>
-   <el-form-item label="寄件公司" prop="params.sendCompany">
-         <el-input
-           v-model="queryParams.params.sendCompany"
-           :placeholder="$t('寄件公司')"
-           clearable
-           @keyup.enter.native="handleQuery"
-         />
-       </el-form-item>
-
-     <el-form-item label="收件公司" prop="params.receiveCompany">
-           <el-input
-             v-model="queryParams.params.receiveCompany"
-             :placeholder="$t('收件公司')"
-             clearable
-             @keyup.enter.native="handleQuery"
-           />
-         </el-form-item>
-
-         <el-form-item label="问题件类型" prop="problemType">
-            <ProblemTypePicker v-model="queryParams.params.problemType"  ></ProblemTypePicker>
+          <el-select  v-if="actionType==2 || actionType==3 || actionType==4" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
+            <el-option
+              v-for="dict in dict.type.emis_payment_type.filter(item=>['2','4','5'].includes(item.value))"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('回款联系人')" prop="params.payee">
+          <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee"  ></PayeePicker>
+        </el-form-item>
+      <el-form-item :label="$t('销售联系人')" prop="params.salesmen">
+        <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" :disabled="actionType==3" ></SalemanPicker>
+      </el-form-item>
+      <el-form-item label="寄件公司" prop="params.sendCompany">
+            <el-input
+              v-model="queryParams.params.sendCompany"
+              :placeholder="$t('寄件公司')"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
 
-     </SearchForm>
+        <el-form-item label="收件公司" prop="params.receiveCompany">
+              <el-input
+                v-model="queryParams.params.receiveCompany"
+                :placeholder="$t('收件公司')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+
+            <el-form-item label="问题件类型" prop="problemType">
+                <ProblemTypePicker v-model="queryParams.params.problemType"  ></ProblemTypePicker>
+              </el-form-item>
+
+      </SearchForm>
 
 
     </div>
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index ac691560..bb7b5385 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -1,122 +1,125 @@
 <template>
   <XdPageContainer class="app-container">
-    <el-tabs slot="pageHeader"   v-model="activeTab" class="center-tabs" @tab-click="handleClick">
-     <el-tab-pane label="全部" name="all" />
-     <el-tab-pane label="未确认" name="waitConfirm" />
-     <el-tab-pane label="已确认" name="hasConfirm" />
-     <el-tab-pane label="确认不出账" name="confirmNotBill" />
-     <!-- <el-tab-pane label="财务置账单异常" name="billError" /> -->
-     <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
-   </el-tabs>
+    <div slot="pageHeader">
+        <el-tabs    v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+        <el-tab-pane label="全部" name="all" />
+        <el-tab-pane label="未确认" name="waitConfirm" />
+        <el-tab-pane label="已确认" name="hasConfirm" />
+        <el-tab-pane label="确认不出账" name="confirmNotBill" />
+        <!-- <el-tab-pane label="财务置账单异常" name="billError" /> -->
+        <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
+      </el-tabs>
 
 
-   <SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
-     size="mini" :maxShow="12"  label-width="100px"
-     v-show="showSearch"
-     @search="handleQuery"
-     @reset="resetQuery"
-     :isShowSearchBtn="true"
-     >
-        <el-form-item label="运单号" prop="billCode">
-           <XdTextareaInput
-             v-model="queryParams.billCode"
-             :placeholder="$t('多个流水号逗号或换行隔开')"
-             clearable
-             :rows="1"
-           />
-         </el-form-item>
-       <el-form-item label="寄件日期" prop="sendDate">
-           <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
-       </el-form-item>
-       <el-form-item label="寄件网点" prop="params.sendSiteCode">
-       <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
-     </el-form-item>
-     <el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
-       <EmisSiteSimplePicker2  v-model="queryParams.params.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
-     </el-form-item>
-     <el-form-item label="账单类型"  prop="settleType">
-      <el-select  clearable v-model="queryParams.settleType" placeholder="账单类型">
-           <el-option key="1" label="现金" value="1"></el-option>
-           <el-option key="2" label="月结" value="2"></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item label="是否特殊报价"  prop="params.blSpecialQuote">
-      <el-select  clearable v-model="queryParams.params.blSpecialQuote" placeholder="">
-           <el-option key="1" label="是" value="1"></el-option>
-           <el-option key="0" label="否" value="0"></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item label="财务确认状态"  prop="blConfirmCenter">
-      <el-select  clearable v-model="queryParams.blConfirmCenter" placeholder="">
-           <el-option key="0" label="财务未确认" value="0"></el-option>
-           <el-option key="1" label="财务已确认" value="1"></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item label="线路" prop="params.transLineType">
-              <TransLinePicker v-model="queryParams.params.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
-     </el-form-item>
+      <SearchForm :model="queryParams" ref="queryForm"
+        size="mini" :maxShow="12"  label-width="100px"
+        v-show="showSearch"
+        @search="handleQuery"
+        @reset="resetQuery"
+        :isShowSearchBtn="true"
+        >
+            <el-form-item label="运单号" prop="billCode">
+              <XdTextareaInput
+                v-model="queryParams.billCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                :rows="1"
+              />
+            </el-form-item>
+          <el-form-item label="寄件日期" prop="sendDate">
+              <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
+          </el-form-item>
+          <el-form-item label="寄件网点" prop="params.sendSiteCode">
+          <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
+        </el-form-item>
+        <el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
+          <EmisSiteSimplePicker2  v-model="queryParams.params.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
+        </el-form-item>
+        <el-form-item label="账单类型"  prop="settleType">
+          <el-select  clearable v-model="queryParams.settleType" placeholder="账单类型">
+              <el-option key="1" label="现金" value="1"></el-option>
+              <el-option key="2" label="月结" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否特殊报价"  prop="params.blSpecialQuote">
+          <el-select  clearable v-model="queryParams.params.blSpecialQuote" placeholder="">
+              <el-option key="1" label="是" value="1"></el-option>
+              <el-option key="0" label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="财务确认状态"  prop="blConfirmCenter">
+          <el-select  clearable v-model="queryParams.blConfirmCenter" placeholder="">
+              <el-option key="0" label="财务未确认" value="0"></el-option>
+              <el-option key="1" label="财务已确认" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="线路" prop="params.transLineType">
+                  <TransLinePicker v-model="queryParams.params.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
+        </el-form-item>
 
-    <el-form-item label="产品类型" prop="productType">
-      <TransProductPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" @onChange="handleQuery"></TransProductPicker>
-    </el-form-item>
-     <el-form-item label="计费方式"  prop="params.calcFeeType">
-         <el-select   clearable v-model="queryParams.params.calcFeeType" placeholder="请选择">
-           <el-option
-             v-for="dict in dict.type.emis_calc_fee_type"
-             :key="dict.value"
-             :label="dict.label"
-             :value="dict.value"
-           ></el-option>
-        </el-select>
-     </el-form-item>
+        <el-form-item label="产品类型" prop="productType">
+          <TransProductPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" @onChange="handleQuery"></TransProductPicker>
+        </el-form-item>
+        <el-form-item label="计费方式"  prop="params.calcFeeType">
+            <el-select   clearable v-model="queryParams.params.calcFeeType" placeholder="请选择">
+              <el-option
+                v-for="dict in dict.type.emis_calc_fee_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+        </el-form-item>
 
-     <el-form-item label="月结客户" prop="custNo">
-       <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
-     </el-form-item>
-     <el-form-item label="付款方式" prop="params.paymentType" >
-       <el-select clearable v-model="queryParams.params.paymentType" placeholder="请选择">
-         <el-option
-           v-for="dict in dict.type.emis_payment_type"
-           :key="dict.value"
-           :label="dict.label"
-           :value="dict.value"
-         ></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item :label="$t('回款联系人')" prop="params.payee">
-       <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee"  ></PayeePicker>
-     </el-form-item>
-   <el-form-item :label="$t('销售联系人')" prop="params.salesmen">
-     <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen"  :disabled="$store.getters.ownerSiteCode != '88888'"  ></SalemanPicker>
-   </el-form-item>
-   <el-form-item label="寄件公司" prop="params.sendCompany">
-         <el-input
-           v-model="queryParams.params.sendCompany"
-           :placeholder="$t('寄件公司')"
-           clearable
-           @keyup.enter.native="handleQuery"
-         />
-       </el-form-item>
-
-     <el-form-item label="收件公司" prop="params.receiveCompany">
-           <el-input
-             v-model="queryParams.params.receiveCompany"
-             :placeholder="$t('收件公司')"
-             clearable
-             @keyup.enter.native="handleQuery"
-           />
-         </el-form-item>
-
-         <el-form-item label="问题件类型" prop="problemType">
-            <ProblemTypePicker v-model="queryParams.params.problemType"  ></ProblemTypePicker>
+        <el-form-item label="月结客户" prop="custNo">
+          <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
+        </el-form-item>
+        <el-form-item label="付款方式" prop="params.paymentType" >
+          <el-select clearable v-model="queryParams.params.paymentType" placeholder="请选择">
+            <el-option
+              v-for="dict in dict.type.emis_payment_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('回款联系人')" prop="params.payee">
+          <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee"  ></PayeePicker>
+        </el-form-item>
+      <el-form-item :label="$t('销售联系人')" prop="params.salesmen">
+        <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen"  :disabled="$store.getters.ownerSiteCode != '88888'"  ></SalemanPicker>
+      </el-form-item>
+      <el-form-item label="寄件公司" prop="params.sendCompany">
+            <el-input
+              v-model="queryParams.params.sendCompany"
+              :placeholder="$t('寄件公司')"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
 
-     </SearchForm>
+        <el-form-item label="收件公司" prop="params.receiveCompany">
+              <el-input
+                v-model="queryParams.params.receiveCompany"
+                :placeholder="$t('收件公司')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+
+            <el-form-item label="问题件类型" prop="problemType">
+                <ProblemTypePicker v-model="queryParams.params.problemType"  ></ProblemTypePicker>
+              </el-form-item>
+
+        </SearchForm>
+
+    </div>
 
    <XdTable
          slot="pageContent"
          slot-scope="slotProps"
-         :height="(slotProps.contentHeight-60)+'px'"
+         :height="(slotProps.contentHeight)+'px'"
 
          v-loading="loading"
           border
diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
index 3ebea953..25941d1f 100644
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@@ -1,7 +1,7 @@
 <template>
   <XdPageContainer class="app-container">
     <!-- slot="pageTabs" -->
-   <SearchForm  :model="queryParams" ref="queryForm"
+   <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
      size="mini" :maxShow="8"  label-width="80px"
      v-show="showSearch"
      @search="handleQuery"
@@ -92,6 +92,10 @@
          <!-- height="calc(100% - 0px)" -->
    <XdTable
 
+        slot="pageContent"
+         slot-scope="slotProps"
+         :height="(slotProps.contentHeight)+'px'"
+
          v-loading="loading"
           border
           size="mini"