diff --git a/src/api/sift/queryUserSetting.js b/src/api/sift/queryUserSetting.js
new file mode 100644
index 0000000..c92879c
--- /dev/null
+++ b/src/api/sift/queryUserSetting.js
@@ -0,0 +1,7 @@
+import {createAPI} from "../../utils/httpRequest";
+
+export const searchUserSettingList = (data) => createAPI(`/sift/list`,'get',data)
+export const searchUserSettingRecording = (data) => createAPI(`/sift/recording`,'get',data)
+export const searchUserSettingRecordList = (data) => createAPI(`/sift/recordList`,'get',data)
+export const saveOrUpdateBatch = (data) => createAPI(`/sift/saveOrUpdateBatch`,'post',data)
+export const saveQueryHeaderDetail = (data) => createAPI(`/sift/saveRecord`,'post',data)
diff --git a/src/store/index.js b/src/store/index.js
index 258c9f1..c05d296 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3,13 +3,15 @@ import Vuex from 'vuex'
 import cloneDeep from 'lodash/cloneDeep'
 import common from './modules/common'
 import user from './modules/user'
+import sift from "./modules/sift";
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
   modules: {
     common,
-    user
+    user,
+    sift
   },
   mutations: {
     // 重置vuex本地储存状态
diff --git a/src/store/modules/sift.js b/src/store/modules/sift.js
new file mode 100644
index 0000000..5ddd5f2
--- /dev/null
+++ b/src/store/modules/sift.js
@@ -0,0 +1,17 @@
+export default {
+  namespaced: true,
+  state: {
+    siftList:[],
+    searchFunction:(params)=>{
+      window.alert("没有查询方法")
+    },//直接查询
+  },
+  mutations: {
+    commitSiftList(state, siftList) {
+      state.siftList = siftList
+    },
+    commitSearchFunction(state, SearchFunction) {
+      state.searchFunction = SearchFunction
+    },
+  }
+}
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index 67dd210..826f184 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -1,53 +1,157 @@
 <template>
-  <main class="site-content" :class="{ 'site-content--tabs': $route.meta.isTab }">
-    <!-- 主入口标签页 s -->
-    <el-tabs
-      v-if="$route.meta.isTab"
-      v-model="mainTabsActiveName"
-      :closable="true"
-      @tab-click="selectedTabHandle"
-      @tab-remove="removeTabHandle">
-      <el-dropdown class="site-tabs__tools" :show-timeout="0">
-        <i class="el-icon-arrow-down el-icon--right"></i>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item @click.native="tabsCloseCurrentHandle">关闭当前标签页</el-dropdown-item>
-          <el-dropdown-item @click.native="tabsCloseOtherHandle">关闭其它标签页</el-dropdown-item>
-          <el-dropdown-item @click.native="tabsCloseAllHandle">关闭全部标签页</el-dropdown-item>
-          <el-dropdown-item @click.native="refresh()">刷新当前标签页</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-tab-pane
-        v-for="item in mainTabs"
-        :key="item.name"
-        :label="item.title"
-        :name="item.name">
-        <el-card :body-style="siteContentViewHeight">
-          <iframe
-            v-if="item.type === 'iframe'"
-            :src="item.iframeUrl"
-            width="100%" height="100%" frameborder="0" scrolling="yes">
-          </iframe>
-          <keep-alive v-else>
-            <router-view v-if="item.name === mainTabsActiveName" />
-          </keep-alive>
-        </el-card>
-      </el-tab-pane>
-    </el-tabs>
-    <!-- 主入口标签页 e -->
-    <el-card v-else :body-style="siteContentViewHeight">
-      <keep-alive>
-        <router-view />
-      </keep-alive>
-    </el-card>
-  </main>
+  <div>
+    <main class="site-content" :class="{ 'site-content--tabs': $route.meta.isTab }">
+      <!-- 主入口标签页 s -->
+      <el-tabs
+        v-if="$route.meta.isTab"
+        v-model="mainTabsActiveName"
+        :closable="true"
+        @tab-click="selectedTabHandle"
+        @tab-remove="removeTabHandle">
+        <el-dropdown class="site-tabs__tools" :show-timeout="0">
+          <i class="el-icon-arrow-down el-icon--right"></i>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item @click.native="tabsCloseCurrentHandle">关闭当前标签页</el-dropdown-item>
+            <el-dropdown-item @click.native="tabsCloseOtherHandle">关闭其它标签页</el-dropdown-item>
+            <el-dropdown-item @click.native="tabsCloseAllHandle">关闭全部标签页</el-dropdown-item>
+            <el-dropdown-item @click.native="refresh()">刷新当前标签页</el-dropdown-item>
+            <el-dropdown-item @click.native="flag = true">筛选条件</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-tab-pane
+          v-for="item in mainTabs"
+          :key="item.name"
+          :label="item.title"
+          :name="item.name">
+          <el-card :body-style="siteContentViewHeight">
+            <iframe
+              v-if="item.type === 'iframe'"
+              :src="item.iframeUrl"
+              width="100%" height="100%" frameborder="0" scrolling="yes">
+            </iframe>
+            <keep-alive v-else>
+              <router-view v-if="item.name === mainTabsActiveName" />
+            </keep-alive>
+          </el-card>
+        </el-tab-pane>
+      </el-tabs>
+      <!-- 主入口标签页 e -->
+      <el-card v-else :body-style="siteContentViewHeight">
+        <keep-alive>
+          <router-view />
+        </keep-alive>
+      </el-card>
+    </main>
+    <el-dialog title="查询" append-to-body v-drag @close="closeSiftDialog" @open="openSiftDialog" :visible.sync="flag" width="65%">
+      <el-container>
+        <el-aside width="90%">
+          <el-autocomplete :hide-loading="false" v-if="!settingFlag" style="width: 100%;" @select="handleSelect" :fetch-suggestions="querySaveRecord" v-model="itemDesc">
+            <el-button @click="$store.state.sift.searchFunction([...siftList])" style="width: 80px" slot="append" icon="el-icon-search"></el-button>
+          </el-autocomplete>
+          <el-table ref="siftTable" :row-key="getRowKeys" @selection-change="handleSelectionChange" :data="siftList" height="40vh" border>
+            <el-table-column
+              type="selection"
+              width="40" align="center" v-if="settingFlag">
+            </el-table-column>
+            <el-table-column label="操作" align="left" header-align="center" width="70" v-if="settingFlag">
+              <template slot-scope="{row,$index}">
+                <el-link style="cursor:pointer;" @click="moveSetting($index,-1)" v-if="$index !== 0">上移</el-link>
+                <el-link style="cursor:pointer;" @click="moveSetting($index,1)" v-if="$index !== siftList.length-1">下移</el-link>
+              </template>
+            </el-table-column>
+<!--            <el-table-column label="属性" align="center" show-overflow-tooltip width="120" prop="fieldName"></el-table-column>-->
+            <el-table-column label="属性名称" align="center" show-overflow-tooltip width="120" prop="fieldCaption"></el-table-column>
+            <el-table-column label="条件" align="center">
+              <template slot-scope="{row,$index}">
+                <el-input v-model="row.formula" clearable :disabled="row.symbol === 'is_null' || row.symbol === 'is_not_null'">
+                  <el-select @change="(value)=>changeSymbol(value,row)" slot="prepend" clearable v-model="row.symbol" style="width: 100px;cursor:pointer;">
+                    <el-option value="eq" label="="></el-option>
+                    <el-option value="ne" label="!="></el-option>
+                    <el-option value="lt" label="<"></el-option>
+                    <el-option value="le" label="<="></el-option>
+                    <el-option value="gt" label=">"></el-option>
+                    <el-option value="ge" label=">="></el-option>
+                    <el-option value="like" label="包含"></el-option>
+                    <el-option value="in" label="在列表"></el-option>
+                    <el-option value="between" label="范围"></el-option>
+                    <el-option value="not_between" label="不在范围"></el-option>
+                    <el-option value="is_null" label="是空"></el-option>
+                    <el-option value="is_not_null" label="不是空"></el-option>
+                  </el-select>
+                </el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="排序" align="center" prop="sortBy" show-overflow-tooltip width="120">
+              <template slot-scope="{row,$index}">
+                <el-select v-model="row.sortBy" clearable style="width: 100%">
+                  <el-option value="asc" label="升序"></el-option>
+                  <el-option value="desc" label="降序"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="数据库字段" align="center" prop="originalField" show-overflow-tooltip width="120"></el-table-column>
+          </el-table>
+        </el-aside>
+        <el-container>
+          <el-main style="padding: 0px;">
+            <el-card class="box-card" style="height: 100%;margin-left: 3px">
+              <div style="text-align: center;">
+                <div class="box-div" style="margin-top: 70px">
+                  <button @click="openSaveQueryHeaderDialog" v-if="!settingFlag">条件保存</button>
+                </div>
+                <div class="box-div">
+                  <button @click="flushedSiftList">刷新</button>
+                </div>
+                <div class="box-div">
+                  <button @click="clearSetting">清除</button>
+                </div>
+                <div class="box-div">
+                  <button @click="queryUserSettingSave">{{ settingFlag?'保存':'配置' }}</button>
+                </div>
+                <div class="box-div" v-if="settingFlag">
+                  <button @click="settingFlag = false">取消</button>
+                </div>
+              </div>
+            </el-card>
+          </el-main>
+        </el-container>
+      </el-container>
+      <div style="height: 20px;width: 100%"></div>
+    </el-dialog>
+
+    <el-dialog title="记录名称" center :visible.sync="saveQueryHeader" @open="selectData = {itemDesc: undefined}" top="20vh" width="20%">
+      <el-input v-model="selectData.itemDesc"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveQueryHeaderDetail">保 存</el-button>
+        <el-button type="primary" @click="saveQueryHeader = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
   import { isURL } from '@/utils/validate'
+  import {
+    saveOrUpdateBatch, saveQueryHeaderDetail,
+    searchUserSettingList,
+    searchUserSettingRecording,
+    searchUserSettingRecordList
+  } from "../api/sift/queryUserSetting";
+  import {Decimal} from "decimal.js";
   export default {
     inject: ['refresh'],
     data () {
       return {
+        cloneSiftList:[],
+        flag:false,
+        settingFlag:false,
+        selectionSiftList:[],
+        recordList:[],
+        itemDesc:'',
+        selectData:{
+          itemDesc:undefined,
+        },
+        saveQueryHeader:false,
       }
     },
     computed: {
@@ -73,6 +177,11 @@
           return isURL(this.$route.meta.iframeUrl) ? { height: height + 'px' } : { minHeight: height + 'px' }
         }
         return { minHeight: height + 'px' }
+      },
+      siftList:{
+        get(){
+          return this.$store.state.sift.siftList.filter(e => e.visible === 'Y'|| this.settingFlag)
+        },
       }
     },
     methods: {
@@ -121,8 +230,274 @@
         this.$nextTick(() => {
           this.$router.push({ name: tab.name, query: tab.query, params: tab.params })
         })
+      },
+      openSiftDialog(){
+        this.cloneSiftList = JSON.parse(JSON.stringify(this.$store.state.sift.siftList))
+      },
+      closeSiftDialog(){
+        if (this.settingFlag){
+          this.$confirm('存在未保存的数据，是否保存?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.queryUserSettingSave();
+            this.settingFlag = false;
+          }).catch(() => {
+            this.settingFlag = false;
+          });
+        }
+        this.$store.commit("sift/commitSiftList",this.cloneSiftList);
+        this.itemDesc = '';
+      },
+      searchSiftList(){
+        let params = {
+          menuId:this.$route.meta.menuId,
+          userId:this.$store.state.user.id
+        }
+        searchUserSettingList(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.$store.commit("sift/commitSiftList",data.rows)
+            this.cloneSiftList = data.rows
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.warning(error)
+        })
+      },
+      queryUserSettingSave(){
+        if (this.settingFlag === false){
+          this.settingFlag = true
+          this.$store.commit("sift/commitSiftList",this.cloneSiftList)
+          this.$nextTick(()=>{
+            this.$refs.siftTable.clearSelection()
+            this.siftList.forEach(row=>{
+              this.$refs.siftTable.toggleRowSelection(row,row.visible === 'Y')
+            })
+          })
+          return
+        }
+        // 修改选择值切换
+        // this.showSetting();
+        // 发起新增或修改请求
+        saveOrUpdateBatch(this.showSetting()).then(({data})=>{
+          if (data && data.code === 0){
+            this.searchSiftList()
+            this.itemDesc = '';
+            this.settingFlag = false
+            this.$message.success(data.msg)
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      },
+      handleSelectionChange(val){
+        this.selectionSiftList = val
+      },
+      getRowKeys(row){
+        return row.fieldName
+      },
+      moveSetting(i,num){
+        let arr = [...this.siftList]
+        arr[i+num].showSeqNo = new Decimal(arr[i+num].showSeqNo).toNumber() - num
+        arr[i].showSeqNo = new Decimal(arr[i+num].showSeqNo).toNumber() + num
+        arr = arr.sort((a,b)=> a.showSeqNo-b.showSeqNo)
+        this.$store.commit("sift/commitSiftList",arr)
+        this.$nextTick(()=>{
+          this.siftList.forEach(row =>{
+            this.$refs.siftTable.toggleRowSelection(row,row.visible === 'Y')
+          })
+        })
+      },
+      showSetting(){
+        let arr = [...this.siftList]
+        arr.map(i=>{
+          i.visible = 'N'
+          return i
+        })
+        this.selectionSiftList.forEach(item=>{
+          for (let i = 0; i < arr.length; i++) {
+            let setting = arr[i]
+            if (item.fieldName === setting.fieldName){
+              setting.visible = 'Y'
+              break
+            }
+          }
+        })
+        return arr
+      },
+      clearSetting(){
+        let arr = JSON.parse(JSON.stringify(this.siftList));
+        for (let i = 0; i < this.siftList.length; i++) {
+          arr[i].symbol = null;
+          arr[i].formula = null;
+          arr[i].sortBy = null;
+        }
+        this.itemDesc = '';
+        this.$store.commit("sift/commitSiftList",arr)
+        this.$nextTick(()=>{
+          this.siftList.forEach(row =>{
+            this.$refs.siftTable.toggleRowSelection(row,row.visible === 'Y')
+          })
+        })
+      },
+      flushedSiftList(){
+        let params = {
+          menuId:this.$route.meta.menuId,
+          userId:this.$store.state.user.id
+        }
+        this.itemDesc = ''
+        searchUserSettingList(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.$store.commit("sift/commitSiftList",data.rows)
+            this.$nextTick(()=>{
+              this.siftList.forEach(row =>{
+                this.$refs.siftTable.toggleRowSelection(row,row.visible === 'Y')
+              })
+            })
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      },
+      flushedSiftRecording(){
+        let params = {
+          menuId:this.$route.meta.menuId,
+          userId:this.$store.state.user.id
+        }
+        searchUserSettingRecordList(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.recordList = data.rows
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      },
+      flushSift(){
+        if (this.$route.meta.menuId){
+          this.flushedSiftList()
+          this.flushedSiftRecording()
+        }
+      },
+      querySaveRecord(queryString, cb){
+        let results = this.recordList;
+        results = queryString?results.filter((item)=>{
+          return item.itemDesc.toUpperCase().match(queryString)
+        }):results;
+        results = results.map(item=>{
+          item.value = item.itemDesc
+          return item
+        })
+        cb(results)
+      },
+      handleSelect(item){
+        this.selectData = JSON.parse(JSON.stringify(item))
+        searchUserSettingRecording(item).then(({data})=>{
+          if (data && data.code === 0){
+            let rows = data.rows
+            let list = [...this.siftList]
+            rows.forEach((row)=>{
+              for (let i = 0; i < list.length; i++) {
+                let sift = list[i]
+                if (sift.menuId === row.menuId && sift.userId === row.userId && sift.fieldName === row.fieldName){
+                  sift.symbol = row.symbol
+                  sift.formula = row.formula
+                  sift.sortBy = row.sortBy
+                  break
+                }
+              }
+            })
+            this.$store.commit("sift/commitSiftList",list);
+            // 处理数据
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      },
+      openSaveQueryHeaderDialog(){
+        if (!this.itemDesc){
+          this.saveQueryHeader = true
+          return
+        }
+        this.saveQueryHeaderDetail();
+      },
+      saveQueryHeaderDetail(){
+        let param = {...this.selectData}
+        // 打开了新增弹框即新增查询记录 否则修改查询记录
+        if (this.saveQueryHeader){
+          param.menuId = this.$route.meta.menuId
+          param.userId = this.$store.state.user.id
+          param.dtsName = 'ADOQResult'
+        }
+        param.querySavedDetailList = JSON.parse(JSON.stringify(this.siftList))
+        saveQueryHeaderDetail(param).then(({data})=>{
+          if (data && data.code === 0){
+            this.flushedSiftRecording();
+            this.saveQueryHeader = false
+            this.$message.success(data.msg)
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      },
+      changeSymbol(value,row){
+        if (value === 'is_null' || value === 'is_not_null'){
+          row.formula = '';
+        }
       }
+    },
+    watch:{
+      // 监听路由变化调用筛选查询
+      $route:'flushSift'
+    },
+    mounted() {
+      this.flushSift()
     }
   }
 </script>
 
+<style scoped>
+ /deep/ .el-table .cell{
+  height: auto;
+}
+ .box-div{
+   width: 100%;
+   margin-bottom: 5px;
+   padding-bottom: 5px;
+   //border-bottom: 1px solid #eee;
+ }
+ .box-div button{
+   height: 32px;
+   width: 80px;
+   background: rgb(22,179,163);
+   border: none;
+   border-radius: 5px;
+   color: #fff;
+   cursor: pointer;
+ }
+ .box-div button:hover{
+   background: rgb(97, 217, 204);
+ }
+
+ /deep/ .el-input .el-input-group__prepend{
+   background-color: #fff;
+ }
+
+ /deep/ .el-autocomplete .el-input .el-input-group__append{
+   background-color: rgb(22,179,163);
+   color: #fff;
+   border: 1px solid rgb(22,179,163);
+ }
+</style>
+
diff --git a/src/views/modules/base/buInfo.vue b/src/views/modules/base/buInfo.vue
index 895513c..926a9d5 100644
--- a/src/views/modules/base/buInfo.vue
+++ b/src/views/modules/base/buInfo.vue
@@ -263,7 +263,13 @@
         }
       },
     },
+    activated() {
+      this.$store.commit("sift/commitSearchFunction",this.getBuDemo)
+    },
     methods: {
+      getBuDemo(params){
+        this.$message.success("这里是BU")
+      },
       // 获取基础数据列表S
       getBaseList (val, type) {
         this.tagNo = val
diff --git a/src/views/modules/base/factoryInformation.vue b/src/views/modules/base/factoryInformation.vue
index 21d3b35..398e79d 100644
--- a/src/views/modules/base/factoryInformation.vue
+++ b/src/views/modules/base/factoryInformation.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{buttons.search}}</el-button>
-      <el-button @click="addModal()" type="primary" :disabled = "authAdd"
-                 style="margin-left: 2px;margin-top: 0px">{{buttons.add}}</el-button>
+      <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.search }}
+      </el-button>
+      <el-button @click="addModal()" type="primary" :disabled="authAdd"
+                 style="margin-left: 2px;margin-top: 0px">{{ buttons.add }}
+      </el-button>
       <download-excel
         :fields="fields()"
         :data="exportData"
@@ -33,10 +35,11 @@
         fixed="right"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="scope.row.active=='Y'"  @click="accessSiteModel(scope.row)">{{buttons.role}}</a>
-          <a type="text" size="small" v-if="!authEdit"  @click="editSite(scope.row)">{{buttons.update}}</a>
-          <a type="text" size="small"  @click="getCompanyInformation(scope.row)">{{buttons.companyInformation}}</a>
-<!--          //v-if="jumpFlag"-->
+          <a type="text" size="small" v-if="scope.row.active=='Y'"
+             @click="accessSiteModel(scope.row)">{{ buttons.role }}</a>
+          <a type="text" size="small" v-if="!authEdit" @click="editSite(scope.row)">{{ buttons.update }}</a>
+          <a type="text" size="small" @click="getCompanyInformation(scope.row)">{{ buttons.companyInformation }}</a>
+          <!--          //v-if="jumpFlag"-->
         </template>
       </el-table-column>
       <el-table-column
@@ -50,34 +53,35 @@
         :width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                              style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog :title=labels.factoryInformation :close-on-click-modal="false" v-drag :visible.sync="siteFlag" width="630px" >
+    <el-dialog :title=labels.factoryInformation :close-on-click-modal="false" v-drag :visible.sync="siteFlag"
+               width="630px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="labels.site">
           <el-input v-model="siteData.siteID" :disabled="siteInputFlag" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.siteName_cn>
-          <el-input v-model="siteData.siteName"  style="width: 130px"></el-input>
+          <el-input v-model="siteData.siteName" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.siteName_en>
-          <el-input v-model="siteData.siteNameE"  style="width: 130px"></el-input>
+          <el-input v-model="siteData.siteNameE" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.postCode>
-          <el-input v-model="siteData.postCode"  style="width: 130px"></el-input>
+          <el-input v-model="siteData.postCode" style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item >
-          <span slot="label" style="" @click="getBaseList(1003)"><a herf="#">{{labels.company}}</a></span>
-          <el-input v-model="siteData.companyID"  style="width: 130px"></el-input>
+        <el-form-item>
+          <span slot="label" style="" @click="getBaseList(1003)"><a herf="#">{{ labels.company }}</a></span>
+          <el-input v-model="siteData.companyID" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.referenceCustomerID>
-          <el-input v-model="siteData.referenceCustomerID"  style="width: 130px"></el-input>
+          <el-input v-model="siteData.referenceCustomerID" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.active>
           <el-select filterable v-model="siteData.active" style="width: 130px">
@@ -97,38 +101,41 @@
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label=labels.contactName>
-          <el-input v-model="siteData.contactName"  style="width: 130px"></el-input>
+          <el-input v-model="siteData.contactName" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.phoneNo>
-          <el-input v-model="siteData.phoneNo"  style="width: 130px"></el-input>
+          <el-input v-model="siteData.phoneNo" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.email>
-          <el-input v-model="siteData.email"  style="width: 130px"></el-input>
+          <el-input v-model="siteData.email" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.faxNo>
-          <el-input v-model="siteData.faxNo"  style="width: 130px"></el-input>
+          <el-input v-model="siteData.faxNo" style="width: 130px"></el-input>
         </el-form-item>
 
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label=labels.address>
-          <el-input v-model="siteData.address" type="textarea" :autosize="{ minRows: 1, maxRows: 6}"  style="width: 562px"></el-input>
+          <el-input v-model="siteData.address" type="textarea" :autosize="{ minRows: 1, maxRows: 6}"
+                    style="width: 562px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
 
         <el-form-item :label=labels.addressE>
-          <el-input v-model="siteData.addressE" type="textarea" :autosize="{ minRows: 1, maxRows: 6}"  style="width: 562px"></el-input>
+          <el-input v-model="siteData.addressE" type="textarea" :autosize="{ minRows: 1, maxRows: 6}"
+                    style="width: 562px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
         <el-form-item :label=labels.website>
-          <el-input v-model="siteData.website" type="textarea" :autosize="{ minRows: 1, maxRows: 6}"  style="width: 562px"></el-input>
+          <el-input v-model="siteData.website" type="textarea" :autosize="{ minRows: 1, maxRows: 6}"
+                    style="width: 562px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="siteSave()">{{buttons.save}}</el-button>
-        <el-button type="primary" @click="siteFlag = false">{{buttons.close}}</el-button>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="siteSave()">{{ buttons.save }}</el-button>
+        <el-button type="primary" @click="siteFlag = false">{{ buttons.close }}</el-button>
       </el-footer>
     </el-dialog>
     <!-- 动态列    -->
@@ -155,822 +162,824 @@
     </span>
     </el-dialog>
 
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
 <script>
 
-  import column from "@/views/modules/common/column";
-    import {
-      getSiteData,
-      getCompanyData,
-      siteSave,
-      searchAccessSiteListBySite,
-      saveAccessSiteForSite
-    } from "@/api/base/site.js"
-    import {
-
-      searchFunctionButtonList,
-
-    } from "@/api/sysLanguage.js"
-    import {
-      getTableDefaultListLanguage,
-      getTableUserListLanguage,
-    } from "@/api/table.js"
-    import Chooselist from '@/views/modules/common/Chooselist'
-
-    var functionId='100001002';
-
-    export default {
-      name: "factoryInformation",
-      components: {
-        column,Chooselist
+import column from "@/views/modules/common/column";
+import {
+  getSiteData,
+  getCompanyData,
+  siteSave,
+  searchAccessSiteListBySite,
+  saveAccessSiteForSite
+} from "@/api/base/site.js"
+import {
+  searchFunctionButtonList,
+} from "@/api/sysLanguage.js"
+import {
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+} from "@/api/table.js"
+import Chooselist from '@/views/modules/common/Chooselist'
+
+var functionId = '100001002';
+
+export default {
+  name: "factoryInformation",
+  components: {
+    column, Chooselist
+  },
+  data() {
+    return {
+      rowSite: '',
+      accessSiteVisible: false,
+      accessSiteList: [],
+      userList: [],
+      queryTable: {
+        functionId: this.$route.meta.menuId,
+        tableId: "100001002Table",
+        languageCode: this.$i18n.locale
       },
-      data() {
-        return {
-          rowSite:'',
-          accessSiteVisible:false,
-          accessSiteList:[],
-          userList:[],
-          queryTable: {
-            functionId: this.$route.meta.menuId,
-            tableId: "100001002Table",
-            languageCode: this.$i18n.locale
-          },
-          // 用户table 查询参数
-          queryTableUser: {
-            userId: this.$store.state.user.name,
-            functionId: this.$route.meta.menuId,
-            tableId: "100001002Table",
-            status: true,
-            languageCode: this.$i18n.locale
-          },
-          jumpFlag:true,
-          authEdit: false,
-          authAdd: false,
-          authDelete: false,
-          menuId: this.$route.meta.menuId,
-          tagNo:'',
-          // 导出 start
-          exportData: [],
-          exportName: "工厂信息"+this.dayjs().format('YYYYMMDDHHmmss'),
-          exportHeader: ["工厂信息"],
-          exportFooter: [],
-          // 导出 end
-
-          dataListLoading: false,
-          // 多语言 start
-          // 用户table 配置集合
-          buttonList: [
-            {
-              functionId: functionId,
-              languageValue: '查询',
-              objectId: 'search',
-              objectType: 'button',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '新增',
-              objectId: 'add',
-              objectType: 'button',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '导出',
-              objectId: 'download',
-              objectType: 'button',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '修改',
-              objectId: 'update',
-              objectType: 'button',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '查看会计单位信息',
-              objectId: 'companyInformation',
-              objectType: 'button',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '保存',
-              objectId: 'save',
-              objectType: 'button',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '关闭',
-              objectId: 'close',
-              objectType: 'button',
-              tableId: '*',
-            },
-          ],
-          labelsList:[
-            {
-              functionId: functionId,
-              languageValue: '工厂编码',
-              objectId: 'site',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '工厂信息',
-              objectId: 'factoryInformation',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '工厂名称（中文）',
-              objectId: 'siteName_cn',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '工厂名称（英文）',
-              objectId: 'siteName_en',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '邮政编码',
-              objectId: 'postCode',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '会计单位',
-              objectId: 'company',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '参照客户编码',
-              objectId: 'referenceCustomerID',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '在用',
-              objectId: 'active',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '发货时间',
-              objectId: 'shipTime',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '联系人',
-              objectId: 'contactName',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '电话',
-              objectId: 'phoneNo',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: 'email',
-              objectId: 'email',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '传真',
-              objectId: 'faxNo',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '地址(中文)',
-              objectId: 'address',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '地址(英文)',
-              objectId: 'addressE',
-              objectType: 'label',
-              tableId: '*',
-            }, {
-              functionId: functionId,
-              languageValue: '公司网站',
-              objectId: 'website',
-              objectType: 'label',
-              tableId: '*',
-            },
-          ],
-          labels: {
-            site:'工厂编码',
-            factoryInformation:'工厂信息',
-            siteName_cn:'工厂名称（中文）',
-            siteName_en:'工厂名称（英文）',
-            postCode:'邮政编码',
-            company:'会计单位',
-            referenceCustomerID:'参照客户编码',
-            active:'在用',
-            shipTime:'发货时间',
-            contactName:'联系人',
-            phoneNo:'电话',
-            email:'email',
-            faxNo:'传真',
-            address:'地址(中文)',
-            addressE:'地址(英文)',
-            website:'公司网站',
-          },
-          buttons:{
-            search:'查询',
-            add:'新增',
-            download:'导出',
-            update:'修改',
-            companyInformation:'查看会计单位信息',
-            save:'保存',
-            close:'关闭',
-            role:'授权',
-          },
-          queryButton: {
-            functionId: functionId,
-            table_id: '*',
-            languageCode: this.$i18n.locale,
-            objectType: 'button'
-          },
-          queryLabel: {
-            functionId: functionId,
-            table_id: '*',
-            languageCode: this.$i18n.locale,
-            objectType: 'label'
-          },
-
-          visible:false,
-          // 多语言 end
-          height: 200,
-          siteFlag:false,
-          siteInputFlag:true,
-          siteData: {
-            add:'',
-            siteID:'',
-            siteName:'',
-            siteNameE:'',
-            companyID:'',
-            postCode:'',
-            address:'',
-            addressE:'',
-            website:'',
-            contactName:'',
-            phoneNo:'',
-            faxNo:'',
-            email:'',
-            active:'Y',
-            shipTime:'',
-            referenceCustomerID:'',
-          },
-          dataList:[],
-          columnList: [
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableSiteID',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "siteID",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工厂编码",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 10,
-              status: true,
-              fixed: '',
-              columnWidth: 60
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableSiteName',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "siteName",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工厂名称",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 20,
-              status: true,
-              fixed: '',
-              columnWidth: 120
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableSiteNameE',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "siteNameE",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工厂名称(英文)",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 30,
-              status: true,
-              fixed: '',
-              columnWidth: 200
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableCompanyID',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "companyID",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "会计单位",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 40,
-              status: true,
-              fixed: '',
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableCompanyName',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "companyName",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "会计单位名称",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 50,
-              status: true,
-              fixed: '',
-              columnWidth: 150
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableAddress',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "address",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "地址",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 60,
-              status: true,
-              fixed: '',
-              columnWidth: 200
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableAddressE',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "addressE",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "地址(英文)",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 70,
-              status: true,
-              fixed: '',
-              columnWidth: 200
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableWebsite',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "website",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "公司网址",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 80,
-              status: true,
-              fixed: '',
-              columnWidth: 150
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableContactName',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "contactName",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "联系人",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 90,
-              status: true,
-              fixed: '',
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TablePostCode',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "postCode",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "邮政编码",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 100,
-              status: true,
-              fixed: '',
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TablePhoneNo',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "phoneNo",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "电话",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 110,
-              status: true,
-              fixed: '',
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableFaxNo',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "faxNo",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "传真",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 120,
-              status: true,
-              fixed: '',
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableEmail',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "email  ",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "Email",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 130,
-              status: true,
-              fixed: '',
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableActive',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "active",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "在用",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 140,
-              status: true,
-              fixed: '',
-              columnWidth: 50
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 100001002,
-              serialNumber: '100001002TableShipTime',
-              tableId: "100001002Table",
-              tableName: "工厂信息表",
-              columnProp: "shipTime",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "发货时间",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 150,
-              status: true,
-              fixed: '',
-              columnWidth: 120
-            }
-          ],
-        }
+      // 用户table 查询参数
+      queryTableUser: {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: "100001002Table",
+        status: true,
+        languageCode: this.$i18n.locale
       },
-
-      mounted() {
-        this.$nextTick(() => {
-          this.height = window.innerHeight - 140;
-        })
+      jumpFlag: true,
+      authEdit: false,
+      authAdd: false,
+      authDelete: false,
+      menuId: this.$route.meta.menuId,
+      tagNo: '',
+      // 导出 start
+      exportData: [],
+      exportName: "工厂信息" + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ["工厂信息"],
+      exportFooter: [],
+      // 导出 end
+
+      dataListLoading: false,
+      // 多语言 start
+      // 用户table 配置集合
+      buttonList: [
+        {
+          functionId: functionId,
+          languageValue: '查询',
+          objectId: 'search',
+          objectType: 'button',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '新增',
+          objectId: 'add',
+          objectType: 'button',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '导出',
+          objectId: 'download',
+          objectType: 'button',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '修改',
+          objectId: 'update',
+          objectType: 'button',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '查看会计单位信息',
+          objectId: 'companyInformation',
+          objectType: 'button',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '保存',
+          objectId: 'save',
+          objectType: 'button',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '关闭',
+          objectId: 'close',
+          objectType: 'button',
+          tableId: '*',
+        },
+      ],
+      labelsList: [
+        {
+          functionId: functionId,
+          languageValue: '工厂编码',
+          objectId: 'site',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '工厂信息',
+          objectId: 'factoryInformation',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '工厂名称（中文）',
+          objectId: 'siteName_cn',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '工厂名称（英文）',
+          objectId: 'siteName_en',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '邮政编码',
+          objectId: 'postCode',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '会计单位',
+          objectId: 'company',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '参照客户编码',
+          objectId: 'referenceCustomerID',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '在用',
+          objectId: 'active',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '发货时间',
+          objectId: 'shipTime',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '联系人',
+          objectId: 'contactName',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '电话',
+          objectId: 'phoneNo',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: 'email',
+          objectId: 'email',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '传真',
+          objectId: 'faxNo',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '地址(中文)',
+          objectId: 'address',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '地址(英文)',
+          objectId: 'addressE',
+          objectType: 'label',
+          tableId: '*',
+        }, {
+          functionId: functionId,
+          languageValue: '公司网站',
+          objectId: 'website',
+          objectType: 'label',
+          tableId: '*',
+        },
+      ],
+      labels: {
+        site: '工厂编码',
+        factoryInformation: '工厂信息',
+        siteName_cn: '工厂名称（中文）',
+        siteName_en: '工厂名称（英文）',
+        postCode: '邮政编码',
+        company: '会计单位',
+        referenceCustomerID: '参照客户编码',
+        active: '在用',
+        shipTime: '发货时间',
+        contactName: '联系人',
+        phoneNo: '电话',
+        email: 'email',
+        faxNo: '传真',
+        address: '地址(中文)',
+        addressE: '地址(英文)',
+        website: '公司网站',
       },
-      watch: {
-        '$route' (to, from) {
-          if(localStorage.getItem('factoryInformation')!=undefined){
-            this.getData();
-          }
-        }
+      buttons: {
+        search: '查询',
+        add: '新增',
+        download: '导出',
+        update: '修改',
+        companyInformation: '查看会计单位信息',
+        save: '保存',
+        close: '关闭',
+        role: '授权',
+      },
+      queryButton: {
+        functionId: functionId,
+        table_id: '*',
+        languageCode: this.$i18n.locale,
+        objectType: 'button'
+      },
+      queryLabel: {
+        functionId: functionId,
+        table_id: '*',
+        languageCode: this.$i18n.locale,
+        objectType: 'label'
       },
-      methods: {
-        getBaseData(val){
-
-            this.$nextTick(() => {
-              if (this.tagNo === 1003) {
-                this.siteData.companyID = val.CompanyID
-              }
-            })
 
+      visible: false,
+      // 多语言 end
+      height: 200,
+      siteFlag: false,
+      siteInputFlag: true,
+      siteData: {
+        add: '',
+        siteID: '',
+        siteName: '',
+        siteNameE: '',
+        companyID: '',
+        postCode: '',
+        address: '',
+        addressE: '',
+        website: '',
+        contactName: '',
+        phoneNo: '',
+        faxNo: '',
+        email: '',
+        active: 'Y',
+        shipTime: '',
+        referenceCustomerID: '',
+      },
+      dataList: [],
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableSiteID',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "siteID",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工厂编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 10,
+          status: true,
+          fixed: '',
+          columnWidth: 60
         },
-        // 获取基础数据列表
-        getBaseList(val){
-          this.tagNo = val
-          this.$nextTick(() => {
-            let strVal = "";
-            if (val === 1003 &&  this.siteData.companyID){
-              strVal = this.siteData.companyID
-            }
-            this.$refs.baseList.init(val,strVal)
-          })
-        },
-        getData(){
-          let data={};
-          if(localStorage.getItem('factoryInformation')!=undefined){
-            data=JSON.parse(localStorage.getItem('factoryInformation'));
-          }
-          localStorage.removeItem('factoryInformation');
-          getSiteData(data).then(({data}) => {
-            this.dataList = data.rows
-          })
-        },
-        addModal(){
-          this.siteData={
-            add:'',
-            siteID:'',
-            siteName:'',
-            siteNameE:'',
-            companyID:'',
-            postCode:'',
-            address:'',
-            addressE:'',
-            website:'',
-            contactName:'',
-            phoneNo:'',
-            faxNo:'',
-            email:'',
-            active:'Y',
-            shipTime:'',
-            referenceCustomerID:'',
-
-          },
-          this.siteData.add=0;
-          this.siteInputFlag=false;
-          this.siteData.active='Y';
-          this.siteFlag=true;
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableSiteName',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "siteName",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工厂名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 20,
+          status: true,
+          fixed: '',
+          columnWidth: 120
         },
-        editSite(row){
-          this.siteData=JSON.parse(JSON.stringify(row));
-          this.siteData.add=1;
-          this.siteInputFlag=true;
-          this.siteFlag=true;
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableSiteNameE',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "siteNameE",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工厂名称(英文)",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 30,
+          status: true,
+          fixed: '',
+          columnWidth: 200
         },
-        siteSave(){
-          siteSave(this.siteData).then(({data}) => {
-            if(this.siteData.companyID==''||this.siteData.companyID==null){
-              this.$alert("请选择会计单位！",'错误',{
-                confirmButtonText:'确定'
-              })
-              return false;
-            }
-            if(this.siteData.siteID==''||this.siteData.siteID==null){
-              this.$alert("请输入工厂编码！",'错误',{
-                confirmButtonText:'确定'
-              })
-              return false;
-            }
-            if(this.siteData.siteName==''||this.siteData.siteName==null){
-              this.$alert("请输入工厂名称！",'错误',{
-                confirmButtonText:'确定'
-              })
-              return false;
-            }
-
-            if (data && data.code == 200) {
-              this.siteFlag = false
-              this.getData();
-             this.$message.success('操作成功')
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableCompanyID',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "companyID",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "会计单位",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 40,
+          status: true,
+          fixed: '',
+          columnWidth: 100
         },
-        saveAccessSite(){
-          let accessSiteList=[]
-          for (let i = 0; i <this.accessSiteList.length ; i++) {
-            let inData={
-              site:this.rowSite,
-              userid:this.accessSiteList[i]
-            }
-            accessSiteList.push(inData)
-          }
-          let saveData={
-            site:this.rowSite,
-            accessSiteList:accessSiteList,
-          }
-          saveAccessSiteForSite(saveData).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message.success( '操作成功')
-              this.accessSiteVisible = false
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableCompanyName',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "companyName",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "会计单位名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 50,
+          status: true,
+          fixed: '',
+          columnWidth: 150
         },
-        //导出excel
-        createExportData() {
-
-            return this.dataList;
-
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableAddress',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "address",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "地址",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 60,
+          status: true,
+          fixed: '',
+          columnWidth: 200
         },
-        startDownload() {
-          //  this.exportData = this.dataList
-
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableAddressE',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "addressE",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "地址(英文)",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 70,
+          status: true,
+          fixed: '',
+          columnWidth: 200
         },
-        finishDownload() {
-
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableWebsite',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "website",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "公司网址",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 80,
+          status: true,
+          fixed: '',
+          columnWidth: 150
         },
-        fields() {
-          let json = "{"
-          this.columnList.forEach((item, index) => {
-            if (index == this.columnList.length - 1) {
-              json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-            } else {
-              json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-            }
-          })
-          json += "}"
-          let s = eval("(" + json + ")")
-
-          return s
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableContactName',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "contactName",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "联系人",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 90,
+          status: true,
+          fixed: '',
+          columnWidth: 100
         },
-        // 导出 end
-        getCompanyInformation(row){
-          let inData={companyID:row.companyID,companyName:row.companyName};
-         localStorage.setItem('companyInformation', JSON.stringify(inData))
-          this.$router.replace('base-companyInformation')
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TablePostCode',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "postCode",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "邮政编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 100,
+          status: true,
+          fixed: '',
+          columnWidth: 100
         },
-
-        //获取按钮的权限数据
-        getButtonAuthData(){
-          let updateFlag = this.isAuth(this.menuId+":revise");
-          let fullControFlag = this.isAuth(this.menuId+":fullContro");
-          let deleteFlag = this.isAuth(this.menuId+":remove");
-          //处理页面的权限数据
-          this.authEdit = !updateFlag ||!fullControFlag;
-          this.authAdd = !fullControFlag;
-          this.authDelete = !deleteFlag;
-
-          //跳转页面
-          let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]').filter(item => item.path == 'base-companyInformation')
-          if (menList.length > 0) {
-            this.jumpFlag = false
-          }
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TablePhoneNo',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "phoneNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "电话",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 110,
+          status: true,
+          fixed: '',
+          columnWidth: 100
         },
-
-        accessSiteModel(row){
-          searchAccessSiteListBySite({site:row.siteID,
-            }).then(({data}) => {
-            this.accessSiteList = data.accessSiteList
-            this.userList=data.userList
-          })
-          this.rowSite=row.siteID
-          this.accessSiteVisible=true;
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableFaxNo',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "faxNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "传真",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 120,
+          status: true,
+          fixed: '',
+          columnWidth: 100
         },
-
-        //多语言
-        getMultiLanguageList() {
-          //首先查询当前按钮的多语言
-          searchFunctionButtonList(this.queryButton).then(({data}) => {
-            if (data.code == 0) {
-              this.buttons = data.data
-            } else {
-              // saveButtonList(this.buttonList).then(({data}) => {
-              // })
-            }
-          });
-          //其次查询当前标签的多语言
-          searchFunctionButtonList(this.queryLabel).then(({data}) => {
-            if (data.code == 0) {
-              this.labels = data.data
-            } else {
-              // saveButtonList(this.buttonList).then(({data}) => {
-              // })
-            }
-          });
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableEmail',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "email  ",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Email",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 130,
+          status: true,
+          fixed: '',
+          columnWidth: 100
         },
-        // 打开页面设置
-        userSetting() {
-          this.visible = true;
-          let queryTable = {
-            userId: this.$store.state.user.name,
-            functionId: this.$route.meta.menuId,
-            tableId:this.queryTable .tableId,
-            languageCode: this.$i18n.locale
-          }
-          this.$nextTick(() => {
-            this.$refs.column.init(queryTable);
-          });
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableActive',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "active",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "在用",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 140,
+          status: true,
+          fixed: '',
+          columnWidth: 50
         },
-        // 获取 用户保存的 格式列
-        getTableUserColumn(tableId) {
-          console.log(tableId)
-          getTableUserListLanguage(this.queryTableUser).then(({data}) => {
-            if (data.rows.length > 0) {
-              //this.columnList = []
-              this.columnList = data.rows
-            } else {
-              this.getColumnList()
-            }
-          })
-        },
-        // 获取 tableDefault 列
-        getColumnList() {
-          getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-            if (!data.rows.length == 0) {
-              // this.showDefault = false
-              this.columnList = data.rows
-            } else {
-              // this.showDefault = true
-            }
-          })
-        },
-      },
-      created() {
-        this.getMultiLanguageList()//刷新按钮
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100001002,
+          serialNumber: '100001002TableShipTime',
+          tableId: "100001002Table",
+          tableName: "工厂信息表",
+          columnProp: "shipTime",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "发货时间",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 150,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        }
+      ],
+    }
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 140;
+    })
+  },
+  watch: {
+    '$route'(to, from) {
+      if (localStorage.getItem('factoryInformation') != undefined) {
         this.getData();
+      }
+    }
+  },
+  methods: {
+    getBaseData(val) {
 
-        //获取按钮的权限
-        this.getButtonAuthData();
+      this.$nextTick(() => {
+        if (this.tagNo === 1003) {
+          this.siteData.companyID = val.CompanyID
+        }
+      })
+
+    },
+    // 获取基础数据列表
+    getBaseList(val) {
+      this.tagNo = val
+      this.$nextTick(() => {
+        let strVal = "";
+        if (val === 1003 && this.siteData.companyID) {
+          strVal = this.siteData.companyID
+        }
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
+    getData() {
+      let data = {};
+      if (localStorage.getItem('factoryInformation') != undefined) {
+        data = JSON.parse(localStorage.getItem('factoryInformation'));
+      }
+      localStorage.removeItem('factoryInformation');
+      getSiteData(data).then(({data}) => {
+        this.dataList = data.rows
+      })
+    },
+    addModal() {
+      this.siteData = {
+        add: '',
+        siteID: '',
+        siteName: '',
+        siteNameE: '',
+        companyID: '',
+        postCode: '',
+        address: '',
+        addressE: '',
+        website: '',
+        contactName: '',
+        phoneNo: '',
+        faxNo: '',
+        email: '',
+        active: 'Y',
+        shipTime: '',
+        referenceCustomerID: '',
 
+      },
+        this.siteData.add = 0;
+      this.siteInputFlag = false;
+      this.siteData.active = 'Y';
+      this.siteFlag = true;
+    },
+    editSite(row) {
+      this.siteData = JSON.parse(JSON.stringify(row));
+      this.siteData.add = 1;
+      this.siteInputFlag = true;
+      this.siteFlag = true;
+    },
+    siteSave() {
+      siteSave(this.siteData).then(({data}) => {
+        if (this.siteData.companyID == '' || this.siteData.companyID == null) {
+          this.$alert("请选择会计单位！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.siteData.siteID == '' || this.siteData.siteID == null) {
+          this.$alert("请输入工厂编码！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.siteData.siteName == '' || this.siteData.siteName == null) {
+          this.$alert("请输入工厂名称！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
 
-        this.getTableUserColumn()
+        if (data && data.code == 200) {
+          this.siteFlag = false
+          this.getData();
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
+    saveAccessSite() {
+      let accessSiteList = []
+      for (let i = 0; i < this.accessSiteList.length; i++) {
+        let inData = {
+          site: this.rowSite,
+          userid: this.accessSiteList[i]
+        }
+        accessSiteList.push(inData)
+      }
+      let saveData = {
+        site: this.rowSite,
+        accessSiteList: accessSiteList,
+      }
+      saveAccessSiteForSite(saveData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.$message.success('操作成功')
+          this.accessSiteVisible = false
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+    //导出excel
+    createExportData() {
+
+      return this.dataList;
+
+    },
+    startDownload() {
+      //  this.exportData = this.dataList
+
+    },
+    finishDownload() {
+
+    },
+    fields() {
+      let json = "{"
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
+
+      return s
+    },
+    // 导出 end
+    getCompanyInformation(row) {
+      let inData = {companyID: row.companyID, companyName: row.companyName};
+      localStorage.setItem('companyInformation', JSON.stringify(inData))
+      this.$router.replace('base-companyInformation')
+    },
+
+    //获取按钮的权限数据
+    getButtonAuthData() {
+      let updateFlag = this.isAuth(this.menuId + ":revise");
+      let fullControFlag = this.isAuth(this.menuId + ":fullContro");
+      let deleteFlag = this.isAuth(this.menuId + ":remove");
+      //处理页面的权限数据
+      this.authEdit = !updateFlag || !fullControFlag;
+      this.authAdd = !fullControFlag;
+      this.authDelete = !deleteFlag;
+
+      //跳转页面
+      let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]').filter(item => item.path == 'base-companyInformation')
+      if (menList.length > 0) {
+        this.jumpFlag = false
+      }
+    },
+
+    accessSiteModel(row) {
+      searchAccessSiteListBySite({
+        site: row.siteID,
+      }).then(({data}) => {
+        this.accessSiteList = data.accessSiteList
+        this.userList = data.userList
+      })
+      this.rowSite = row.siteID
+      this.accessSiteVisible = true;
+    },
+
+    //多语言
+    getMultiLanguageList() {
+      //首先查询当前按钮的多语言
+      searchFunctionButtonList(this.queryButton).then(({data}) => {
+        if (data.code == 0) {
+          this.buttons = data.data
+        } else {
+          // saveButtonList(this.buttonList).then(({data}) => {
+          // })
+        }
+      });
+      //其次查询当前标签的多语言
+      searchFunctionButtonList(this.queryLabel).then(({data}) => {
+        if (data.code == 0) {
+          this.labels = data.data
+        } else {
+          // saveButtonList(this.buttonList).then(({data}) => {
+          // })
+        }
+      });
+    },
+    // 打开页面设置
+    userSetting() {
+      this.visible = true;
+      let queryTable = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: this.queryTable.tableId,
+        languageCode: this.$i18n.locale
       }
+      this.$nextTick(() => {
+        this.$refs.column.init(queryTable);
+      });
+    },
+    // 获取 用户保存的 格式列
+    getTableUserColumn(tableId) {
+      console.log(tableId)
+      getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+        if (data.rows.length > 0) {
+          //this.columnList = []
+          this.columnList = data.rows
+        } else {
+          this.getColumnList()
+        }
+      })
+    },
+    // 获取 tableDefault 列
+    getColumnList() {
+      getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+        if (!data.rows.length == 0) {
+          // this.showDefault = false
+          this.columnList = data.rows
+        } else {
+          // this.showDefault = true
+        }
+      })
+    },
+    getSiteDataDemo(params){
+      this.$message.success("这里是Site")
     }
+  },
+  created() {
+    this.getMultiLanguageList()//刷新按钮
+    this.getData();
+    //获取按钮的权限
+    this.getButtonAuthData();
+    this.getTableUserColumn()
+  },
+  activated() {
+    this.$store.commit("sift/commitSearchFunction",this.getSiteDataDemo)
+  }
+}
 </script>
 
-<style >
+<style>
 
 
-  .el-textarea__inner {
-    padding: 5px 5px;
-  }
+.el-textarea__inner {
+  padding: 5px 5px;
+}
 
 </style>