From c69ab51959c65e39fc31d053b1fb0725a8383ddb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 10 May 2024 11:42:02 +0800
Subject: [PATCH] md

---
 src/components/XdTable/index.vue              |  56 +--
 .../emis/EmisBaseTools/CountryPicker.vue      |   3 +-
 .../emis/EmisBaseTools/TransLinePicker.vue    |   5 +-
 .../emis/EmisBaseTools/TransProductPicker.vue |   5 +-
 src/views/emis/emisDestination/index.vue      |   8 +-
 src/views/emis/emisSite/emisSiteForm.vue      |   8 +-
 src/views/emis/emisSite/index.vue             | 339 ++++++++++--------
 7 files changed, 225 insertions(+), 199 deletions(-)

diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index cd19c764..f830957b 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -221,36 +221,36 @@ export default {
       this.isDragging = false
     },
      //右键点击事件
-     onRightClick(row, column, event) {
-      console.log(arguments);
-      var menu = document.querySelector("#rightMenu");
-      event.preventDefault();
-      //获取我们自定义的右键菜单
+    //  onRightClick(row, column, event) {
+    //   console.log(arguments);
+    //   var menu = document.querySelector("#rightMenu");
+    //   event.preventDefault();
+    //   //获取我们自定义的右键菜单
 
-      // 根据事件对象中鼠标点击的位置，进行定位
-      menu.style.left = event.clientX + "px";
-      menu.style.top = event.clientY + "px";
-      // 改变自定义菜单的隐藏与显示
-      menu.style.display = "block";
-      console.log(row, column);
-      // 获取当前右键点击table下标
-      // this.tableData.forEach((item, index) => {
-      //   if (item.bugid === row.bugid) {
-      //     //这里判断相等的条件可以自己改为该行数据的唯一键
-      //     this.currentRowIndex = index;
-      //     return false;
-      //   }
-      // });
-      // this.setCurrent(row);
-    },
+    //   // 根据事件对象中鼠标点击的位置，进行定位
+    //   menu.style.left = event.clientX + "px";
+    //   menu.style.top = event.clientY + "px";
+    //   // 改变自定义菜单的隐藏与显示
+    //   menu.style.display = "block";
+    //   console.log(row, column);
+    //   // 获取当前右键点击table下标
+    //   // this.tableData.forEach((item, index) => {
+    //   //   if (item.bugid === row.bugid) {
+    //   //     //这里判断相等的条件可以自己改为该行数据的唯一键
+    //   //     this.currentRowIndex = index;
+    //   //     return false;
+    //   //   }
+    //   // });
+    //   // this.setCurrent(row);
+    // },
 
