diff --git a/src/directive/index.js b/src/directive/index.js
index 5ddedd46..792f4350 100644
--- a/src/directive/index.js
+++ b/src/directive/index.js
@@ -16,8 +16,8 @@ const install = function(Vue) {
   Vue.directive('dialogDragWidth', dialogDragWidth)
   Vue.directive('dialogDragHeight', dialogDragHeight)
   Vue.directive('dialogFullScreen', dialogFullScreen)
-  Vue.directive('elTableResizeHeight', elTableResizeHeight)
-  //  v-elTableResizeHeight="{bottomOffset: 85}"
+  Vue.directive('doTableResizeHeight', elTableResizeHeight)
+  //  v-doTableResizeHeight="{topSearchFormRef: 'queryForm'}"
 
   Vue.directive('el-select-loadmore', elSelectLoadmore);
 }
diff --git a/src/directive/table/resizeHeight.js b/src/directive/table/resizeHeight.js
index 11ebaa19..120a4dd7 100644
--- a/src/directive/table/resizeHeight.js
+++ b/src/directive/table/resizeHeight.js
@@ -1,3 +1,5 @@
+  //  v-doTableResizeHeight="{topSearchFormRef: 'queryForm'}"
+
 // 设置表格高度
 const doResize = async (el, binding, vnode) => {
   // 获取表格Dom对象
@@ -9,17 +11,32 @@ const doResize = async (el, binding, vnode) => {
     value
   } = binding
 
-  if (!$table.height) {
-    throw new Error(`el-$table must set the height. Such as height='100px'`)
-  }
-  // 获取距底部距离（用于展示页码等信息）
-  const bottomOffset = (value && value.bottomOffset) || 30
+  console.log("=====>1111==>");
+  console.log($table);
+  console.log($table.searchFormRef);
+
+
+  this.$nextTick(function() {
+    let queryFormEl = this.$refs[$table.searchFormRef].$el;
+    console.log( queryFormEl );
+    let tableH = queryFormEl.offsetHeight+190;
+    tableHeight = window.innerHeight - tableH;
+    $table.layout.setHeight(tableHeight)
+  });
+
+  // if (!$table.height) {
+    // throw new Error(`el-$table must set the height. Such as height='100px'`)
+  // }
+  // 获取距底部距离（用于展示页码等信息）
+  // const bottomOffset = (value && value.bottomOffset) || 30
+
+  // if (!$table) return
+
 
-  if (!$table) return
 
   // 计算列表高度并设置
-  const height = window.innerHeight - el.getBoundingClientRect().top - bottomOffset
-  $table.layout.setHeight(height)
+  // const height = window.innerHeight - el.getBoundingClientRect().top - bottomOffset
+  // $table.layout.setHeight(height)
   $table.doLayout()
 }
 
diff --git a/src/main.js b/src/main.js
index 17c219ab..4c18c159 100644
--- a/src/main.js
+++ b/src/main.js
@@ -54,6 +54,8 @@ import DictData from '@/components/DictData'
 // XdTable
 import XdTable from "@/components/XdTable"
 
+import XdPageContainer from "@/components/XdPageContainer"
+
 import XdTextareaInput from "@/components/XdTextareaInput"
 
 // XdDialog
