From 8bc50aa10b3f948ca0d887a7ee87bca418e4835d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 3 Jun 2024 09:40:23 +0800
Subject: [PATCH] md

---
 src/views/emis/emisCountryArea/indexPanel.vue |  15 +-
 src/views/emis/emisDestination/index.vue      |  18 +-
 src/views/emis/emisGoods/index.vue            | 367 +-----------------
 src/views/emis/emisNotCalcAging/index.vue     |  20 +-
 src/views/emis/emisProblemType/index.vue      |  48 ++-
 src/views/emis/emisRegion/PcdPanel.vue        |  46 +--
 src/views/emis/emisRegion/index.vue           |   8 +-
 .../emis/emisSpecialCalcWeight/index.vue      |  13 +-
 8 files changed, 90 insertions(+), 445 deletions(-)

diff --git a/src/views/emis/emisCountryArea/indexPanel.vue b/src/views/emis/emisCountryArea/indexPanel.vue
index 1822d062..b683c1dc 100644
--- a/src/views/emis/emisCountryArea/indexPanel.vue
+++ b/src/views/emis/emisCountryArea/indexPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer>
+    <search-form 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="countryCode">
         <country-picker :placeholder="$t('国家')" v-model="queryParams.countryCode" @onChange="handleQuery"></country-picker>
@@ -17,9 +17,14 @@
 
     </search-form>
 
-    <xd-table v-loading="loading"
+    <xd-table 
+         slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight-50)+'px'"
+
+        v-loading="loading"
            border stripe
-           size="small"
+           size="mini"
            :data="emisCountryAreaList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -104,7 +109,7 @@
     </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisDestination/index.vue b/src/views/emis/emisDestination/index.vue
index 8ec5a8c2..96513920 100644
--- a/src/views/emis/emisDestination/index.vue
+++ b/src/views/emis/emisDestination/index.vue
@@ -1,11 +1,7 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="0" type='flex'>
-      <!-- <el-col :span="4" :xs="4">
-        <CountryTreePicker placeholder="所属国家" v-model="queryParams.country" @onNodeClick="handleQuery"></CountryTreePicker>
-      </el-col> -->
-      <el-col :span="24" :xs="24">
-        <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="10"  label-width="90px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <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">
             <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
@@ -54,6 +50,10 @@
     </SearchForm>
 
     <XdTable
+        slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
         v-loading="loading"
         border
         stripe
@@ -197,9 +197,7 @@
     :destroy-on-close="true"
     -->
 
-  </el-col>
-  </el-row>
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisGoods/index.vue b/src/views/emis/emisGoods/index.vue
index b33ff6cd..4fcdb579 100644
--- a/src/views/emis/emisGoods/index.vue
+++ b/src/views/emis/emisGoods/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="goodsSn">
         <el-input