-    onCellClick(row, column, cell, event) {
-      console.log(row);
-	    console.log(column);
-	    console.log(cell);
-	    console.log(event);
-      cell.classList.add("blue-cell")
-    },
+    // onCellClick(row, column, cell, event) {
+    //   console.log(row);
+	  //   console.log(column);
+	  //   console.log(cell);
+	  //   console.log(event);
+    //   cell.classList.add("blue-cell")
+    // },
 
     // 动态列渲染表格时，需要在列渲染完成后重新渲染一下表格
     reload() {
diff --git a/src/views/emis/EmisBaseTools/CountryPicker.vue b/src/views/emis/EmisBaseTools/CountryPicker.vue
index cc4345d2..7cfd9037 100644
--- a/src/views/emis/EmisBaseTools/CountryPicker.vue
+++ b/src/views/emis/EmisBaseTools/CountryPicker.vue
@@ -1,6 +1,6 @@
 <template>
    <el-select
-      style="width:100%"
+
       filterable
       clearable
       v-model="svalue"
@@ -11,6 +11,7 @@
       >
         <el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.code+'-'+item.nameEn+')'" :value="item.code" ></el-option>
     </el-select>
+    <!-- style="width:100%" -->
 </template>
 <script>
   import emitter from 'element-ui/src/mixins/emitter';
diff --git a/src/views/emis/EmisBaseTools/TransLinePicker.vue b/src/views/emis/EmisBaseTools/TransLinePicker.vue
index 40cb88e7..8f47a52f 100644
--- a/src/views/emis/EmisBaseTools/TransLinePicker.vue
+++ b/src/views/emis/EmisBaseTools/TransLinePicker.vue
@@ -1,14 +1,15 @@
 <template>
       <el-select
-      style="width:100%"
+
       filterable
       clearable
       v-model="svalue"
       :placeholder="placeholder"
       @blur="onBlur"
       @change="onChange">
-      <el-option v-for="item in optionItems" :key="item.lineCode" :label="item.lineCode+'-'+item.lineName" :value="item.lineCode" />
+      <el-option v-for="item in optionItems" :key="item.lineCode" :label="item.lineName" :value="item.lineCode" />
     </el-select>
+<!-- style="width:100%" -->
 
 </template>
 <script>
diff --git a/src/views/emis/EmisBaseTools/TransProductPicker.vue b/src/views/emis/EmisBaseTools/TransProductPicker.vue
index 3fb4cb70..fae38e6f 100644
--- a/src/views/emis/EmisBaseTools/TransProductPicker.vue
+++ b/src/views/emis/EmisBaseTools/TransProductPicker.vue
@@ -1,6 +1,5 @@
 <template>
     <el-select
-      style="width:100%"
       filterable
       clearable
       v-model="svalue"
@@ -8,9 +7,11 @@
       @blur="onBlur"
       @change="onChange"
       >
-    <el-option v-for="item in optionItems" :key="item.prodCode" :label="item.prodCode+'-'+item.prodName" :value="item.prodCode" />
+    <el-option v-for="item in optionItems" :key="item.prodCode" :label="item.prodName" :value="item.prodCode" />
   </el-select>
 
+  <!-- style="width:100%" -->
+
 </template>
 <script>
   import emitter from 'element-ui/src/mixins/emitter';
diff --git a/src/views/emis/emisDestination/index.vue b/src/views/emis/emisDestination/index.vue
index 9e6ed1d5..4bff2169 100644
--- a/src/views/emis/emisDestination/index.vue
+++ b/src/views/emis/emisDestination/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20" type='flex'>
-      <el-col :span="4" :xs="4">
+    <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="20" :xs="20">
+      </el-col> -->
+      <el-col :span="24" :xs="24">
         <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="10"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
           <el-form-item label="" prop="country">
diff --git a/src/views/emis/emisSite/emisSiteForm.vue b/src/views/emis/emisSite/emisSiteForm.vue
index 2322fea8..a550e8d8 100644
--- a/src/views/emis/emisSite/emisSiteForm.vue
+++ b/src/views/emis/emisSite/emisSiteForm.vue
@@ -317,7 +317,7 @@ export default {
       // 表单校验
       rules: {
         siteCode: [
-          { required: true, message: "网点编号不能为空", trigger: "blur" },
+          { required: true, message: "网点编号不能为空", trigger: ["blur","change"] },
           { validator: this.validateCode, trigger: "blur" }
 
         ],
@@ -325,13 +325,13 @@ export default {
           { required: true, message: "网点名称不能为空", trigger: "blur" }
         ],
         parentSiteCode: [
-          { required: true, message: "所属网点不能为空", trigger: "blur" }
+          { required: true, message: "所属网点不能为空", trigger: ["blur","change"] }
         ],
         // cutOffTime: [
         //   { required: true, message: "截单时间不能为空", trigger: "blur" }
         // ],
         superiorFinanceCenterCode: [
-          { required: true, message: "财务中心不能为空", trigger: "blur" }
+          { required: true, message: "财务中心不能为空", trigger: ["blur","change"] }
         ],
         siteType: [
           { required: true, message: "站点类型不能为空", trigger: "blur" }
@@ -340,7 +340,7 @@ export default {
           { required: true, message: "加盟类型不能为空", trigger: "blur" }
         ],
         countryCode: [
-          { required: true, message: "国家不能为空", trigger: "blur" }
+          { required: true, message: "国家不能为空", trigger: ["blur","change"]}
         ],
         province: [
           { required: true, message: "省不能为空", trigger: "blur" }
diff --git a/src/views/emis/emisSite/index.vue b/src/views/emis/emisSite/index.vue
index 1f764e7e..d2ccf647 100644
--- a/src/views/emis/emisSite/index.vue
+++ b/src/views/emis/emisSite/index.vue
@@ -1,95 +1,87 @@
 <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);">
-        <!-- <EmisSiteTreePicker v-model="queryParams.countryCode"></EmisSiteTreePicker> -->
-        <CountryTreePicker v-model="queryParams.countryCode" @onNodeClick="handleQuery"></CountryTreePicker>
-      </el-col>
-      <el-col :span="20" :xs="20" style="border-left: 1px solid #dfe6ec;">
-
-      <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-
-        <el-form-item label="" prop="siteCode">
-          <el-input
-            v-model="queryParams.siteCode"
-            placeholder="网点编号"
-            clearable
-            @keyup.enter.native="handleQuery"
-            @input="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="siteName">
-          <el-input
-            v-model="queryParams.siteName"
-            placeholder="网点名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-            @input="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="parentSiteCode">
-          <EmisSiteSimplePicker :placeholder="$t('上级网点')"  v-model="queryParams.parentSiteCode" @onChange="handleQuery"></EmisSiteSimplePicker>
-        </el-form-item>
-        <el-form-item label="" prop="countryCode">
-              <CountryPicker :placeholder="$t('国家')" v-model="queryParams.countryCode" @onChange="handleQuery"></CountryPicker>
-        </el-form-item>
-        <el-form-item label="" prop="province">
-              <ProvincePicker :placeholder="$t('省')" v-model="queryParams.province" :countryCode="queryParams.countryCode" @onChange="handleQuery"></ProvincePicker>
-        </el-form-item>
-        <el-form-item label="" prop="city">
-              <CityPicker :placeholder="$t('市')" v-model="queryParams.city" :parentCode="queryParams.province" @onChange="handleQuery"></CityPicker>
-        </el-form-item>
-        <el-form-item label="" prop="city">
-              <DistrictPicker :placeholder="$t('区')" v-model="queryParams.county" :parentCode="queryParams.city"  @onChange="handleQuery"></DistrictPicker>
-        </el-form-item>
-        <el-form-item label="" prop="siteType">
-          <el-select v-model="queryParams.siteType" placeholder="网点类型" clearable filterable @change="handleQuery">
-                <el-option
-                  v-for="dict in dict.type.emis_site_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="siteType">
-          <el-select v-model="queryParams.scopeType" placeholder="加盟类型" clearable filterable @change="handleQuery">
-                <el-option
-                  v-for="dict in dict.type.emis_affiliate_type"
-                  v-bind:key="dict.value"
-                  v-bind:label="dict.label"
-                  v-bind:value="dict.value"
-                />
+        <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+            <el-form-item label="" prop="siteCode">
+              <el-input
+                v-model="queryParams.siteCode"
+                placeholder="网点编号"
+                clearable
+                @keyup.enter.native="handleQuery"
+                @input="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="" prop="siteName">
+              <el-input
+                v-model="queryParams.siteName"
+                placeholder="网点名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+                @input="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="" prop="parentSiteCode">
+              <EmisSiteSimplePicker :placeholder="$t('上级网点')"  v-model="queryParams.parentSiteCode" @onChange="handleQuery"></EmisSiteSimplePicker>
+            </el-form-item>
+            <el-form-item label="" prop="countryCode">
+                  <CountryPicker :placeholder="$t('国家')" v-model="queryParams.countryCode" @onChange="handleQuery"></CountryPicker>
+            </el-form-item>
+            <el-form-item label="" prop="province">
+                  <ProvincePicker :placeholder="$t('省')" v-model="queryParams.province" :countryCode="queryParams.countryCode" @onChange="handleQuery"></ProvincePicker>
+            </el-form-item>
+            <el-form-item label="" prop="city">
+                  <CityPicker :placeholder="$t('市')" v-model="queryParams.city" :parentCode="queryParams.province" @onChange="handleQuery"></CityPicker>
+            </el-form-item>
+            <el-form-item label="" prop="city">
+                  <DistrictPicker :placeholder="$t('区')" v-model="queryParams.county" :parentCode="queryParams.city"  @onChange="handleQuery"></DistrictPicker>
+            </el-form-item>
+            <el-form-item label="" prop="siteType">
+              <el-select v-model="queryParams.siteType" placeholder="网点类型" clearable filterable @change="handleQuery">
+                    <el-option
+                      v-for="dict in dict.type.emis_site_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
               </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" placeholder="启停状态" clearable filterable @change="handleQuery">
-                <el-option
-                  v-for="dict in dict.type.sys_biz_enable_status"
-                  v-bind:key="dict.value"
-                  v-bind:label="dict.label"
-                  v-bind:value="dict.value"
-                />
-              </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="logoType">
-              <EmisBrandPicker :placeholder="$t('所属品牌')" v-model="queryParams.logoType"   @onChange="handleQuery"></EmisBrandPicker>
-        </el-form-item>
+            </el-form-item>
+            <el-form-item label="" prop="siteType">
+              <el-select v-model="queryParams.scopeType" placeholder="加盟类型" clearable filterable @change="handleQuery">
+                    <el-option
+                      v-for="dict in dict.type.emis_affiliate_type"
+                      v-bind:key="dict.value"
+                      v-bind:label="dict.label"
+                      v-bind:value="dict.value"
+                    />
+                  </el-select>
+            </el-form-item>
+            <el-form-item label="" prop="status">
+              <el-select v-model="queryParams.status" placeholder="启停状态" clearable filterable @change="handleQuery">
+                    <el-option
+                      v-for="dict in dict.type.sys_biz_enable_status"
+                      v-bind:key="dict.value"
+                      v-bind:label="dict.label"
+                      v-bind:value="dict.value"
+                    />
+                  </el-select>
+            </el-form-item>
+            <el-form-item label="" prop="logoType">
+                  <EmisBrandPicker :placeholder="$t('所属品牌')" v-model="queryParams.logoType"   @onChange="handleQuery"></EmisBrandPicker>
+            </el-form-item>
+        </SearchForm>
 
-
-    </SearchForm>
-
-
-    <xd-table v-loading="loading" border stripe size="mini"
-           :data="emisSiteList"
-           :showSearch.sync="showSearch"
-           :total="total"
-           @queryTable="getList"
-           :queryParams="queryParams"
-           @selection-change="handleSelectionChange"
-           @sort-change="handleSortChange"
-           >
-           <div slot="toolbar">
+    <div class="table-box" ref="tableBox">
+      <xd-table v-loading="loading" border stripe size="mini"
+          :data="emisSiteList"
+          :showSearch.sync="showSearch"
+          :total="total"
+          @queryTable="getList"
+          :queryParams="queryParams"
+          @selection-change="handleSelectionChange"
+          @sort-change="handleSortChange"
+          v-if="tableHeight"
+          :max-height="tableHeight + 'px'"
+          >
+          <div slot="toolbar">
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button
@@ -113,7 +105,7 @@
                   v-hasPermi="['emis:emisSite:edit']"
                 >修改</el-button>
               </el-col> -->
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="danger"
                   plain
@@ -123,7 +115,7 @@
                   @click="handleDelete"
                   v-hasPermi="['emis:emisSite:remove']"
                 >删除</el-button>
-              </el-col> -->
+              </el-col>
               <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"
@@ -136,96 +128,96 @@
               </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">
+        <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>
+        </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>
-      -->
+        </template>
+        </el-table-column>
+        -->
 
-      <el-table-column label="网点编号" align="center" prop="siteCode" width="80" >
+        <el-table-column label="网点编号" align="center" prop="siteCode" width="80" >
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.siteCode}}</div>
-         </template>
-      </el-table-column>
-      <el-table-column label="网点名称" align="center" prop="siteName" min-width="100" >
+        </template>
+        </el-table-column>
+        <el-table-column label="网点名称" align="center" prop="siteName" min-width="100" >
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)"><span>{{scope.row.siteName}}</span> <span v-if="scope.row.siteNameEn!=null && scope.row.siteNameEn!=''">/{{scope.row.siteNameEn}}</span> </div>
-         </template>
-      </el-table-column>
-      <!-- <el-table-column label="网点英文名称" align="center" prop="siteNameEn" min-width="100" /> -->
-      <el-table-column label="网点分类" align="center" prop="siteType"  width="100"  >
+        </template>
+        </el-table-column>
+        <!-- <el-table-column label="网点英文名称" align="center" prop="siteNameEn" min-width="100" /> -->
+        <el-table-column label="网点分类" align="center" prop="siteType"  width="100"  >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_site_type" :value="scope.row.siteType"/>
         </template>
-      </el-table-column>
-      <!-- <el-table-column label="加盟类型" align="center" prop="defaultDestinationNameCode" min-width="100" /> -->
-      <el-table-column label="加盟类型" align="center" prop="scopeType"  width="100"  >
+        </el-table-column>
+        <!-- <el-table-column label="加盟类型" align="center" prop="defaultDestinationNameCode" min-width="100" /> -->
+        <el-table-column label="加盟类型" align="center" prop="scopeType"  width="100"  >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_affiliate_type" :value="scope.row.scopeType"/>
         </template>
-      </el-table-column>
-      <el-table-column label="所属品牌" align="center" prop="logoTypeName"  width="80"  />
-      <el-table-column label="二字码" align="center" prop="sizeCode2"  width="80"  />
-      <el-table-column label="三字码" align="center" prop="sizeCode3"  width="80"  />
-      <el-table-column label="截单时间" align="center" prop="cutOffTime" width="100" />
-      <el-table-column label="派件所属网点" align="center" prop="parentSiteName" min-width="100" />
-      <el-table-column label="所属财务中心" align="center" prop="superiorFinanceCenterName" min-width="100" />
+        </el-table-column>
+        <el-table-column label="所属品牌" align="center" prop="logoTypeName"  width="80"  />
+        <el-table-column label="二字码" align="center" prop="sizeCode2"  width="80"  />
+        <el-table-column label="三字码" align="center" prop="sizeCode3"  width="80"  />
+        <el-table-column label="截单时间" align="center" prop="cutOffTime" width="100" />
+        <el-table-column label="派件所属网点" align="center" prop="parentSiteName" min-width="100" />
+        <el-table-column label="所属财务中心" align="center" prop="superiorFinanceCenterName" min-width="100" />
 
-      <el-table-column label="所属区域" align="center" prop="areaName" min-width="100" />
-      <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
+        <el-table-column label="所属区域" align="center" prop="areaName" min-width="100" />
+        <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/>
         </template>
-      </el-table-column>
-      <el-table-column label="国家" align="center" prop="countryName" width="80" />
-      <el-table-column label="省份" align="center" prop="provinceName" width="100" />
-      <el-table-column label="城市" align="center" prop="cityName" width="100" />
-      <el-table-column label="区/县" align="center" prop="countyName" width="100" />
-      <el-table-column label="乡/镇" align="center" prop="townName" width="100" />
-      <el-table-column label="详细地址" align="center" prop="address" min-width="100" />
-      <el-table-column label="是否到付" align="center" prop="blAllowTopayment"  width="80"  >
+        </el-table-column>
+        <el-table-column label="国家" align="center" prop="countryName" width="80" />
+        <el-table-column label="省份" align="center" prop="provinceName" width="100" />
+        <el-table-column label="城市" align="center" prop="cityName" width="100" />
+        <el-table-column label="区/县" align="center" prop="countyName" width="100" />
+        <el-table-column label="乡/镇" align="center" prop="townName" width="100" />
+        <el-table-column label="详细地址" align="center" prop="address" min-width="100" />
+        <el-table-column label="是否到付" align="center" prop="blAllowTopayment"  width="80"  >
         <template slot-scope="scope">
           <div v-if="scope.row.blAllowTopayment == 1">是</div>
           <div v-else>否</div>
         </template>
-      </el-table-column>
-      <el-table-column label="派到付款限额" align="center" prop="topaymentLimited"  width="100"/>
-      <el-table-column label="是否允许自提" align="center" prop="blDispatchZt"  width="80"  >
+        </el-table-column>
+        <el-table-column label="派到付款限额" align="center" prop="topaymentLimited"  width="100"/>
+        <el-table-column label="是否允许自提" align="center" prop="blDispatchZt"  width="80"  >
         <template slot-scope="scope">
           <div v-if="scope.row.blDispatchZt == 1">是</div>
           <div v-else>否</div>
         </template>
-      </el-table-column>
-      <el-table-column label="负责人" align="center" prop="principal"  width="80"/>
-      <el-table-column label="查询电话" align="center" prop="phone"  width="80"/>
-      <el-table-column label="站点经理" align="center" prop=""  width="80"/>
-      <el-table-column label="经理电话" align="center" prop=""  width="80"/>
-      <el-table-column label="业务电话" align="center" prop=""  width="80"/>
-      <el-table-column label="网点面积" align="center" prop=""  width="80"/>
-      <el-table-column label="邮箱" align="center" prop=""  width="80"/>
-      <el-table-column label="网点介绍" align="center" prop=""  width="80"/>
-      <el-table-column label="派送范围" align="center" prop=""  width="80"/>
-      <el-table-column label="不派送范围" align="center" prop=""  width="80"/>
-      <el-table-column label="特殊区域" align="center" prop=""  width="80"/>
-      <el-table-column label="对外备注" align="center" prop=""  width="80"/>
-      <el-table-column label="数据来源" align="center" prop="dataFrom"  width="80"/>
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80"/>
-      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+        </el-table-column>
+        <el-table-column label="负责人" align="center" prop="principal"  width="80"/>
+        <el-table-column label="查询电话" align="center" prop="phone"  width="80"/>
+        <el-table-column label="站点经理" align="center" prop=""  width="80"/>
+        <el-table-column label="经理电话" align="center" prop=""  width="80"/>
+        <el-table-column label="业务电话" align="center" prop=""  width="80"/>
+        <el-table-column label="网点面积" align="center" prop=""  width="80"/>
+        <el-table-column label="邮箱" align="center" prop=""  width="80"/>
+        <el-table-column label="网点介绍" align="center" prop=""  width="80"/>
+        <el-table-column label="派送范围" align="center" prop=""  width="80"/>
+        <el-table-column label="不派送范围" align="center" prop=""  width="80"/>
+        <el-table-column label="特殊区域" align="center" prop=""  width="80"/>
+        <el-table-column label="对外备注" align="center" prop=""  width="80"/>
+        <el-table-column label="数据来源" align="center" prop="dataFrom"  width="80"/>
+        <el-table-column label="创建人" align="center" prop="createBy"  width="80"/>
+        <el-table-column label="创建网点" align="center" prop="createSite"  width="80"/>
+        <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+        <el-table-column label="修改人" align="center" prop="updateBy"  width="80"/>
+        <el-table-column label="修改网点" align="center" prop="updateSite"  width="80"/>
+        <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -243,12 +235,9 @@
             v-hasPermi="['emis:emisSite:remove']"
           >删除</el-button> -->
         </template>
-      </el-table-column>
-    </xd-table>
-
-      </el-col>
-    </el-row>
-
+        </el-table-column>
+      </xd-table>
+    </div>
     <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" append-to-body  :close-on-click-modal="false">
       <emisSiteForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSiteForm>
     </el-dialog>
@@ -296,6 +285,7 @@ export default {
       showSearch: true,
       // 创建时间搜索
       dateTimeRange:[],
+      tableHeight: "",//表格高度
       // 总条数
       total: 0,
       // 网点表格数据
@@ -454,10 +444,39 @@ export default {
       }
     };
   },