@@ -118,6 +120,7 @@ Vue.component('ImageOneUpload', ImageOneUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('CustomDatePicker', CustomDatePicker)
 Vue.component('XdTable', XdTable)
+Vue.component('XdPageContainer', XdPageContainer)
 Vue.component('XdDialog', XdDialog)
 Vue.component('SearchForm', SearchForm)
 Vue.component('XdTextareaInput', XdTextareaInput)
diff --git a/src/views/emis/emisCustomerAddress/recipientAddress.vue b/src/views/emis/emisCustomerAddress/recipientAddress.vue
index fba5da95..3cc3f49a 100644
--- a/src/views/emis/emisCustomerAddress/recipientAddress.vue
+++ b/src/views/emis/emisCustomerAddress/recipientAddress.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="name">
         <el-input
           v-model="queryParams.name"
@@ -22,314 +22,155 @@
       <el-form-item :label="$t('所属国家')" prop="country">
             <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
        </el-form-item>
-      <!-- <el-form-item label="" prop="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          :placeholder="$t('客户编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="" prop="shortName">
-        <el-input
-          v-model="queryParams.shortName"
-          :placeholder="$t('客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="" prop="alias">
-        <el-input
-          v-model="queryParams.alias"
-          :placeholder="$t('地址别名')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="addressType">
-        <el-input
-          v-model="queryParams.addressType"
-          :placeholder="$t('地址类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="country">
-        <el-input
-          v-model="queryParams.country"
-          :placeholder="$t('国家')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-
-      <el-form-item label="" prop="province">
-        <el-input
-          v-model="queryParams.province"
-          :placeholder="$t('省')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="city">
-        <el-input
-          v-model="queryParams.city"
-          :placeholder="$t('市')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="county">
-        <el-input
-          v-model="queryParams.county"
-          :placeholder="$t('区')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="town">
-        <el-input
-          v-model="queryParams.town"
-          :placeholder="$t('城镇')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          :placeholder="$t('地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="postCode">
-        <el-input
-          v-model="queryParams.postCode"
-          :placeholder="$t('邮编')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="email">
-        <el-input
-          v-model="queryParams.email"
-          :placeholder="$t('email')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="company">
-        <el-input
-          v-model="queryParams.company"
-          :placeholder="$t('公司')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blDefaultFlag">
-        <el-input
-          v-model="queryParams.blDefaultFlag"
-          :placeholder="$t('是否默认')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orderNum">
-        <el-input
-          v-model="queryParams.orderNum"
-          :placeholder="$t('排序')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blSiteDefaultFlag">
-        <el-input
-          v-model="queryParams.blSiteDefaultFlag"
-          :placeholder="$t('使用站点是否默认')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="useSite">
-        <el-input
-          v-model="queryParams.useSite"
-          :placeholder="$t('使用站点名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="useSiteCode">
-        <el-input
-          v-model="queryParams.useSiteCode"
-          :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>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
     </SearchForm>
 
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+          v-loading="loading"
+          border stripe
+          size="small"
+          :data="emisCustomerAddressList"
+          :showSearch.sync="showSearch"
+          :queryParams="queryParams"
+          :total="total"
+          @queryTable="getList"
+          @selection-change="handleSelectionChange"
+          @sort-change="handleSortChange"
 
-    <XdTable v-loading="loading"
-           border stripe
-           size="small"
-           :data="emisCustomerAddressList"
-           :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">
+            <div slot="toolbar">
+              <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                      <el-button
+                        type="primary"
+                        plain
+                        icon="el-icon-plus"
+                        size="mini"
+                        @click="handleAdd"
+                        v-hasPermi="['emis:emisCustomerAddress:add']"
+                      >新增</el-button>
+                    </el-col>
+                    <!--
+                    <el-col :span="1.5">
+                      <el-button
+                        type="success"
+                        plain
+                        icon="el-icon-edit"
+                        size="mini"
+                        :disabled="single"
+                        @click="handleUpdate"
+                        v-hasPermi="['emis:emisCustomerAddress:edit']"
+                      >修改</el-button>
+                    </el-col> -->
+                    <el-col :span="1.5">
+                      <el-button
+                        type="danger"
+                        plain
+                        icon="el-icon-delete"
+                        size="mini"
+                        :disabled="multiple"
+                        @click="handleDelete"
+                        v-hasPermi="['emis:emisCustomerAddress:remove']"
+                      >删除</el-button>
+                    </el-col>
+                    <!-- <el-col :span="1.5">
+                      <el-button
+                        type="warning"
+                        plain
+                        icon="el-icon-download"
+                        size="mini"
+                        @click="handleExport"
+                        v-hasPermi="['emis:emisCustomerAddress:export']"
+                      >导出</el-button>
+                    </el-col> -->
+                </el-row>
+            </div>
+
+            <el-table-column type="selection" width="55" align="center" />
+            <!--
+            <el-table-column label="序号" align="center" min-width="60">
+                  <template slot-scope="scope">
+                      <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>
+              </template>
+            </el-table-column>
+
+
+            -->
+
+            <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
+            <el-table-column :label="$t('收件人')" align="left" prop="name" width="100" >
+              <template slot-scope="scope">
+                  <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.name}}</div>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('收件电话')" align="center" prop="phone" min-width="100" />
+
+            <!-- <el-table-column :label="$t('客户名称')" align="center" prop="shortName" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('地址别名')" align="center" prop="alias" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('地址类型')" align="center" prop="addressType" min-width="100" /> -->
+            <el-table-column :label="$t('国家')" align="center" prop="countryName" width="80" />
+            <el-table-column :label="$t('地区')" align="center" prop="provinceName" width="100" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                  <div>{{scope.row.provinceName}} {{scope.row.cityName}} {{scope.row.countyName}} </div>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column :label="$t('市')" align="center" prop="city" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('区')" align="center" prop="county" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('城镇')" align="center" prop="town" min-width="100" /> -->
+            <el-table-column :label="$t('地址')" align="left" prop="address" min-width="200"  :show-overflow-tooltip="true" />
+            <!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
+            <el-table-column :label="$t('公司')" align="center" prop="company" min-width="100" />
+            <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" />
+            <!-- <el-table-column :label="$t('是否默认')" align="center" prop="blDefaultFlag" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> -->
+            <el-table-column :label="$t('所属站点')" align="center" prop="useSite" min-width="100" />
+            <el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="170" />
+            <!-- <el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
+            <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+            <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+            <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
                 <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-plus"
                   size="mini"
-                  @click="handleAdd"
-                  v-hasPermi="['emis:emisCustomerAddress:add']"
-                >新增</el-button>
-              </el-col>
-              <!--
-              <el-col :span="1.5">
-                <el-button
-                  type="success"
-                  plain
+                  type="text"
                   icon="el-icon-edit"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleUpdate"
+                  @click="handleUpdate(scope.row)"
                   v-hasPermi="['emis:emisCustomerAddress:edit']"
                 >修改</el-button>
-              </el-col> -->
-              <el-col :span="1.5">
+                <!--
                 <el-button
-                  type="danger"
-                  plain
+                  size="mini"
+                  type="text"
                   icon="el-icon-delete"
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handleDelete"
+                  @click="handleDelete(scope.row)"
                   v-hasPermi="['emis:emisCustomerAddress:remove']"
-                >删除</el-button>
-              </el-col>
-              <!-- <el-col :span="1.5">
-                <el-button
-                  type="warning"
-                  plain
-                  icon="el-icon-download"
-                  size="mini"
-                  @click="handleExport"
-                  v-hasPermi="['emis:emisCustomerAddress:export']"
-                >导出</el-button>
-              </el-col> -->
-          </el-row>
-      </div>
-
-      <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <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>
-         </template>
-      </el-table-column>
-
-
-      -->
-
-      <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
-      <el-table-column :label="$t('收件人')" align="left" prop="name" width="100" >
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.name}}</div>
-         </template>
-      </el-table-column>
-      <el-table-column :label="$t('收件电话')" align="center" prop="phone" min-width="100" />
-
-      <!-- <el-table-column :label="$t('客户名称')" align="center" prop="shortName" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('地址别名')" align="center" prop="alias" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('地址类型')" align="center" prop="addressType" min-width="100" /> -->
-      <el-table-column :label="$t('国家')" align="center" prop="countryName" width="80" />
-      <el-table-column :label="$t('地区')" align="center" prop="provinceName" width="100" :show-overflow-tooltip="true">
-      <template slot-scope="scope">
-            <div>{{scope.row.provinceName}} {{scope.row.cityName}} {{scope.row.countyName}} </div>
-         </template>
-      </el-table-column>
-      <!-- <el-table-column :label="$t('市')" align="center" prop="city" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('区')" align="center" prop="county" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('城镇')" align="center" prop="town" min-width="100" /> -->
-      <el-table-column :label="$t('地址')" align="left" prop="address" min-width="200"  :show-overflow-tooltip="true" />
-      <!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
-      <el-table-column :label="$t('公司')" align="center" prop="company" min-width="100" />
-      <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" />
-      <!-- <el-table-column :label="$t('是否默认')" align="center" prop="blDefaultFlag" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> -->
-      <el-table-column :label="$t('所属站点')" align="center" prop="useSite" min-width="100" />
-      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="170" />
-      <!-- <el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
-
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisCustomerAddress:edit']"
-          >修改</el-button>
-          <!--
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisCustomerAddress:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
+                >删除</el-button> -->
+              </template>
+            </el-table-column>
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <recipientAddressForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></recipientAddressForm>
     </el-dialog>
 
