diff --git a/src/views/emis/emisBaseInvoiceChInfo/index.vue b/src/views/emis/emisBaseInvoiceChInfo/index.vue
index 82273f41..a67b4b83 100644
--- a/src/views/emis/emisBaseInvoiceChInfo/index.vue
+++ b/src/views/emis/emisBaseInvoiceChInfo/index.vue
@@ -1,7 +1,7 @@
 <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="chName">
         <el-input
           v-model="queryParams.chName"
@@ -92,8 +92,14 @@
       </el-form-item>
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
+
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+           v-loading="loading"
            border stripe
            size="small"
            :data="emisBaseInvoiceChInfoList"
@@ -104,7 +110,7 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -117,7 +123,7 @@
                   v-hasPermi="['emis:emisBaseInvoiceChInfo:add']"
                 >新增</el-button>
               </el-col>
-              <!-- 
+              <!--
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -152,7 +158,7 @@
               </el-col> -->
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
       <!--
       <el-table-column label="序号" align="center" min-width="60">
@@ -160,7 +166,7 @@
                 <span v-text="getIndex(scope.$index)"> </span>
              </template>
       </el-table-column>
-       
+
        <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
         <template slot-scope="scope">
             <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@@ -211,7 +217,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisBaseInvoiceChInfo:edit']"
           >修改</el-button>
-          <!-- 
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -226,7 +232,7 @@
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisBaseInvoiceChInfoForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisBaseInvoiceChInfoForm>
     </el-dialog>