@@ -26,363 +26,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--
-      <el-form-item label="" prop="goodsCat">
-        <el-input
-          v-model="queryParams.goodsCat"
-          :placeholder="$t('货物类别')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="goodsType">
-        <el-input
-          v-model="queryParams.goodsType"
-          :placeholder="$t('型号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="goodsModel">
-        <el-input
-          v-model="queryParams.goodsModel"
-          :placeholder="$t('规格')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="barcode">
-        <el-input
-          v-model="queryParams.barcode"
-          :placeholder="$t('条码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orginalNation">
-        <el-input
-          v-model="queryParams.orginalNation"
-          :placeholder="$t('原产国')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="picUrl">
-        <el-input
-          v-model="queryParams.picUrl"
-          :placeholder="$t('图片地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="isRealGoods">
-        <el-input
-          v-model="queryParams.isRealGoods"
-          :placeholder="$t('是否实物')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="isBigCat">
-        <el-input
-          v-model="queryParams.isBigCat"
-          :placeholder="$t('是否大类')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="brand">
-        <el-input
-          v-model="queryParams.brand"
-          :placeholder="$t('品牌名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="netWeight">
-        <el-input
-          v-model="queryParams.netWeight"
-          :placeholder="$t('单净重')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="grossWeight">
-        <el-input
-          v-model="queryParams.grossWeight"
-          :placeholder="$t('单毛重')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="singleVolume">
-        <el-input
-          v-model="queryParams.singleVolume"
-          :placeholder="$t('单件体积')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="singleLength">
-        <el-input
-          v-model="queryParams.singleLength"
-          :placeholder="$t('单件长')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="singleHeight">
-        <el-input
-          v-model="queryParams.singleHeight"
-          :placeholder="$t('单件高')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="pkgPcs">
-        <el-input
-          v-model="queryParams.pkgPcs"
-          :placeholder="$t('箱件数')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="pkgVolume">
-        <el-input
-          v-model="queryParams.pkgVolume"
-          :placeholder="$t('箱体积')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="pkgLength">
-        <el-input
-          v-model="queryParams.pkgLength"
-          :placeholder="$t('箱长')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="pkgHeight">
-        <el-input
-          v-model="queryParams.pkgHeight"
-          :placeholder="$t('箱高')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="hsCode">
-        <el-input
-          v-model="queryParams.hsCode"
-          :placeholder="$t('海关编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="isCode">
-        <el-input
-          v-model="queryParams.isCode"
-          :placeholder="$t('商检编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          :placeholder="$t('计量单位')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="unit1">
-        <el-input
-          v-model="queryParams.unit1"
-          :placeholder="$t('法1')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="unit2">
-        <el-input
-          v-model="queryParams.unit2"
-          :placeholder="$t('法2')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          :placeholder="$t('价格')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="currencyType">
-        <el-input
-          v-model="queryParams.currencyType"
-          :placeholder="$t('币种')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="ruleNation">
-        <el-input
-          v-model="queryParams.ruleNation"
-          :placeholder="$t('适用标准国别')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="manufEnterprise">
-        <el-input
-          v-model="queryParams.manufEnterprise"
-          :placeholder="$t('生产企业')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="ebcCode">
-        <el-input
-          v-model="queryParams.ebcCode"
-          :placeholder="$t('电商企业海关编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="ciqCode">
-        <el-input
-          v-model="queryParams.ciqCode"
-          :placeholder="$t('电商企业商检编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="function">
-        <el-input
-          v-model="queryParams.function"
-          :placeholder="$t('功能')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="ingredients">
-        <el-input
-          v-model="queryParams.ingredients"
-          :placeholder="$t('主要成分')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="purpose">
-        <el-input
-          v-model="queryParams.purpose"
-          :placeholder="$t('用途')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="cebpMode">
-        <el-input
-          v-model="queryParams.cebpMode"
-          :placeholder="$t('进口模式')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="supplier">
-        <el-input
-          v-model="queryParams.supplier"
-          :placeholder="$t('供应商')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="serialNumber">
-        <el-input
-          v-model="queryParams.serialNumber"
-          :placeholder="$t('申报序列号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="statusMessage">
-        <el-input
-          v-model="queryParams.statusMessage"
-          :placeholder="$t('海关回执信息')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="goodsSn2">
-        <el-input
-          v-model="queryParams.goodsSn2"
-          :placeholder="$t('原货物备件号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="goodsNo2">
-        <el-input
-          v-model="queryParams.goodsNo2"
-          :placeholder="$t('物资序号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="licNo">
-        <el-input
-          v-model="queryParams.licNo"
-          :placeholder="$t('许可证号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="materialPath">
-        <el-input
-          v-model="queryParams.materialPath"
-          :placeholder="$t('材料地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="pd">
-        <el-input
-          v-model="queryParams.pd"
-          :placeholder="$t('出厂日期')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="saleUrl">
-        <el-input
-          v-model="queryParams.saleUrl"
-          :placeholder="$t('销售链接地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="portCode">
-        <el-input
-          v-model="queryParams.portCode"
-          :placeholder="$t('口岸编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="emisGoodsList"
@@ -539,7 +192,7 @@
     </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisNotCalcAging/index.vue b/src/views/emis/emisNotCalcAging/index.vue
index c1f85860..1e6f0390 100644
--- a/src/views/emis/emisNotCalcAging/index.vue
+++ b/src/views/emis/emisNotCalcAging/index.vue
@@ -1,11 +1,7 @@
 <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,6 +14,10 @@
 
 
       <XdTable
+      slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+          
           v-loading="loading"
           border
           stripe
@@ -134,11 +134,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>
diff --git a/src/views/emis/emisProblemType/index.vue b/src/views/emis/emisProblemType/index.vue
index 4135b536..a81d71c2 100644
--- a/src/views/emis/emisProblemType/index.vue
+++ b/src/views/emis/emisProblemType/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="68px">
+  <XdPageContainer class="app-container">
+    <search-form 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="typeName">
         <el-input
@@ -50,8 +50,28 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
+    </search-form>
 
+   
+
+       <xd-table 
+         slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+        v-loading="loading"
+           border stripe
+           size="mini"
+           :data="emisProblemTypeList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           > 
+
+           <div slot="toolbar">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -96,11 +116,12 @@
           v-hasPermi="['emis:emisProblemType:export']"
         >导出</el-button>
       </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