-
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue
index 9cc78906..e3acf55a 100644
--- a/src/views/emis/emisCustomerAddress/senderAddress.vue
+++ b/src/views/emis/emisCustomerAddress/senderAddress.vue
@@ -1,5 +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">
       <el-form-item label="寄件人" prop="name">
         <el-input
@@ -22,171 +23,9 @@
       <el-form-item :label="$t('所属国家')" prop="country">
             <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
        </el-form-item>
-      <!-- <el-form-item label="" prop="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          :placeholder="$t('客户编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="" prop="shortName">
-        <el-input
-          v-model="queryParams.shortName"
-          :placeholder="$t('客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="" prop="alias">
-        <el-input
-          v-model="queryParams.alias"
-          :placeholder="$t('地址别名')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="addressType">
-        <el-input
-          v-model="queryParams.addressType"
-          :placeholder="$t('地址类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="country">
-        <el-input
-          v-model="queryParams.country"
-          :placeholder="$t('国家')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
-
-      <el-form-item label="" prop="province">
-        <el-input
-          v-model="queryParams.province"
-          :placeholder="$t('省')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="city">
-        <el-input
-          v-model="queryParams.city"
-          :placeholder="$t('市')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="county">
-        <el-input
-          v-model="queryParams.county"
-          :placeholder="$t('区')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="town">
-        <el-input
-          v-model="queryParams.town"
-          :placeholder="$t('城镇')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          :placeholder="$t('地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="postCode">
-        <el-input
-          v-model="queryParams.postCode"
-          :placeholder="$t('邮编')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="email">
-        <el-input
-          v-model="queryParams.email"
-          :placeholder="$t('email')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="company">
-        <el-input
-          v-model="queryParams.company"
-          :placeholder="$t('公司')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blDefaultFlag">
-        <el-input
-          v-model="queryParams.blDefaultFlag"
-          :placeholder="$t('是否默认')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orderNum">
-        <el-input
-          v-model="queryParams.orderNum"
-          :placeholder="$t('排序')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blSiteDefaultFlag">
-        <el-input
-          v-model="queryParams.blSiteDefaultFlag"
-          :placeholder="$t('使用站点是否默认')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="useSite">
-        <el-input
-          v-model="queryParams.useSite"
-          :placeholder="$t('使用站点名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="useSiteCode">
-        <el-input
-          v-model="queryParams.useSiteCode"
-          :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>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
     </SearchForm>
 
-
     <XdTable v-loading="loading"
            border stripe
            size="small"
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 8120b62f..f2ddb5a0 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <SearchForm  slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="" prop="billCode">
         <div slot="label">
@@ -205,13 +205,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="mini"
            :data="emisWaybillList"
@@ -221,8 +222,6 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
-           v-if="tableHeight" :max-height="tableHeight + 'px'"
-
            >
 
       <div slot="toolbar">
@@ -457,7 +456,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>