-    
+
 
     <!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@@ -234,7 +240,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -266,7 +272,7 @@ export default {
       total: 0,
       // 航信等渠道开票信息维护表格数据
       emisBaseInvoiceChInfoList: [],
-    
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -325,7 +331,7 @@ export default {
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/emis/emisCustomerInvoiceInfo/index.vue b/src/views/emis/emisCustomerInvoiceInfo/index.vue
index 7b2c16b5..afca7e33 100644
--- a/src/views/emis/emisCustomerInvoiceInfo/index.vue
+++ b/src/views/emis/emisCustomerInvoiceInfo/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="6"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="6"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="开票抬头" prop="companyName">
         <el-input
@@ -62,7 +62,13 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border stripe
            size="mini"
            :data="emisCustomerInvoiceInfoList"
@@ -213,7 +219,7 @@
 
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisElectronicPagApply/applyList.vue b/src/views/emis/emisElectronicPagApply/applyList.vue
index ee4503fa..d9fffe9a 100644
--- a/src/views/emis/emisElectronicPagApply/applyList.vue
+++ b/src/views/emis/emisElectronicPagApply/applyList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
 
     <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="16"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
@@ -53,7 +53,13 @@
 
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border
            size="small"
            :data="emisElectronicPagApplyList"
@@ -129,7 +135,7 @@
     </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index afe88d5c..2a295a1c 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="" prop="billCode" label-width="100px">
                   <div slot="label">
@@ -98,7 +98,13 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border
            size="mini"
 
@@ -247,7 +253,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue
index 8627990a..0f900656 100644
--- a/src/views/emis/emisWaybill/UserOrderList.vue
+++ b/src/views/emis/emisWaybill/UserOrderList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
 
-    <div class="tab-container">
+    <div slot="pageHeader"  class="tab-container">
         <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
           <!-- <el-tab-pane label="全部" name="allOrder" ></el-tab-pane> -->
           <el-tab-pane label="未接单" name="waitConfirm" ></el-tab-pane>
@@ -12,138 +12,147 @@
             <!-- <waybillDetailReadOnly :billCode="item.billCode"></waybillDetailReadOnly> -->
           </el-tab-pane>
         </el-tabs>
-      </div>
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-      <el-form-item label="运单号" prop="billCode">
-              <XdTextareaInput
-                    v-model="queryParams.billCode"
-                    :placeholder="$t('多个流水号逗号或换行隔开')"
-                    clearable
-                    :rows="1"
-                  />
+        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-            </el-form-item>
-            <el-form-item label="下单日期" prop="dateTimeRange">
-              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-            </el-form-item>
-            <el-form-item label="寄件网点" prop="productType">
-              <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
-            </el-form-item>
-            <el-form-item label="取件方式" prop="pickupMethod">
-                      <el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择">
-                        <el-option
-                          v-for="dict in dict.type.emis_qujian_fangshi"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
-                    </el-form-item>
+<el-form-item label="运单号" prop="billCode">
+        <XdTextareaInput
+              v-model="queryParams.billCode"
+              :placeholder="$t('多个流水号逗号或换行隔开')"
+              clearable
+              :rows="1"
+            />
 
-              <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
-                <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode" postCode="RSD"></EmisUserSimplePicker1>
+      </el-form-item>
+      <el-form-item label="下单日期" prop="dateTimeRange">
+        <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+      </el-form-item>
+      <el-form-item label="寄件网点" prop="productType">
+        <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
+      </el-form-item>
+      <el-form-item label="取件方式" prop="pickupMethod">
+                <el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择">
+                  <el-option
+                    v-for="dict in dict.type.emis_qujian_fangshi"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
               </el-form-item>
 
-            <el-form-item label="收件人" prop="receiveName">
-              <el-input
-                v-model="queryParams.receiveName"
-                :placeholder="$t('收件人')"
-                clearable
+        <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
+          <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode" postCode="RSD"></EmisUserSimplePicker1>
+        </el-form-item>
+
+      <el-form-item label="收件人" prop="receiveName">
+        <el-input
+          v-model="queryParams.receiveName"
+          :placeholder="$t('收件人')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="收件电话" prop="receiveMobile">
+        <el-input
+          v-model="queryParams.receiveMobile"
+          :placeholder="$t('收件电话')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="收件公司" prop="receiveCompany">
+        <el-input
+          v-model="queryParams.receiveCompany"
+          :placeholder="$t('收件公司')"
+          clearable
+        />
+      </el-form-item>
+
+      <el-form-item label="目的国" prop="receiveCountry">
+        <CountryPicker0 v-model="queryParams.receiveCountry" :placeholder="$t('目的国')" @onChange="handleQuery"></CountryPicker0>
+      </el-form-item>
+
+      <el-form-item label="寄件人" prop="sendName">
+        <el-input
+          v-model="queryParams.sendName"
+          :placeholder="$t('寄件人')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="寄件人电话" prop="sendMobile">
+        <el-input
+          v-model="queryParams.sendMobile"
+          :placeholder="$t('寄件人电话')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="寄件公司" prop="sendCompany">
+        <el-input
+          v-model="queryParams.sendCompany"
+          :placeholder="$t('寄件公司')"
+          clearable
+        />
+      </el-form-item>
+
+      <el-form-item label="寄件国" prop="sendCountry">
+        <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('目的国')" ></CountryPicker1>
+
+      </el-form-item>
+
+      <!-- <el-form-item label="运单状态" prop="siteType">
+        <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
+              <el-option
+                v-for="dict in dict.type.emis_waybill_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
               />
-            </el-form-item>
-            <el-form-item label="收件电话" prop="receiveMobile">
-              <el-input
-                v-model="queryParams.receiveMobile"
-                :placeholder="$t('收件电话')"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="收件公司" prop="receiveCompany">
-              <el-input
-                v-model="queryParams.receiveCompany"
-                :placeholder="$t('收件公司')"
-                clearable
-              />
-            </el-form-item>
+        </el-select>
+      </el-form-item> -->
 
-            <el-form-item label="目的国" prop="receiveCountry">
-              <CountryPicker0 v-model="queryParams.receiveCountry" :placeholder="$t('目的国')" @onChange="handleQuery"></CountryPicker0>
-            </el-form-item>
+      <el-form-item label="报关方式" prop="customsEclaration">
+          <el-select v-model="queryParams.customsEclaration" placeholder="请选择">
+            <el-option
+              v-for="dict in dict.type.emis_declare_mode"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+      </el-form-item>
 
-            <el-form-item label="寄件人" prop="sendName">
-              <el-input
-                v-model="queryParams.sendName"
-                :placeholder="$t('寄件人')"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="寄件人电话" prop="sendMobile">
-              <el-input
-                v-model="queryParams.sendMobile"
-                :placeholder="$t('寄件人电话')"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="寄件公司" prop="sendCompany">
-              <el-input
-                v-model="queryParams.sendCompany"
-                :placeholder="$t('寄件公司')"
-                clearable
-              />
-            </el-form-item>
+      <el-form-item label="清关方式" prop="customsClear">
+        <el-select v-model="queryParams.customsClear" placeholder="请选择">
+          <el-option
+            v-for="dict in dict.type.emis_customs_clear"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="付款方式" prop="paymentType" label-width="70px">
+        <el-select v-model="queryParams.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="寄件国" prop="sendCountry">
-              <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('目的国')" ></CountryPicker1>
+</SearchForm>
 
-            </el-form-item>
+      </div>
 
-            <!-- <el-form-item label="运单状态" prop="siteType">
-              <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
-                    <el-option
-                      v-for="dict in dict.type.emis_waybill_status"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-              </el-select>
-            </el-form-item> -->
 
-            <el-form-item label="报关方式" prop="customsEclaration">
-                <el-select v-model="queryParams.customsEclaration" placeholder="请选择">
-                  <el-option
-                    v-for="dict in dict.type.emis_declare_mode"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-            </el-form-item>
+    <XdTable
 
-            <el-form-item label="清关方式" prop="customsClear">
-              <el-select v-model="queryParams.customsClear" placeholder="请选择">
-                <el-option
-                  v-for="dict in dict.type.emis_customs_clear"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="付款方式" prop="paymentType" label-width="70px">
-              <el-select v-model="queryParams.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>
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
 
-    </SearchForm>
-
-    <XdTable v-loading="loading"
+          v-loading="loading"
            border
            size="mini"
            storageName="orderList_main"
@@ -510,7 +519,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>