-
-    <el-table v-loading="loading" size="mini" :data="emisProblemTypeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    </div>
+    
+    
+    <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="类型编号" align="center" prop="id" min-width="100" />
       <el-table-column label="类型名称" align="left" prop="typeName" min-width="160">
         <template slot-scope="scope">
@@ -153,17 +174,8 @@
           >删除</el-button> -->
         </template>
       </el-table-column>
-    </el-table>
+    </xd-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page-sizes="[20,50,100,300,500,1000,2000,5000]"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-size="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改问题件类型对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="40%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@@ -240,7 +252,7 @@
     </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisRegion/PcdPanel.vue b/src/views/emis/emisRegion/PcdPanel.vue
index ea9540c9..d0f58f0a 100644
--- a/src/views/emis/emisRegion/PcdPanel.vue
+++ b/src/views/emis/emisRegion/PcdPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <div >
-    <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+    <search-form slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-form-item :label="$t('国家')" prop="countryCode">
         <CountryPicker :placeholder="$t('国家')" v-model="queryParams.countryCode" @onChange="handleQuery"></CountryPicker>
       </el-form-item>
@@ -43,6 +43,11 @@
     :header-cell-style="{ color: '#000', background: '#fff' }"
    -->
         <xd-table
+
+        slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight-50)+'px'"
+
             v-loading="loading"
             :data="tableData"
             :default-expand-all="false"
@@ -51,7 +56,7 @@
             :load="treeLoad"
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
             border stripe
-            size="small"
+            size="mini"
             :showSearch.sync="showSearch"
             :queryParams="queryParams"
             :total="total"
@@ -72,36 +77,7 @@
                     v-hasPermi="['emis:emisRegion:add']"
                   >新增省份</el-button>
                 </el-col>
-                <!-- <el-col :span="1.5">
-                  <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd(2)"
-                    v-hasPermi="['emis:emisRegion:add']"
-                  >新增城市</el-button>
-                </el-col> -->
-                <!-- <el-col :span="1.5">
-                  <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd(3)"
-                    v-hasPermi="['emis:emisRegion:add']"
-                  >新增县区</el-button>
-                </el-col> -->
-                <!-- <el-col :span="1.5">
-                  <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd(4)"
-                    v-hasPermi="['emis:emisRegion:add']"
-                  >新增街镇</el-button>
-                </el-col> -->
+               
                 <el-col :span="1.5">
                   <el-button
                     type="danger"
@@ -124,7 +100,7 @@
 
           <el-table-column type="selection" width="55" align="center" />
           <!-- <el-table-column label="名称" align="left" prop="regionName" min-width="170" /> -->
-          <el-table-column :label="$t('名称')" align="left" prop="regionName" :sort-orders="['descending','ascending']" sortable="custom" min-width="120">
+          <el-table-column :label="$t('名称')" align="left" prop="regionName" :sort-orders="['descending','ascending']" sortable="custom" min-width="150">
             <template slot-scope="scope">
               <span class="link-type" @click="handleUpdate(scope.row)">{{scope.row.regionName}}</span>
               <span @click="handleAddSub(scope.row)" v-if="scope.row.regionType!=4" v-hasPermi="['emis:emisRegion:add']" class="icon iconfont" style="font-size: 20px;margin-left:10px;color: #b12e29;cursor: pointer;">&#xe620;</span>
@@ -173,7 +149,7 @@
       <emisRegionForm :id="currentId" :regionType="regionType" :countryCode="currentCountryCode" :parentCode="parentCode" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisRegionForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisRegion/index.vue b/src/views/emis/emisRegion/index.vue
index 64621f5b..30d9d670 100644
--- a/src/views/emis/emisRegion/index.vue
+++ b/src/views/emis/emisRegion/index.vue
@@ -1,10 +1,10 @@
 <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);">
+    <el-row :gutter="0" type='flex'>
+      <!-- <el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
         <CountryTreePicker v-model="queryParams.countryCode" ></CountryTreePicker>
-      </el-col>
-	    <el-col :span="20" :xs="20">
+      </el-col> -->
+	    <el-col :span="24" :xs="24">
           <el-tabs v-model="activeTab" class="center-tabs">
             <el-tab-pane label="片区管理" name="areaPanel" />
             <el-tab-pane label="省市区管理" name="pcdPanel" />
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index 94c968e5..fc7227f6 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/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="country">
             <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" ></CountryPicker>
       </el-form-item>
@@ -27,7 +27,12 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable 
+         slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+         v-loading="loading"
            border stripe
            size="small"
            :data="emisSpecialCalcWeightList"
@@ -151,7 +156,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>