From 08716e1b8ddc5565236a27635cdd6dda50fd9ad0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 18 Aug 2024 21:49:24 +0800
Subject: [PATCH] md

---
 .../emis/customerService/waybillTracking.vue  |  9 +++++--
 src/views/emis/emisBaseInvoiceInfo/index.vue  |  2 +-
 src/views/emis/emisBrand/index.vue            |  2 +-
 src/views/emis/emisCountry/index.vue          |  2 +-
 .../emis/emisCustomerInvoiceInfo/index.vue    |  2 +-
 src/views/emis/emisDestination/index.vue      |  4 +--
 src/views/emis/emisElectronicPag/index.vue    |  2 +-
 .../emisElectronicPagApply/manualSendList.vue |  2 +-
 .../emisElectronicPagApply/recoveryList.vue   |  2 +-
 .../recoveryQueryList.vue                     |  2 +-
 .../emis/emisElectronicPagApply/sendList.vue  |  2 +-
 .../usageStatistics.vue                       |  2 +-
 src/views/emis/emisExchangeRate/index.vue     |  5 ++--
 src/views/emis/emisGoods/index.vue            |  2 +-
 src/views/emis/emisMaterial/index.vue         |  2 +-
 src/views/emis/emisNotCalcAging/index.vue     | 26 +++++++++----------
 src/views/emis/emisPrintTpl/index.vue         | 17 ++++++++----
 src/views/emis/emisProblemType/index.vue      |  2 +-
 src/views/emis/emisRegion/index.vue           |  2 +-
 src/views/emis/emisSalesmenRel/index.vue      |  2 +-
 .../SubBillConfirmByMoneyList.vue             |  2 +-
 .../SubBillConfirmByMonthList.vue             | 23 +++++-----------
 src/views/emis/emisSettleType/index.vue       |  2 +-
 src/views/emis/emisSiteBillControl/index.vue  |  2 +-
 .../prepaidRechargeAudit.vue                  |  2 +-
 .../emisSiteSettleRecord/addSettleRecord.vue  |  2 +-
 src/views/emis/emisSmsSendRecord/index.vue    | 17 ++++++++----
 .../emis/emisSpecialCalcWeight/index.vue      |  2 +-
 src/views/emis/emisTmsPack/packPrintList.vue  |  2 +-
 src/views/emis/emisTransLine/index.vue        |  2 +-
 .../emisWarehouseInBatch/WarehouseStockIn.vue |  2 +-
 src/views/emis/emisWaybill/UserOrderList.vue  |  2 +-
 src/views/emis/emisWaybill/waybillModify.vue  | 12 ++++-----
 src/views/emis/emisWaybill/waybillRecord.vue  | 12 ++++-----
 src/views/system/sysDataAuditRecord/index.vue | 20 +++++++++-----
 .../system/sysExportAuditRecord/index.vue     | 20 +++++++++-----
 36 files changed, 116 insertions(+), 99 deletions(-)

diff --git a/src/views/emis/customerService/waybillTracking.vue b/src/views/emis/customerService/waybillTracking.vue
index 2da4fbb3..a7b70ede 100644
--- a/src/views/emis/customerService/waybillTracking.vue
+++ b/src/views/emis/customerService/waybillTracking.vue
@@ -1,7 +1,7 @@
 <template>
   <XdPageContainer  class="dashboard-container" >
     <!-- class="app-container" -->
-    <SearchForm style="background: white;    padding: 10px;"  class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"    @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader" style="background: white; padding: 10px;"  class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"    @search="handleQuery" @reset="resetQuery">
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
         <el-col  :span="14">
           <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@@ -30,7 +30,12 @@
 
     </SearchForm>
 
-    <div style="padding: 0px 10px 5px 0px;">
+    <div
+        slot="pageContent"
+
+        style="padding: 0px 10px 5px 0px;overflow:auto;max-height: 550px"
+
+    >
 
       <div style="display:inline-flex;width: 100%;border-bottom: 1px solid #d9d9d9;margin-bottom: 20px;">
         <div class="form-group-title"><span class="title">{{ $t('跟踪信息') }}</span></div>