+  mounted() {
+    //挂载window.onresize事件(动态设置table高度)
+    let _this = this;
+    window.onresize = () => {
+      if (_this.resizeFlag) {
+        clearTimeout(_this.resizeFlag);
+      }
+      _this.resizeFlag = setTimeout(() => {
+        _this.getTableHeight();
+        _this.resizeFlag = null;
+      }, 100);
+    };
+  },
   created() {
     this.getList();
+
+    this.$nextTick(function() {
+      this.getTableHeight();
+    });
+
   },
   methods: {
+    getTableHeight() {
+      this.tableHeight = this.$refs.tableBox.clientHeight - 40;
+      // console.log(this.$refs.queryForm.offsetHeight);
+      // let tableH = 200;
+      // let tableHeightDetil = window.innerHeight - tableH;
+      // if (tableHeightDetil <= 300) {
+      //   this.tableHeight = 300;
+      // } else {
+      //   this.tableHeight = window.innerHeight - tableH;
+      // }
+    },
     /** 查询网点列表 */
     getList() {
       this.loading = true;
@@ -599,4 +618,8 @@ export default {
     color: #0955ee;
     cursor: pointer;
   }
+  /*示例中顶部区域固定高度190px*/
+  .table-box{
+    height:calc(100vh - 200px);
+  }
 </style>