diff --git a/src/views/emis/emisBaseInvoiceInfo/index.vue b/src/views/emis/emisBaseInvoiceInfo/index.vue
index 1ddca780..8db8535d 100644
--- a/src/views/emis/emisBaseInvoiceInfo/index.vue
+++ b/src/views/emis/emisBaseInvoiceInfo/index.vue
@@ -157,7 +157,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisBaseInvoiceInfoForm from '@/views/emis/emisBaseInvoiceInfo/emisBaseInvoiceInfoForm';
 
 export default {
-  name: "emisBaseInvoiceInfo",
+  name: "EmisBaseInvoiceInfo",
   components: { elDateSimplePicker,emisBaseInvoiceInfoForm },
   dicts: [
   ],
diff --git a/src/views/emis/emisBrand/index.vue b/src/views/emis/emisBrand/index.vue
index 70337345..6d6b59a3 100644
--- a/src/views/emis/emisBrand/index.vue
+++ b/src/views/emis/emisBrand/index.vue
@@ -213,7 +213,7 @@
 import { listEmisBrand, getEmisBrand, delEmisBrand, addEmisBrand, updateEmisBrand,changeBrandStatus } from "@/api/emis/emisBrand";
 
 export default {
-  name: "emisBrand",
+  name: "EmisBrand",
   components: {  },
   dicts: ['sys_normal_disable'],
   data() {
diff --git a/src/views/emis/emisCountry/index.vue b/src/views/emis/emisCountry/index.vue
index 4501ca5a..8c975d9c 100644
--- a/src/views/emis/emisCountry/index.vue
+++ b/src/views/emis/emisCountry/index.vue
@@ -285,7 +285,7 @@ import { listEmisContinent, getEmisContinent, delEmisContinent, addEmisContinent
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisContinentForm from '@/views/emis/emisContinent/emisContinentForm';
 export default {
-  name: "emisCountry",
+  name: "EmisCountry",
   components: { elDateSimplePicker,emisContinentForm},
   dicts: [
   ],
diff --git a/src/views/emis/emisCustomerInvoiceInfo/index.vue b/src/views/emis/emisCustomerInvoiceInfo/index.vue
index afca7e33..69e8d4ad 100644
--- a/src/views/emis/emisCustomerInvoiceInfo/index.vue
+++ b/src/views/emis/emisCustomerInvoiceInfo/index.vue
@@ -230,7 +230,7 @@ import emisCustomerInvoiceInfoForm from '@/views/emis/emisCustomerInvoiceInfo/em
 import XLSX from 'xlsx'
 
 export default {
-  name: "emisCustomerInvoiceInfo",
+  name: "EmisCustomerInvoiceInfo",
   components: { elDateSimplePicker,emisCustomerInvoiceInfoForm },
   dicts: [
   ],
diff --git a/src/views/emis/emisDestination/index.vue b/src/views/emis/emisDestination/index.vue
index 96513920..5a254976 100644
--- a/src/views/emis/emisDestination/index.vue
+++ b/src/views/emis/emisDestination/index.vue
@@ -1,6 +1,6 @@
 <template>
   <XdPageContainer class="app-container">
- 
+
     <SearchForm  slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="10"  label-width="90px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
           <el-form-item :label="$t('所属国家')" prop="country">
@@ -211,7 +211,7 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 
 export default {
-  name: "emisDestination",
+  name: "EmisDestination",
   components: { CountryTreePicker,CountryPicker,TransLinePicker,EmisSiteSimplePicker,emisDestinationForm },
   dicts: [
         'sys_normal_disable','emis_is_hinterland'
diff --git a/src/views/emis/emisElectronicPag/index.vue b/src/views/emis/emisElectronicPag/index.vue
index f224e150..643f6989 100644
--- a/src/views/emis/emisElectronicPag/index.vue
+++ b/src/views/emis/emisElectronicPag/index.vue
@@ -158,7 +158,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 
 
 export default {
-  name: "emisElectronicPag",
+  name: "EmisElectronicPag",
   components: { elDateSimplePicker },
   dicts: [
   ],
diff --git a/src/views/emis/emisElectronicPagApply/manualSendList.vue b/src/views/emis/emisElectronicPagApply/manualSendList.vue
index 2f44f6d2..105989a5 100644
--- a/src/views/emis/emisElectronicPagApply/manualSendList.vue
+++ b/src/views/emis/emisElectronicPagApply/manualSendList.vue
@@ -144,7 +144,7 @@ import {dateToStr} from '@/utils/custom'
 import { getCenterTotalAvailablePag } from "@/api/emis/emisCommon";
 
 export default {
-  name: "emisElectronicPagApply",
+  name: "ManualSendList",
   components: { elDateSimplePicker,manualSendForm },
   dicts: ['emis_material_type','emis_cancel_status','emis_proc_send_status'],
   data() {
diff --git a/src/views/emis/emisElectronicPagApply/recoveryList.vue b/src/views/emis/emisElectronicPagApply/recoveryList.vue
index 2653398a..cc8cebd5 100644
--- a/src/views/emis/emisElectronicPagApply/recoveryList.vue
+++ b/src/views/emis/emisElectronicPagApply/recoveryList.vue
@@ -193,7 +193,7 @@ import { getDateTimeToString } from '@/utils/payutils'
 import {dateToStr} from '@/utils/custom'
 
 export default {
-  name: "emisElectronicPagApply",
+  name: "RecoveryList",
   components: { elDateSimplePicker },
   dicts: ['emis_material_type','emis_cancel_status','emis_proc_send_status'],
   data() {
diff --git a/src/views/emis/emisElectronicPagApply/recoveryQueryList.vue b/src/views/emis/emisElectronicPagApply/recoveryQueryList.vue
index 90caf51c..2001fd86 100644
--- a/src/views/emis/emisElectronicPagApply/recoveryQueryList.vue
+++ b/src/views/emis/emisElectronicPagApply/recoveryQueryList.vue
@@ -193,7 +193,7 @@ import { getDateTimeToString } from '@/utils/payutils'
 import {dateToStr} from '@/utils/custom'
 
 export default {
-  name: "emisElectronicPagApply",
+  name: "RecoveryQueryList",
   components: { elDateSimplePicker, },
   dicts: ['emis_material_type','emis_cancel_status','emis_proc_send_status'],
   data() {
diff --git a/src/views/emis/emisElectronicPagApply/sendList.vue b/src/views/emis/emisElectronicPagApply/sendList.vue
index 4e4d73fa..87332c5a 100644
--- a/src/views/emis/emisElectronicPagApply/sendList.vue
+++ b/src/views/emis/emisElectronicPagApply/sendList.vue
@@ -160,7 +160,7 @@ import {dateToStr} from '@/utils/custom'
 import { sendByApply,cancelApply } from "@/api/emis/emisElectronicPagApply";
 
 export default {
-  name: "emisElectronicPagApply",
+  name: "SendList",
   components: { elDateSimplePicker},
   dicts: ['emis_material_type','emis_cancel_status','emis_proc_send_status'],
   data() {
diff --git a/src/views/emis/emisElectronicPagApply/usageStatistics.vue b/src/views/emis/emisElectronicPagApply/usageStatistics.vue
index e13a8950..cfa05fbd 100644
--- a/src/views/emis/emisElectronicPagApply/usageStatistics.vue
+++ b/src/views/emis/emisElectronicPagApply/usageStatistics.vue
@@ -192,7 +192,7 @@ import { getDateTimeToString } from '@/utils/payutils'
 import {dateToStr} from '@/utils/custom'
 
 export default {
-  name: "emisElectronicPagApply",
+  name: "UsageStatistics",
   components: { elDateSimplePicker, },
   dicts: ['emis_material_type','emis_cancel_status','emis_proc_send_status'],
   data() {
diff --git a/src/views/emis/emisExchangeRate/index.vue b/src/views/emis/emisExchangeRate/index.vue
index c20eac8b..20f1056b 100644
--- a/src/views/emis/emisExchangeRate/index.vue
+++ b/src/views/emis/emisExchangeRate/index.vue
@@ -148,10 +148,9 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisExchangeRateForm from '@/views/emis/emisExchangeRate/emisExchangeRateForm';
 
 export default {
-  name: "emisExchangeRate",
+  name: "EmisExchangeRate",
   components: { elDateSimplePicker,emisExchangeRateForm },
-  dicts: ['sys_currency_type'
-  ],
+  dicts: ['sys_currency_type'],
   data() {
     return {
       // 遮罩层
diff --git a/src/views/emis/emisGoods/index.vue b/src/views/emis/emisGoods/index.vue
index 5c0f2b45..07fdecfb 100644
--- a/src/views/emis/emisGoods/index.vue
+++ b/src/views/emis/emisGoods/index.vue
@@ -202,7 +202,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisGoodsForm from '@/views/emis/emisGoods/emisGoodsForm';
 
 export default {
-  name: "emisGoods",
+  name: "EmisGoods",
   components: { elDateSimplePicker,emisGoodsForm },
   dicts: [
         'sys_normal_disable',
diff --git a/src/views/emis/emisMaterial/index.vue b/src/views/emis/emisMaterial/index.vue
index fc0d8a6b..5388e3d4 100644
--- a/src/views/emis/emisMaterial/index.vue
+++ b/src/views/emis/emisMaterial/index.vue
@@ -217,7 +217,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisMaterialForm from '@/views/emis/emisMaterial/emisMaterialForm';
 
 export default {
-  name: "emisMaterial",
+  name: "EmisMaterial",
   components: { elDateSimplePicker,emisMaterialForm },
   dicts: [
   ],
diff --git a/src/views/emis/emisNotCalcAging/index.vue b/src/views/emis/emisNotCalcAging/index.vue
index d7752e83..2c49813f 100644
--- a/src/views/emis/emisNotCalcAging/index.vue
+++ b/src/views/emis/emisNotCalcAging/index.vue
@@ -1,11 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="20" type='flex'>
-      <!-- <el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
-        <CountryTreePicker placeholder="所属国家" v-model="queryParams.country"></CountryTreePicker>
-      </el-col> -->
-      <el-col :span="24" :xs="24">
-        <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <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="country" label-width="40px">
             <CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
           </el-form-item>
@@ -18,10 +13,17 @@
 
 
       <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
-          stripe
           size="mini"
+
+          storageName="emisNotCalcAgingList_main"
+
           :data="emisNotCalcAgingList"
           :showSearch.sync="showSearch"
           :total="total"
@@ -134,11 +136,7 @@
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" append-to-body>
       <emisNotCalcAgingForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisNotCalcAgingForm>
     </el-dialog>
-
-
-  </el-col>
-  </el-row>
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -149,7 +147,7 @@ import CountryTreePicker from '@/views/emis/EmisBaseTools/CountryTreePicker.vue'
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 
 export default {
-  name: "emisNotCalcAging",
+  name: "EmisNotCalcAging",
   components: { elDateSimplePicker,CountryPicker,CountryTreePicker,emisNotCalcAgingForm },
   dicts: [
         'sys_normal_disable',
diff --git a/src/views/emis/emisPrintTpl/index.vue b/src/views/emis/emisPrintTpl/index.vue
index 34e28979..ca6cd8d1 100644
--- a/src/views/emis/emisPrintTpl/index.vue
+++ b/src/views/emis/emisPrintTpl/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="10"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="10"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <!-- <el-form-item label="" prop="code">
         <el-input
@@ -21,7 +21,14 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+
+          v-loading="loading"
            border
            size="mini"
            storageName="emisPrintTplList_a"
@@ -178,7 +185,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -189,7 +196,7 @@ import emisPrintTplForm from '@/views/emis/emisPrintTpl/emisPrintTplForm';
 import DesignerPanel from '@/views/emis/emisPrintTpl/designerPanel';
 
 export default {
-  name: "emisPrintTpl",
+  name: "EmisPrintTpl",
   components: { elDateSimplePicker,emisPrintTplForm,DesignerPanel },
   dicts: [
   ],
diff --git a/src/views/emis/emisProblemType/index.vue b/src/views/emis/emisProblemType/index.vue
index 7cec15c5..947814cb 100644
--- a/src/views/emis/emisProblemType/index.vue
+++ b/src/views/emis/emisProblemType/index.vue
@@ -258,7 +258,7 @@ import { listEmisProblemType, getEmisProblemType, delEmisProblemType, addEmisPro
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 
 export default {
-  name: "emisProblemType",
+  name: "EmisProblemType",
   components: { elDateSimplePicker },
   dicts: [
         'sys_is_send_sms',
diff --git a/src/views/emis/emisRegion/index.vue b/src/views/emis/emisRegion/index.vue
index 30d9d670..85f089ab 100644
--- a/src/views/emis/emisRegion/index.vue
+++ b/src/views/emis/emisRegion/index.vue
@@ -35,7 +35,7 @@ import EmisTownPanel from '@/views/emis/emisRegion/TownPanel.vue';
 import CountryTreePicker from '@/views/emis/EmisBaseTools/CountryTreePicker.vue';
 
 export default {
-  name: "emisRegion",
+  name: "EmisRegion",
   components: { EmisPcdPanel,EmisTownPanel,CountryTreePicker,EmisCountryAreaPanel},
   dicts: [
         'emis_region_level_type',
diff --git a/src/views/emis/emisSalesmenRel/index.vue b/src/views/emis/emisSalesmenRel/index.vue
index f32072bf..ab529e66 100644
--- a/src/views/emis/emisSalesmenRel/index.vue
+++ b/src/views/emis/emisSalesmenRel/index.vue
@@ -135,7 +135,7 @@ import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 import SalesAssPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 
 export default {
-  name: "emisSalesmenRel",
+  name: "EmisSalesmenRel",
   components: { elDateSimplePicker,emisSalesmenRelForm ,SalemanPicker,SalesAssPicker},
   dicts: [
   ],
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index ada8bc64..da241864 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -1117,7 +1117,7 @@ export default {
           qExportParam.pageNum=1;
           qExportParam.pageSize=5000;
 
-          listEmisWaybill(qExportParam).then(response => {
+          listEmisSettleSubBill(qExportParam).then(response => {
             if (response.code === 200) {
               this.exportData(response.rows,loadingInstance);
             }
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index d1260fc9..a96c5c97 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -522,7 +522,7 @@ export default {
      daterangeUpdateTime: [],
      // 查询参数
      queryParams: {
-      pageNum: 1,
+        pageNum: 1,
         pageSize: 20,
         billNo: null,
         parentBillNo: null,
@@ -702,7 +702,7 @@ export default {
  },
  created() {
    this.queryParams.blConfirmCenter='0';
-   this.queryParams.blConfirmSite='1';
+  //  this.queryParams.blConfirmSite='1';
    this.actionType=this.$route.query.actionType;
 
    this.initData();
@@ -792,22 +792,11 @@ export default {
    /** 查询结算子账单列表 */
 
    initQueryParams(){
-    if(this.actionType==1){
-       this.queryParams.settleType=1;
-     }
-     else if(this.actionType==2){
-       this.queryParams.settleType=2;
-     }
-     else if(this.actionType==3){
-       this.queryParams.params.salesmen=this.$store.getters.empName
-     }
-     else if(this.actionType==4){
-      this.queryParams.blConfirmCenter=1;
-      this.queryParams.blConfirmSite=1;
-     }
-
+      this.queryParams.settleType=2;
      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
+     return this.queryParams;
    },
+
    getList() {
      this.loading = true;
 
@@ -1198,7 +1187,7 @@ export default {
           qExportParam.pageNum=1;
           qExportParam.pageSize=5000;
 
-          listEmisWaybill(qExportParam).then(response => {
+          listEmisSettleSubBill(qExportParam).then(response => {
             if (response.code === 200) {
               this.exportData(response.rows,loadingInstance);
             }
diff --git a/src/views/emis/emisSettleType/index.vue b/src/views/emis/emisSettleType/index.vue
index 8ee72919..593edfb1 100644
--- a/src/views/emis/emisSettleType/index.vue
+++ b/src/views/emis/emisSettleType/index.vue
@@ -169,7 +169,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisSettleTypeForm from '@/views/emis/emisSettleType/emisSettleTypeForm';
 
 export default {
-  name: "emisSettleType",
+  name: "EmisSettleType",
   components: { elDateSimplePicker,emisSettleTypeForm },
   dicts: [
   ],
diff --git a/src/views/emis/emisSiteBillControl/index.vue b/src/views/emis/emisSiteBillControl/index.vue
index 5d2bad82..a2de6808 100644
--- a/src/views/emis/emisSiteBillControl/index.vue
+++ b/src/views/emis/emisSiteBillControl/index.vue
@@ -169,7 +169,7 @@ import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
 import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 
 export default {
-  name: "emisSiteBillControl",
+  name: "EmisSiteBillControl",
   components: {
     elDateSimplePicker,
     emisSiteBillControlForm,
diff --git a/src/views/emis/emisSitePrepaidRecharge/prepaidRechargeAudit.vue b/src/views/emis/emisSitePrepaidRecharge/prepaidRechargeAudit.vue
index e1756470..ff1ab24b 100644
--- a/src/views/emis/emisSitePrepaidRecharge/prepaidRechargeAudit.vue
+++ b/src/views/emis/emisSitePrepaidRecharge/prepaidRechargeAudit.vue
@@ -178,7 +178,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
 export default {
-  name: "PrepaidRechargeRegister",
+  name: "PrepaidRechargeAudit",
   components: { elDateSimplePicker,emisSitePrepaidRechargeForm ,
     EmisSiteSimplePicker0,EmisSiteSimplePicker1,
     EmisUserSimplePicker0,EmisUserSimplePicker1
diff --git a/src/views/emis/emisSiteSettleRecord/addSettleRecord.vue b/src/views/emis/emisSiteSettleRecord/addSettleRecord.vue
index d452de13..b818ab1d 100644
--- a/src/views/emis/emisSiteSettleRecord/addSettleRecord.vue
+++ b/src/views/emis/emisSiteSettleRecord/addSettleRecord.vue
@@ -66,7 +66,7 @@ import SettleTypePicker from '@/views/emis/EmisBaseTools/SettleTypePicker.vue';
 
 
 export default {
-  name: "emisSiteSettleRecordForm",
+  name: "AddSettleRecord",
   props:{
     id:{
         type:Number
diff --git a/src/views/emis/emisSmsSendRecord/index.vue b/src/views/emis/emisSmsSendRecord/index.vue
index 398932e2..39debfb1 100644
--- a/src/views/emis/emisSmsSendRecord/index.vue
+++ b/src/views/emis/emisSmsSendRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <!-- label-width="68px" -->
       <el-form-item label="运单号" prop="billCode">
         <!-- <div slot="label">
@@ -35,12 +35,19 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+           v-loading="loading"
            border
            size="mini"
            :data="emisSmsSendRecordList"
 
            storageName="emisSmsSendRecord_main"
+
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
            :total="total"
@@ -175,7 +182,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -188,7 +195,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
 export default {
-  name: "emisSmsSendRecord",
+  name: "EmisSmsSendRecord",
   components: { elDateSimplePicker,emisSmsSendRecordForm,EmisSiteSimplePicker1,EmisUserSimplePicker0 },
   dicts: [
   ],
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index 7fb4674e..91f90f28 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/index.vue
@@ -174,7 +174,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
 import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
 
 export default {
-  name: "emisSpecialCalcWeight",
+  name: "EmisSpecialCalcWeight",
   components: { CountryPicker,TransLinePicker,elDateSimplePicker,TransProductPicker,emisSpecialCalcWeightForm ,TransProductCasPicker},
   dicts: [
         'sys_normal_disable',
diff --git a/src/views/emis/emisTmsPack/packPrintList.vue b/src/views/emis/emisTmsPack/packPrintList.vue
index 5f917c36..57c93eec 100644
--- a/src/views/emis/emisTmsPack/packPrintList.vue
+++ b/src/views/emis/emisTmsPack/packPrintList.vue
@@ -141,7 +141,7 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 
 export default {
-  name: "emisTmsPack",
+  name: "PackPrintList",
   components: { elDateAdvPicker,TanexPrinterPanel,Barcode },
   dicts: [
   ],
diff --git a/src/views/emis/emisTransLine/index.vue b/src/views/emis/emisTransLine/index.vue
index 2d24add6..ab27ff50 100644
--- a/src/views/emis/emisTransLine/index.vue
+++ b/src/views/emis/emisTransLine/index.vue
@@ -197,7 +197,7 @@ import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisBrandPicker from '@/views/emis/EmisBaseTools/EmisBrandPicker.vue';
 
 export default {
-  name: "emisTransLine",
+  name: "EmisTransLine",
   components: { CountryTreePicker,emisTransLineForm,CountryPicker,EmisBrandPicker},
   dicts: ['sys_normal_disable','emis_biz_shipping_method','emis_affiliate_type'],
   data() {
diff --git a/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue b/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
index 2531bf58..de4be98b 100644
--- a/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
+++ b/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
@@ -305,7 +305,7 @@ import { listEmisWarehouseIn, getEmisWarehouseIn, delEmisWarehouseIn, addEmisWar
 import GoodsInput from '@/views/emis/EmisBaseTools/GoodsInput.vue';
 
 export default {
-  name: "emisWarehouseInBatchForm",
+  name: "WarehouseStockIn",
   components: { GoodsInput },
   dicts: [
   ],
diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue
index 0f900656..5aa1b7f2 100644
--- a/src/views/emis/emisWaybill/UserOrderList.vue
+++ b/src/views/emis/emisWaybill/UserOrderList.vue
@@ -549,7 +549,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 
 export default {
-  name: "OrderList",
+  name: "UserOrderList",
   components: { elDateAdvPicker,CountryPicker0,CountryPicker1 ,
     EmisSiteSimplePicker1,waybillDetailReadOnly,
     EmisSiteSimplePicker2,
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 93b96bb4..1615afc3 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -596,8 +596,8 @@
                     </el-col>
 
                     <el-form-item :label="$t('特殊报价')"  prop="ext" label-width="70px">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :true-label="1" :false-label="0"> {{ $t('特殊报价') }}</el-checkbox>
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" :true-label="1" :false-label="0"> {{ $t('敏感物') }}</el-checkbox>
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" true-label="1" false-label="0"> {{ $t('特殊报价') }}</el-checkbox>
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" true-label="1" false-label="0"> {{ $t('敏感物') }}</el-checkbox>
 
                     </el-form-item>
 
@@ -692,7 +692,6 @@
                                       type="text"
                                       icon="el-icon-plus"
                                       @click="handleAddFee"
-                                      :disabled="form.calcFeeType=='3'"
                                     >{{ $t('增加自定义费用') }}</el-button>
                               </el-popover>
                           </div>
@@ -1371,6 +1370,9 @@ methods: {
       }
 
       this.form.feeItems.push(newItem);
+
+      this.form.blSpecialQuote='1';
+
       this.handleCalcFeeItem();
     }
   },
@@ -1967,10 +1969,6 @@ methods: {
           // return;
         }
 
-
-
-
-
         let postData={
           productType: this.form.productType,
           customerCode: this.form.customerCode,
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index f07b1464..fafc499d 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -596,8 +596,8 @@
                     </el-col>
 
                     <el-form-item :label="$t('特殊报价')"  prop="ext" label-width="70px">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :true-label="1" :false-label="0"> {{ $t('特殊报价') }}</el-checkbox>
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" :true-label="1" :false-label="0"> {{ $t('敏感物') }}</el-checkbox>
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" true-label="1" false-label="0"> {{ $t('特殊报价') }}</el-checkbox>
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" true-label="1" false-label="0"> {{ $t('敏感物') }}</el-checkbox>
 
                     </el-form-item>
 
@@ -692,7 +692,6 @@
                                       type="text"
                                       icon="el-icon-plus"
                                       @click="handleAddFee"
-                                      :disabled="form.calcFeeType=='3'"
                                     >{{ $t('增加自定义费用') }}</el-button>
                               </el-popover>
                           </div>
@@ -1371,6 +1370,9 @@ methods: {
       }
 
       this.form.feeItems.push(newItem);
+
+      this.form.blSpecialQuote='1';
+
       this.handleCalcFeeItem();
     }
   },
@@ -1967,10 +1969,6 @@ methods: {
           // return;
         }
 
-
-
-
-
         let postData={
           productType: this.form.productType,
           customerCode: this.form.customerCode,
diff --git a/src/views/system/sysDataAuditRecord/index.vue b/src/views/system/sysDataAuditRecord/index.vue
index 9449b516..4f61a2e3 100644
--- a/src/views/system/sysDataAuditRecord/index.vue
+++ b/src/views/system/sysDataAuditRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="10"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="10"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
         <el-col :span="6">
           <el-form-item label="运单号" prop="billCode"  >
@@ -50,8 +50,16 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
-           border stripe
+    <XdTable
+
+        slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          storageName="sysDataAuditRecordList_main"
+
+          v-loading="loading"
+           border
            size="small"
            :data="sysDataAuditRecordList"
            :showSearch.sync="showSearch"
@@ -96,7 +104,7 @@
     </XdTable>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -106,7 +114,7 @@ import SysUserSimplePicker from '@/views/emis/EmisBaseTools/SysUserSimplePicker.
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 
 export default {
-  name: "sysDataAuditRecord",
+  name: "SysDataAuditRecord",
   components: { elDateAdvPicker,SysUserSimplePicker,EmisSiteSimplePicker },
   dicts: [
   ],
diff --git a/src/views/system/sysExportAuditRecord/index.vue b/src/views/system/sysExportAuditRecord/index.vue
index 334a3997..3efd0d87 100644
--- a/src/views/system/sysExportAuditRecord/index.vue
+++ b/src/views/system/sysExportAuditRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <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="createTime">
         <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
       </el-form-item>
@@ -12,8 +12,16 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
-           border stripe
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+           storageName="sysExportAuditRecordList_main_240702"
+
+           v-loading="loading"
+           border
            size="small"
            :data="sysExportAuditRecordList"
            :showSearch.sync="showSearch"
@@ -81,7 +89,7 @@
 
     </XdTable>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -93,7 +101,7 @@ import SysUserSimplePicker from '@/views/emis/EmisBaseTools/SysUserSimplePicker.
 import sysExportAuditRecordForm from '@/views/system/sysExportAuditRecord/sysExportAuditRecordForm';
 
 export default {
-  name: "sysExportAuditRecord",
+  name: "SysExportAuditRecord",
   components: { elDateAdvPicker,SysUserSimplePicker },
   dicts: [
   ],