diff --git a/src/api/base/site.js b/src/api/base/site.js
index d14c98e..0ee94e6 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -1,13 +1,19 @@
 import { createAPI } from "@/utils/httpRequest.js";
 //------------工厂信息部分----------------
 // 获取工厂信息数据
-export const getSiteData = data => createAPI(`/base/getSiteData`,'post',data)
+export const getSiteData = data => createAPI(`/site/getSiteData`,'post',data)
+
+// 分页查询工厂信息列表
+export const getSiteList = data => createAPI(`/site/getSiteList`, 'POST', data)
 
 // 获取会计单位数据
-export const getCompanyData = data => createAPI(`/base/getCompanyData`,'post',data)
+export const getCompanyData = data => createAPI(`/site/getCompanyData`,'post',data)
 
 // 保存修改工厂信息数据
-export const siteSave = data => createAPI(`/base/siteSave`,'post',data)
+export const siteSave = data => createAPI(`/site/siteSave`,'post',data)
+
+// 删除工厂信息
+export const deleteSite = data => createAPI(`/site/deleteSite`, 'POST', data)
 
 //------------物料分类部分----------------
 // 获取工厂信息数据
diff --git a/src/api/factory/accessSite.js b/src/api/factory/accessSite.js
index b752edc..89359c5 100644
--- a/src/api/factory/accessSite.js
+++ b/src/api/factory/accessSite.js
@@ -5,3 +5,8 @@ export const getUserAccessSiteList = data => createAPI(`/accessSite/list`,'post'
 // 保存用户工厂信息
 export const saveUserAccessSiteList = data => createAPI(`/accessSite/saveUserAccessSiteList`,'post',data)
 
+/**
+ * 根据用户名获取用户授权的工厂列表
+ * @param {Object} data - 包含用户名的参数对象
+ */
+export const getUserAuthorizedSites = data => createAPI(`accessSite/getUserAuthorizedSites`, 'post', data)
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index 92f75c7..b868a3f 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -7,11 +7,21 @@
 
           <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" status-icon>
             <el-form-item prop="userName">
-              <el-input v-model="dataForm.userName" placeholder="帐号"></el-input>
+              <el-input v-model="dataForm.userName" placeholder="帐号" @blur="handleUsernameBlur"></el-input>
             </el-form-item>
             <el-form-item prop="password">
               <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
             </el-form-item>
+            <el-form-item >
+              <el-select v-model="selectedSite" placeholder="请选择工厂" style="width: 100%;">
+                <el-option
+                  v-for="item in siteList"
+                  :key="item.siteCode"
+                  :label="item.siteName"
+                  :value="item.siteCode">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
             </el-form-item>
@@ -25,6 +35,7 @@
 <script>
   import { getUUID } from '@/utils'
   import {getConfigParams} from '@/api/sysConfig.js'
+  import {getUserAuthorizedSites} from '@/api/factory/accessSite.js'
   export default {
     data () {
       return {
@@ -35,6 +46,8 @@
           uuid: '',
           captcha: ''
         },
+        siteList: [],
+        selectedSite: '',
         dataRule: {
           userName: [
             { required: true, message: '帐号不能为空', trigger: 'blur' }
@@ -71,9 +84,55 @@
       // 获取上次登陆的用户名
       userName(){
         this.dataForm.userName = localStorage.getItem('userName')
+        this.handleUsernameBlur()
+        this.dataForm.selectedSite = localStorage.getItem('site')
+      },
+      // 用户名失焦时获取工厂列表
+      handleUsernameBlur() {
+        if (this.dataForm.userName && this.dataForm.userName.trim()) {
+          this.getUserSiteList(this.dataForm.userName);
+        } else {
+          this.siteList = [];
+          this.selectedSite = '';
+        }
+      },
+      // 根据用户名获取授权的工厂列表
+      getUserSiteList(userName) {
+        if (!userName || !userName.trim()) {
+          this.siteList = [];
+          this.selectedSite = '';
+          return;
+        }
+
+        getUserAuthorizedSites({ userName: userName.trim() }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.siteList = data.data || data.list || [];
+            // 清空之前选择的工厂
+            this.selectedSite = '';
+            // 如果只有一个工厂，自动选中
+            if (this.siteList.length === 1) {
+              this.selectedSite = this.siteList[0].siteCode;
+            }
+          } else {
+            this.siteList = [];
+            this.selectedSite = '';
+            this.$message.error(data.msg || '获取工厂列表失败');
+          }
+        }).catch(error => {
+          this.siteList = [];
+          this.selectedSite = '';
+          console.error('获取工厂列表失败:', error);
+          this.$message.error('获取工厂列表失败');
+        })
       },
       // 提交表单
       dataFormSubmit () {
+        // 如果有工厂列表但未选择工厂，提示用户
+        if (this.siteList.length > 0 && !this.selectedSite) {
+          this.$message.error('请选择工厂');
+          return;
+        }
+
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
@@ -82,7 +141,8 @@
               data: this.$http.adornData({
                 'username': this.dataForm.userName,
                 'password': this.dataForm.password,
-                'uuid': this.dataForm.uuid
+                'uuid': this.dataForm.uuid,
+                'site': this.selectedSite
               })
             }).then(({data}) => {
               if (data && data.code === 0) {
@@ -93,6 +153,7 @@
                 this.$i18n.locale = data.language; // 修改当前语言
                 localStorage.setItem('refresh', "0")
                 localStorage.setItem('userName', this.dataForm.userName)
+                localStorage.setItem('site', this.selectedSite) // 保存选择的工厂
                 this.getConfigParams()
               } else {
                 this.$message.error(data.msg)
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 4b9b350..31dfead 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -21,6 +21,24 @@
       <el-menu
         class="site-navbar__menu site-navbar__menu--right"
         mode="horizontal">
+        <el-menu-item class="site-navbar__factory" index="0.5" v-if="siteList.length > 0">
+          <div class="factory-selector">
+            <i class="el-icon-office-building factory-icon"></i>
+            <el-select
+              v-model="selectedSite"
+              @change="handleSiteChange"
+              placeholder="选择工厂"
+              class="factory-select"
+              size="small">
+              <el-option
+                v-for="item in siteList"
+                :key="item.siteCode"
+                :label="item.siteName"
+                :value="item.siteCode">
+              </el-option>
+            </el-select>
+          </div>
+        </el-menu-item>
         <el-menu-item class="site-navbar__avatar" index="1">
          <span class="el-dropdown-link" @click="userSetting">
             <icon-svg name="editTable"  style="width: 25px;height: 25px;margin-top: 5px"></icon-svg>
@@ -98,6 +116,7 @@ import {
   saveButtonList,
   searchSysLanguage,
 } from "@/api/sysLanguage.js"
+import {getUserAuthorizedSites} from '@/api/factory/accessSite.js'
 
 export default {
   inject: ['refresh'],
@@ -110,6 +129,8 @@ export default {
       printListVisible: false,
       message: this.$t('language.name'),
       languageList: [],
+      siteList: [],
+      selectedSite: '',
       pageLanguage: {
         XjSysManage: '旭捷管理系统',
         abbreviation: '旭捷',
@@ -356,11 +377,77 @@ export default {
         })
       }).catch(() => {
       })
+    },
+    // 初始化工厂选择
+    initSiteSelection() {
+      // 从localStorage获取当前选择的工厂
+      this.selectedSite = localStorage.getItem('site') || '';
+
+      // 获取当前用户的工厂列表
+      const userName = localStorage.getItem('userName');
+      if (userName) {
+        this.getUserSiteList(userName);
+      }
+    },
+    // 获取用户授权的工厂列表
+    getUserSiteList(userName) {
+      if (!userName || !userName.trim()) {
+        this.siteList = [];
+        return;
+      }
+
+      getUserAuthorizedSites({ userName: userName.trim() }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.siteList = data.data || data.list || [];
+
+          // 如果当前选择的工厂不在列表中，清空选择
+          if (this.selectedSite && !this.siteList.find(site => site.siteCode === this.selectedSite)) {
+            this.selectedSite = '';
+            localStorage.removeItem('site');
+          }
+
+          // 如果没有选择工厂但有工厂列表，选择第一个
+          if (!this.selectedSite && this.siteList.length > 0) {
+            this.selectedSite = this.siteList[0].siteCode;
+            localStorage.setItem('site', this.selectedSite);
+          }
+        } else {
+          this.siteList = [];
+          console.error('获取工厂列表失败:', data.msg);
+        }
+      }).catch(error => {
+        this.siteList = [];
+        console.error('获取工厂列表失败:', error);
+      })
+    },
+    // 工厂选择变更处理
+    handleSiteChange(siteCode) {
+      const selectedSite = this.siteList.find(site => site.siteCode === siteCode);
+      const siteName = selectedSite ? selectedSite.siteName : siteCode;
+
+      localStorage.setItem('site', siteCode);
+
+      this.$message({
+        message: `已切换到工厂：${siteName}`,
+        type: 'success',
+        duration: 2000,
+        showClose: true
+      });
+
+      // 添加切换动画效果
+      const factorySelect = document.querySelector('.factory-select');
+      if (factorySelect) {
+        factorySelect.style.transform = 'scale(1.05)';
+        setTimeout(() => {
+          factorySelect.style.transform = 'scale(1)';
+        }, 200);
+      }
     }
   },
   created() {
     this.getLanguageList()
     this.getFunctionButtonList()
+    this.initSiteSelection()
   }
 }
 </script>
@@ -380,6 +467,93 @@ export default {
   margin-left: -45px;
 }
 
+// 工厂选择器样式
+.site-navbar__factory {
+  padding: 0 15px !important;
+
+  .factory-selector {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .factory-icon {
+      color: #409EFF;
+      font-size: 16px;
+      margin-right: 4px;
+    }
+
+    .factory-select {
+      width: 140px;
+      transition: transform 0.2s ease;
+
+      .el-input__inner {
+        background: rgba(64, 158, 255, 0.1);
+        border: 1px solid rgba(64, 158, 255, 0.3);
+        border-radius: 20px;
+        color: #409EFF;
+        font-size: 13px;
+        height: 32px;
+        line-height: 32px;
+        transition: all 0.3s ease;
+
+        &:hover {
+          background: rgba(64, 158, 255, 0.15);
+          border-color: #409EFF;
+          box-shadow: 0 2px 8px rgba(64, 158, 255, 0.2);
+        }
+
+        &:focus {
+          background: rgba(64, 158, 255, 0.1);
+          border-color: #409EFF;
+          box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
+        }
+      }
+
+      .el-input__suffix {
+        .el-input__suffix-inner {
+          .el-select__caret {
+            color: #409EFF;
+            transition: transform 0.3s ease;
+          }
+        }
+      }
+
+      &.is-focus {
+        .el-input__suffix-inner .el-select__caret {
+          transform: rotateZ(180deg);
+        }
+      }
+    }
+  }
+
+  &:hover {
+    background-color: rgba(64, 158, 255, 0.05) !important;
+  }
+}
+
+// 工厂选择下拉选项样式
+.el-select-dropdown {
+  .el-select-dropdown__item {
+    &:hover {
+      background-color: rgba(64, 158, 255, 0.1);
+      color: #409EFF;
+    }
+
+    &.selected {
+      background-color: #409EFF;
+      color: #fff;
+      font-weight: 500;
+
+      &::after {
+        content: '✓';
+        position: absolute;
+        right: 15px;
+        font-weight: bold;
+      }
+    }
+  }
+}
+
 .el-menu--horizontal > .el-menu-item {
   color: #3b4249;
 }
diff --git a/src/views/modules/base/factoryInformation.vue b/src/views/modules/base/factoryInformation.vue
index 80d7bf2..3929216 100644
--- a/src/views/modules/base/factoryInformation.vue
+++ b/src/views/modules/base/factoryInformation.vue
@@ -1,916 +1,327 @@
 <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>
-      <download-excel
-        :fields="fields()"
-        :data="exportData"
-        type="xls"
-        :name="exportName"
-        :header="exportHeader"
-        :footer="exportFooter"
-        :fetch="createExportData"
-        :before-generate="startDownload"
-        :before-finish="finishDownload"
-        worksheet="导出信息"
-        class="el-button el-button--primary el-button--medium">
-        {{ buttons.download }}
-      </download-excel>
-
-      <el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
+    <el-form :inline="true" label-position="top">
+      <el-form-item label="工厂编码">
+        <el-input style="width: 120px;" v-model="queryHeaderData.siteId" placeholder="请输入工厂编码"></el-input>
+      </el-form-item>
+      <el-form-item label="工厂名称">
+        <el-input style="width: 120px;" v-model="queryHeaderData.siteName" placeholder="请输入工厂名称"></el-input>
+      </el-form-item>
+      <el-form-item label="会计单位">
+        <el-input style="width: 120px;" v-model="queryHeaderData.companyId" placeholder="请输入会计单位"></el-input>
+      </el-form-item>
+      <el-form-item label="在用状态">
+        <el-select v-model="queryHeaderData.active" placeholder="请选择" style="width: 120px;">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="是" value="Y"></el-option>
+          <el-option label="否" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item style="margin-top: 20px;">
+        <el-button @click="getDataList()" type="primary">查询</el-button>
+        <el-button @click="resetQuery()" type="default">重置</el-button>
+        <el-button @click="addModal()" type="primary" :disabled="authAdd">新增</el-button>
+      </el-form-item>
     </el-form>
+
     <el-table
       :height="height"
       :data="dataList"
       border
       v-loading="dataListLoading"
-      style="width: 100%;">
-      <el-table-column
-        header-align="center"
-        align="center"
-        width="160"
-        label="操作">
+      style="width: 100%; margin-bottom: 15px;">
+      
+      <el-table-column prop="siteId" label="工厂编码" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="siteName" label="工厂名称（中文）" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="siteNameE" label="工厂名称（英文）" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="companyId" label="会计单位" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="address" label="地址" min-width="200" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="contactName" label="联系人" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="phoneNo" label="电话" min-width="120" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="email" label="邮箱" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="active" label="在用" min-width="80" align="center">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="!authEdit"  @click="editSite(scope.row)">{{buttons.update}}</a>
-          <a type="text" size="small" v-if="jumpFlag" @click="getCompanyInformation(scope.row)">{{buttons.companyInformation}}</a>
+          <span v-if="scope.row.active === 'Y'" style="color: #67C23A;">是</span>
+          <span v-else-if="scope.row.active === 'N'" style="color: #F56C6C;">否</span>
+          <span v-else>{{ scope.row.active }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        v-for="(item,index) in columnList" :key="index"
-        :sortable="item.columnSortable"
-        :prop="item.columnProp"
-        :header-align="item.headerAlign"
-        :show-overflow-tooltip="item.showOverflowTooltip"
-        :align="item.align"
-        :fixed="item.fixed==''?false:item.fixed"
-        :width="item.columnWidth"
-        :label="item.columnLabel">
+      
+      <el-table-column label="操作" min-width="120" fixed="right">
         <template slot-scope="scope">
-          <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>
+          <el-button
+            v-if="!authEdit"
+            @click="editSite(scope.row)"
+            type="text"
+            size="small">
+            编辑
+          </el-button>
+          <el-button
+            v-if="!authDelete"
+            @click="deleteSite(scope.row)"
+            type="text"
+            size="small"
+            style="color: #F56C6C;">
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <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-form-item>
-        <el-form-item :label=labels.siteName_en>
-          <el-input v-model="siteData.siteNameE"  style="width: 130px"></el-input>
+
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <el-dialog :title="siteData.add === 0 ? '新增工厂信息' : '编辑工厂信息'" :close-on-click-modal="false" :visible.sync="siteFlag" width="500px">
+      <el-form :model="siteData" :rules="siteRules" ref="siteForm" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="工厂编码" prop="siteId">
+          <el-input v-model="siteData.siteId" :disabled="siteInputFlag" style="width: 130px" placeholder="请输入工厂编码"></el-input>
         </el-form-item>
-        <el-form-item :label=labels.postCode>
-          <el-input v-model="siteData.postCode"  style="width: 130px"></el-input>
+        <el-form-item label="工厂名称（中文）" prop="siteName">
+          <el-input v-model="siteData.siteName" style="width: 130px" placeholder="请输入工厂名称"></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 label="工厂名称（英文）">
+          <el-input v-model="siteData.siteNameE" style="width: 130px" placeholder="请输入英文名称"></el-input>
         </el-form-item>
-        <el-form-item :label=labels.referenceCustomerID>
-          <el-input v-model="siteData.referenceCustomerID"  style="width: 130px"></el-input>
+        <el-form-item label="会计单位" prop="companyId">
+          <el-input v-model="siteData.companyId" style="width: 130px" placeholder="请输入会计单位"></el-input>
         </el-form-item>
-        <el-form-item :label=labels.active>
-          <el-select filterable v-model="siteData.active" style="width: 130px">
+        <el-form-item label="在用状态">
+          <el-select v-model="siteData.active" style="width: 130px">
             <el-option label="是" value="Y"></el-option>
             <el-option label="否" value="N"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label=labels.shipTime>
-          <el-time-picker
-            format="HH:mm:ss"
-            style="width: 130px"
-            v-model="siteData.shipTime"
-            placeholder="请选择"
-            value-format="HH:mm:ss">
-          </el-time-picker>
-        </el-form-item>
-      </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-form-item label="联系人">
+          <el-input v-model="siteData.contactName" style="width: 130px" placeholder="请输入联系人"></el-input>
         </el-form-item>
-        <el-form-item :label=labels.phoneNo>
-          <el-input v-model="siteData.phoneNo"  style="width: 130px"></el-input>
+        <el-form-item label="电话">
+          <el-input v-model="siteData.phoneNo" style="width: 130px" placeholder="请输入电话"></el-input>
         </el-form-item>
-        <el-form-item :label=labels.email>
-          <el-input v-model="siteData.email"  style="width: 130px"></el-input>
+        <el-form-item label="邮箱">
+          <el-input v-model="siteData.email" style="width: 130px" placeholder="请输入邮箱"></el-input>
         </el-form-item>
-        <el-form-item :label=labels.faxNo>
-          <el-input v-model="siteData.faxNo"  style="width: 130px"></el-input>
+        <el-form-item label="地址（中文）">
+          <el-input v-model="siteData.address" type="textarea" :autosize="{ minRows: 1, maxRows: 6}" style="width: 450px" placeholder="请输入地址"></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-form-item label="地址（英文）">
+          <el-input v-model="siteData.addressE" type="textarea" :autosize="{ minRows: 1, maxRows: 6}" style="width: 450px" placeholder="请输入英文地址"></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-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-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()">保存</el-button>
+        <el-button type="primary" @click="siteFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
-    <!-- 动态列    -->
-    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
-
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
 <script>
-
-  import column from "@/views/modules/common/column";
     import {
-      getSiteData,
-      getCompanyData,
-      siteSave
+      getSiteList,
+      siteSave,
+      deleteSite
     } from "@/api/base/site.js"
-    import {
-
-      searchFunctionButtonList,
-
-    } from "@/api/sysLanguage.js"
-    import {
-      saveTableDefaultList,
-      saveTableUser,
-      getTableDefaultListLanguage,
-      getTableUserListLanguage,
-      removerDefault,
-      removerUser
-    } from "@/api/table.js"
-    import Chooselist from '@/views/modules/common/Chooselist'
-
-    var functionId='100001002';
 
     export default {
       name: "factoryInformation",
-      components: {
-        column,Chooselist
-      },
       data() {
         return {
-          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:'关闭',
-            settingTable:'动态列',
-          },
-          queryButton: {
-            functionId: functionId,
-            table_id: '*',
-            languageCode: this.$i18n.locale,
-            objectType: 'button'
+          pageIndex: 1,
+          pageSize: 50,
+          totalPage: 0,
+          queryHeaderData: {
+            siteId: '',
+            siteName: '',
+            companyId: '',
+            active: ''
           },
-          queryLabel: {
-            functionId: functionId,
-            table_id: '*',
-            languageCode: this.$i18n.locale,
-            objectType: 'label'
-          },
-
-          visible:false,
-          // 多语言 end
-          height: 200,
-          siteFlag:false,
-          siteInputFlag:true,
+          height: 500,
+          siteFlag: false,
+          siteInputFlag: true,
           siteData: {
-            add:'',
-            siteID:'',
-            siteName:'',
-            siteNameE:'',
-            companyID:'',
-            postCode:'',
-            address:'',
-            addressE:'',
-            website:'',
-            contactName:'',
-            phoneNo:'',
-            faxNo:'',
-            email:'',
-            active:'Y',
-            shipTime:'',
-            referenceCustomerID:'',
+            add: '',
+            siteId: '',
+            siteName: '',
+            siteNameE: '',
+            companyId: '',
+            address: '',
+            addressE: '',
+            contactName: '',
+            phoneNo: '',
+            email: '',
+            active: 'Y'
           },
-          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
-            }
-          ],
+          siteRules: {
+            siteId: [
+              { required: true, message: '请输入工厂编码', trigger: 'blur' }
+            ],
+            siteName: [
+              { required: true, message: '请输入工厂名称', trigger: 'blur' }
+            ],
+            companyId: [
+              { required: true, message: '请输入会计单位', trigger: 'blur' }
+            ]
+          },
+          dataList: []
         }
       },
-
-      mounted() {
-        this.$nextTick(() => {
-          this.height = window.innerHeight - 140;
-        })
+      activated() {
+        this.getDataList()
+        this.getHeight()
       },
-      watch: {
-        '$route' (to, from) {
-          if(localStorage.getItem('factoryInformation')!=undefined){
-            this.getData();
-          }
-        }
+      mounted() {
+        this.getDataList()
+        this.getHeight()
       },
       methods: {
-        getBaseData(val){
-
-            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'));
+        // 获取数据列表
+        getDataList() {
+          this.dataListLoading = true
+          const params = {
+            page: this.pageIndex,
+            size: this.pageSize,
+            site: localStorage.getItem('site'),
+            ...this.queryHeaderData
           }
-          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;
-            }
-
-            if (data && data.code == 200) {
-              this.siteFlag = false
-              this.getData();
-             this.$message.success('操作成功')
+          getSiteList(params).then(({ data }) => {
+            if (data && data.code === 200) {
+              this.dataList = data.page.list || []
+              this.totalPage = data.page.totalCount || 0
             } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
+              this.dataList = []
+              this.totalPage = 0
+              this.$message.error(data.msg || '查询失败')
             }
+            this.dataListLoading = false
+          }).catch(() => {
+            this.dataList = []
+            this.totalPage = 0
+            this.dataListLoading = false
           })
         },
-        //导出excel
-        createExportData() {
-
-            return this.dataList;
-
-        },
-        startDownload() {
-          //  this.exportData = this.dataList
 
+        // 重置查询条件
+        resetQuery() {
+          this.queryHeaderData = {
+            siteId: '',
+            siteName: '',
+            companyId: '',
+            active: ''
+          }
+          this.pageIndex = 1
+          this.getDataList()
         },
-        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 + "\"" + ","
-            }
+        // 获取高度
+        getHeight() {
+          this.$nextTick(() => {
+            this.height = window.innerHeight - 200
           })
-          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
+        // 新增对话框
+        addModal() {
+          this.siteData = {
+            add: 0,
+            siteId: '',
+            siteName: '',
+            siteNameE: '',
+            companyId: '',
+            address: '',
+            addressE: '',
+            contactName: '',
+            phoneNo: '',
+            email: '',
+            active: 'Y'
           }
+          this.siteInputFlag = false
+          this.siteFlag = true
+          this.$nextTick(() => {
+            this.$refs.siteForm.clearValidate()
+          })
         },
 
-        //多语言
-        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
-          }
+        // 编辑对话框
+        editSite(row) {
+          this.siteData = JSON.parse(JSON.stringify(row))
+          this.siteData.add = 1
+          this.siteInputFlag = true
+          this.siteFlag = true
           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()
-            }
+            this.$refs.siteForm.clearValidate()
           })
         },
-        // 获取 tableDefault 列
-        getColumnList() {
-          getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-            if (!data.rows.length == 0) {
-              // this.showDefault = false
-              this.columnList = data.rows
-            } else {
-              // this.showDefault = true
+
+        // 保存
+        siteSave() {
+          this.$refs.siteForm.validate((valid) => {
+            if (valid) {
+              siteSave(this.siteData).then(({ data }) => {
+                if (data && data.code === 200) {
+                  this.siteFlag = false
+                  this.getDataList()
+                  this.$message.success('操作成功')
+                } else {
+                  this.$message.error(data.msg || '操作失败')
+                }
+              }).catch(() => {
+                this.$message.error('操作失败')
+              })
             }
           })
         },
-      },
-      created() {
-        this.getMultiLanguageList()//刷新按钮
-        this.getData();
 
-        //获取按钮的权限
-        this.getButtonAuthData();
+        // 删除
+        deleteSite(row) {
+          this.$confirm('确定要删除该工厂信息吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteSite({ siteId: row.siteId }).then(({ data }) => {
+              if (data && data.code === 200) {
+                this.$message.success('删除成功')
+                this.getDataList()
+              } else {
+                this.$message.error(data.msg || '删除失败')
+              }
+            }).catch(() => {
+              this.$message.error('删除失败')
+            })
+          })
+        },
 
+        // 每页数
+        sizeChangeHandle(val) {
+          this.pageSize = val
+          this.pageIndex = 1
+          this.getDataList()
+        },
 
-        this.getTableUserColumn()
+        // 当前页
+        currentChangeHandle(val) {
+          this.pageIndex = val
+          this.getDataList()
+        }
       }
     }
 </script>
 
-<style >
+<style>
   .el-textarea__inner {
     padding: 5px 5px;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/modules/factory/tblbasedata.vue b/src/views/modules/factory/tblbasedata.vue
index eda165e..22fd636 100644
--- a/src/views/modules/factory/tblbasedata.vue
+++ b/src/views/modules/factory/tblbasedata.vue
@@ -1,30 +1,26 @@
 <template>
   <div class="mod-config">
-    <div>
-        <span @click="favoriteFunction()">
-         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
-        </span>
-    </div>
-    <el-button @click="searchList()" type="primary">{{ buttons.search }}</el-button>
-    <el-button @click="addOrUpdateHandle(0)" type="primary">{{ buttons.add }}</el-button>
-    <download-excel
-      :fields="fields()"
-      :data="exportData"
-      type="xls"
-      :name="exportName"
-      :header="exportHeader"
-      :footer="exportFooter"
-      :fetch="createExportData"
-      :before-generate="startDownload"
-      :before-finish="finishDownload"
-      worksheet="导出信息"
-      class="el-button el-button--primary el-button--medium">
-      {{ buttons.download }}
-    </download-excel>
-    <el-form v-show="searchShow" :inline="true" :model="queryData" @keyup.enter.native="getDataList()">
-      <el-form-item label="工厂编辑">
-        <el-input filterable v-model="queryData.key" clearable>
-        </el-input>
+    <el-form :inline="true" label-position="top">
+      <el-form-item label="工厂编码">
+        <el-input style="width: 120px;" v-model="queryHeaderData.siteId" placeholder="请输入工厂编码"></el-input>
+      </el-form-item>
+      <el-form-item label="工厂名称">
+        <el-input style="width: 120px;" v-model="queryHeaderData.siteName" placeholder="请输入工厂名称"></el-input>
+      </el-form-item>
+      <el-form-item label="会计单位">
+        <el-input style="width: 120px;" v-model="queryHeaderData.companyId" placeholder="请输入会计单位"></el-input>
+      </el-form-item>
+      <el-form-item label="在用状态">
+        <el-select v-model="queryHeaderData.active" placeholder="请选择" style="width: 120px;">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="是" value="Y"></el-option>
+          <el-option label="否" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item style="margin-top: 20px;">
+        <el-button @click="getDataList()" type="primary">查询</el-button>
+        <el-button @click="resetQuery()" type="default">重置</el-button>
+        <el-button @click="addModal()" type="primary" :disabled="authAdd">新增</el-button>
       </el-form-item>
     </el-form>
 
@@ -33,522 +29,328 @@
       :data="dataList"
       border
       v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;">
-      <el-table-column
-        v-for="(item,index) in columnList" :key="index"
-        :sortable="item.columnSortable"
-        :prop="item.columnProp"
-        :header-align="item.headerAlign"
-        :show-overflow-tooltip="item.showOverflowTooltip"
-        :align="item.align"
-        :fixed="item.fixed==''?false:item.fixed"
-        min-width="20%"
-        :label="item.columnLabel">
+      style="width: 100%; margin-bottom: 15px;">
+
+      <el-table-column prop="siteId" label="工厂编码" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="siteName" label="工厂名称（中文）" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="siteNameE" label="工厂名称（英文）" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="companyId" label="会计单位" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="address" label="地址" min-width="200" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="contactName" label="联系人" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="phoneNo" label="电话" min-width="120" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="email" label="邮箱" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="active" label="在用" min-width="80" align="center">
         <template slot-scope="scope">
-          <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>
+          <span v-if="scope.row.active === 'Y'" style="color: #67C23A;">是</span>
+          <span v-else-if="scope.row.active === 'N'" style="color: #F56C6C;">否</span>
+          <span v-else>{{ scope.row.active }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
+      <el-table-column label="操作" min-width="120" fixed="right">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{buttons.edit || '修改' }}</a>
-          <a type="text" size="small" @click="deleteHandle(scope.row.id)">{{buttons.delete || '删除'}}</a>
+          <a
+            v-if="!authEdit"
+            @click="editSite(scope.row)"
+            type="text"
+            size="small">
+            编辑
+          </a>
+          <a
+            v-if="!authDelete"
+            @click="deleteSite(scope.row)"
+            type="text"
+            size="small"
+            style="color: #F56C6C;">
+            删除
+          </a>
         </template>
       </el-table-column>
     </el-table>
+
     <el-pagination
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
+      :page-sizes="[20, 50, 100]"
       :page-size="pageSize"
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <!-- 设置查询条件 -->
-    <search v-if="searchVisible" v-on:childByValue="childByValue" ref="search" @refreshDataList="getDataList"></search>
-    <!-- 设置列 -->
-    <column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <el-dialog :title="siteData.add === 0 ? '新增工厂信息' : '编辑工厂信息'" :close-on-click-modal="false" :visible.sync="siteFlag" width="500px">
+      <el-form :model="siteData" :rules="siteRules" ref="siteForm" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="工厂编码" prop="siteId">
+              <el-input v-model="siteData.siteId" :disabled="siteInputFlag" style="width: 100%" placeholder="请输入工厂编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工厂名称（中文）" prop="siteName">
+              <el-input v-model="siteData.siteName" style="width: 100%" placeholder="请输入工厂名称"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="工厂名称（英文）">
+              <el-input v-model="siteData.siteNameE" style="width: 100%" placeholder="请输入英文名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="会计单位" prop="companyId">
+              <el-input v-model="siteData.companyId" style="width: 100%" placeholder="请输入会计单位"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="在用状态">
+              <el-select v-model="siteData.active" style="width: 100%">
+                <el-option label="是" value="Y"></el-option>
+                <el-option label="否" value="N"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮政编码">
+              <el-input v-model="siteData.postCode" style="width: 100%" placeholder="请输入邮政编码"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="联系人">
+              <el-input v-model="siteData.contactName" style="width: 100%" placeholder="请输入联系人"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话">
+              <el-input v-model="siteData.phoneNo" style="width: 100%" placeholder="请输入电话"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="邮箱">
+          <el-input v-model="siteData.email" style="width: 100%" placeholder="请输入邮箱"></el-input>
+        </el-form-item>
+        <el-form-item label="地址（中文）">
+          <el-input v-model="siteData.address" type="textarea" :autosize="{ minRows: 1, maxRows: 6}" style="width: 100%" placeholder="请输入地址"></el-input>
+        </el-form-item>
+        <el-form-item label="地址（英文）">
+          <el-input v-model="siteData.addressE" type="textarea" :autosize="{ minRows: 1, maxRows: 6}" style="width: 100%" placeholder="请输入英文地址"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="siteSave()">保存</el-button>
+        <el-button type="primary" @click="siteFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import column from "../common/column";
-import search from "../common/search";
 import {
-  searchSysLanguageParam,
-  searchFunctionButtonList,
-  saveButtonList,
-} from "@/api/sysLanguage.js"
-import {
-  saveTableDefaultList,
-  getTableDefaultListLanguage,
-  getTableUserListLanguage
-} from "@/api/table.js"
-import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
-import AddOrUpdate from './tblbasedata-add-or-update'
+  getSiteList,
+  siteSave,
+  deleteSite
+} from "@/api/base/site.js"
 
 export default {
+  name: "factoryInformation",
   data() {
     return {
-      searchVisible: false,
-      searchShow: false,
-      queryData: {
-        key: ''
-      },
-      // table高度
-      height: 450,
-      // 是否收藏
-      favorite: false,
-      addLanguage: false,
-      functionId: this.$route.meta.menuId,
-      tableId: "9002Blbasedata",
-      languageCode: this.$i18n.locale,
-      visible: false,
-      showDefault: false,
-      // 语言词典集合
-      sysLanguageParams: [],
-      // 用户table 配置集合
-      userColumnList: [],
-      columnList: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataId',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "id",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: this.$t('factory.table.id'),
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 50
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataSite',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "site",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "site",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataType',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "sortNo",
-          headerAlign: "type",
-          align: "left",
-          columnLabel: "type",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataSecondType',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "secondType",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "secondType",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataBaseData',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "baseData",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工厂编号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataBaseDesc',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "baseDesc",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工厂描述",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataStatus',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "status",
-          headerAlign: "status",
-          align: "left",
-          columnLabel: "status",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataSortNo',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "sortNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "sortNo",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '9002tBlbasedataRemark',
-          tableId: "9002Blbasedata",
-          tableName: "工厂信息",
-          columnProp: "remark",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工厂备注",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-      ],
-      // 数据集
-      dataList: [],
-      buttons: {
-        add: '添加',
-        edit: '编辑',
-        delete: '删除',
-        deleteList: '批量删除',
-        cz: '操作',
-        search: '搜索',
-        download: '导出',
-        settingTable: '设置列表',
-        defaultTable: '设置默认配置',
-        site:'工厂编号',
-        siteDesc:'工厂描述',
-        siteRemark:'工厂备注',
-      },
-      // 导出 start
-      exportData: [],
-      exportName: "工厂列表" + this.dayjs().format('YYYYMMDDHHmmss'),
-      exportHeader: ["工厂列表"],
-      exportFooter: [],
-      // 导出 end
-      // 分页
+      authEdit: false,
+      authAdd: false,
+      authDelete: false,
+      menuId: this.$route.meta.menuId,
+      dataListLoading: false,
       pageIndex: 1,
-      pageSize: 20,
+      pageSize: 50,
       totalPage: 0,
-      dataListLoading: false,
-      dataListSelections: [],
-      addOrUpdateVisible: false,
+      queryHeaderData: {
+        siteId: '',
+        siteName: '',
+        companyId: '',
+        active: ''
+      },
+      height: 500,
+      siteFlag: false,
+      siteInputFlag: true,
+          siteData: {
+            add: '',
+            siteId: '',
+            siteName: '',
+            siteNameE: '',
+            companyId: '',
+            postCode: '',
+            address: '',
+            addressE: '',
+            contactName: '',
+            phoneNo: '',
+            email: '',
+            active: 'Y'
+          },
+      siteRules: {
+        siteId: [
+          { required: true, message: '请输入工厂编码', trigger: 'blur' }
+        ],
+        siteName: [
+          { required: true, message: '请输入工厂名称', trigger: 'blur' }
+        ],
+        companyId: [
+          { required: true, message: '请输入会计单位', trigger: 'blur' }
+        ]
+      },
+      dataList: []
     }
   },
-  components: {
-    AddOrUpdate,
-    column,
-    search
+  activated() {
+    this.getDataList()
+    this.getHeight()
   },
   mounted() {
-    this.$nextTick(() => {
-      this.height = window.innerHeight - 240;
-    })
-  },
-  activated() {
     this.getDataList()
+    this.getHeight()
   },
   methods: {
-    childByValue(childValue) {
-      // childValue就是子组件传过来的值
-      console.log(childValue)
-      let json = "{"
-      childValue.forEach((item, index) => {
-        if (index == childValue.length - 1) {
-          json += "\"" + item.queryAttributes + "\"" + ":" + "\"" + item.queryValue + "\""
-        } else {
-          json += "\"" + item.queryAttributes + "\"" + ":" + "\"" + item.queryValue + "\"" + ","
-        }
-      })
-      json += "}"
-      let s = eval("(" + json + ")")
-      console.log(json)
-    },
-    // 打开搜索页面
-    searchList() {
-      this.searchVisible = true;
-      let queryTable = {
-        userId: this.userId,
-        functionId: this.functionId,
-        tableId: this.tableId,
-        languageCode: this.languageCode
-      }
-      this.$nextTick(() => {
-        this.$refs.search.init(queryTable);
-      });
-    },
-    // 校验用户是否收藏
-    favoriteIsOk() {
-      let userFavorite = {
-        userId: this.$store.state.user.id,
-        languageCode: this.$i18n.locale
-      }
-      userFavoriteList(userFavorite).then(({data}) => {
-        let size = data.list.filter(item => item.menuId == this.$route.meta.menuId).length;
-        if (size > 0) {
-          this.favorite = true
-        } else {
-          this.favorite = false
-        }
-      })
-    },
-    // 收藏 OR 取消收藏
-    favoriteFunction() {
-      let userFavorite = {
-        userId: this.$store.state.user.id,
-        functionId: this.$route.meta.menuId,
-      }
-      if (this.favorite) {
-        // 取消收藏
-        this.$confirm(`确定取消收藏`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          removeUserFavorite(userFavorite).then(({data}) => {
-            this.$message.success(data.msg)
-            this.favorite = false
-          })
-        })
-      } else {
-        // 收藏
-        saveUserFavorite(userFavorite).then(({data}) => {
-          this.$message.success(data.msg)
-          this.favorite = true
-        })
-      }
-
-    },
-    // 获取button的词典
-    getFunctionButtonList() {
-      let queryButton = {
-        functionId: this.functionId,
-        tableId: '*',
-        languageCode: this.languageCode,
-        objectType: 'button'
-      }
-      searchFunctionButtonList(queryButton).then(({data}) => {
-        if (data.code == 0 && data.data) {
-          this.buttons = data.data
-        }
-      })
-    },
-    // 获取 用户保存的 格式列
-    getTableUserColumn() {
-      let queryTableUser = {
-        userId: this.userId,
-        functionId: this.functionId,
-        tableId: this.tableId,
-        languageCode: this.languageCode,
-        status: true,
-      }
-      getTableUserListLanguage(queryTableUser).then(({data}) => {
-        if (data.code == 0 && data.data) {
-          //this.columnList = []
-          this.columnList = data.rows
-        } else {
-          this.getColumnList()
-        }
-
-      })
-    },
-    // 获取 tableDefault 列
-    getColumnList() {
-      let queryTable = {
-        functionId: this.functionId,
-        tableId: this.tableId,
-        languageCode: this.languageCode
-      }
-      getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (data.code == 0 && data.data ) {
-          // this.showDefault = false
-          this.columnList = data.rows
-        } else {
-          // this.showDefault = true
-        }
-      })
-    },
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true
-      this.$http({
-        url: this.$http.adornUrl('/factory/tblbasedata/list'),
-        method: 'get',
-        params: this.$http.adornParams({
-          'page': this.pageIndex,
-          'limit': this.pageSize,
-          'key': this.queryData.key
-        })
-      }).then(({data}) => {
+      const params = {
+        page: this.pageIndex,
+        size: this.pageSize,
+        site: localStorage.getItem('site'),
+        ...this.queryHeaderData
+      }
+
+      getSiteList(params).then(({data}) => {
         if (data && data.code === 0) {
-          this.dataList = data.list
-          this.totalPage = data.totalCount
+          this.dataList = data.page.list || []
+          this.totalPage = data.page.totalCount || 0
         } else {
           this.dataList = []
           this.totalPage = 0
+          this.$message.error(data.msg || '查询失败')
         }
         this.dataListLoading = false
+      }).catch(() => {
+        this.dataList = []
+        this.totalPage = 0
+        this.dataListLoading = false
       })
     },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.pageSize = val
+
+    // 重置查询条件
+    resetQuery() {
+      this.queryHeaderData = {
+        siteId: '',
+        siteName: '',
+        companyId: '',
+        active: ''
+      }
       this.pageIndex = 1
       this.getDataList()
     },
-    // 当前页
-    currentChangeHandle(val) {
-      this.pageIndex = val
-      this.getDataList()
+
+    // 获取高度
+    getHeight() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 200
+      })
     },
-    // 多选
-    selectionChangeHandle(val) {
-      this.dataListSelections = val
+
+        // 新增对话框
+        addModal() {
+          this.siteData = {
+            add: 0,
+            siteId: '',
+            siteName: '',
+            siteNameE: '',
+            companyId: '',
+            postCode: '',
+            address: '',
+            addressE: '',
+            contactName: '',
+            phoneNo: '',
+            email: '',
+            active: 'Y'
+          }
+      this.siteInputFlag = false
+      this.siteFlag = true
+      this.$nextTick(() => {
+        this.$refs.siteForm.clearValidate()
+      })
     },
-    // 新增 / 修改
-    addOrUpdateHandle(id) {
-      this.addOrUpdateVisible = true
+
+    // 编辑对话框
+    editSite(row) {
+      this.siteData = JSON.parse(JSON.stringify(row))
+      this.siteData.add = 1
+      this.siteInputFlag = true
+      this.siteFlag = true
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id)
+        this.$refs.siteForm.clearValidate()
       })
     },
-    // 删除
-    deleteHandle(id) {
-      var ids = id ? [id] : this.dataListSelections.map(item => {
-        return item.id
+
+    // 保存
+    siteSave() {
+      this.$refs.siteForm.validate((valid) => {
+        if (valid) {
+          siteSave(this.siteData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.siteFlag = false
+              this.getDataList()
+              this.$message.success('操作成功')
+            } else {
+              this.$message.error(data.msg || '操作失败')
+            }
+          }).catch(() => {
+            this.$message.error('操作失败')
+          })
+        }
       })
-      this.$confirm(`确定删除选择中的数据`, '提示', {
+    },
+
+    // 删除
+    deleteSite(row) {
+      this.$confirm('确定要删除该工厂信息吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$http({
-          url: this.$http.adornUrl('/factory/tblbasedata/delete'),
-          method: 'post',
-          data: this.$http.adornData(ids, false)
-        }).then(({data}) => {
+        deleteSite({siteId: row.siteId}).then(({data}) => {
           if (data && data.code === 0) {
-            this.$message.success('操作成功')
+            this.$message.success('删除成功')
             this.getDataList()
           } else {
-            this.$message.error(data.msg)
+            this.$message.error(data.msg || '删除失败')
           }
+        }).catch(() => {
+          this.$message.error('删除失败')
         })
       })
     },
-    // 导出
-    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
-    },
-    createExportData() {
-      // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-      // TODO:构造需要下载的数据返回
-      if (this.dataListSelections.length > 0) {
-        return this.dataListSelections;
-      }
-      return this.dataList;
-    },
-    startDownload() {
-      //  this.exportData = this.dataList
 
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
     },
-    finishDownload() {
 
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
     }
-  },
-  created() {
-    this.getTableUserColumn()
-    this.getFunctionButtonList()
-    this.favoriteIsOk()
   }
 }
 </script>
-<style scoped>
-.sl-svg {
-  overflow: hidden;
-  float: right;
+
+<style>
+.el-textarea__inner {
+  padding: 5px 5px;
 }
 </style>
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index d2b1679..42f9461 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -33,9 +33,13 @@
           </el-form-item>
         </el-form>
         <el-form>
-          <el-form-item >
-            <span slot="label" style="" @click="getBaseList(93)"><a herf="#">{{buttons.site||'工厂'}}</a></span>
-            <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>
+          <el-form-item :label="buttons.site||'工厂'" size="mini" prop="siteList">
+            <el-checkbox-group v-model="dataForm.siteList">
+              <el-checkbox v-for="site in siteOptions" :key="site.key" :label="site.key">{{
+                  site.label
+                }}
+              </el-checkbox>
+            </el-checkbox-group>
           </el-form-item>
           <el-form-item :label="buttons.language||'语言'" prop="languageDefault">
             <el-select filterable v-model="dataForm.languageDefault" clearable style="width: 150px;">
@@ -76,8 +80,8 @@
 
 <script>
   import Chooselist from '@/views/modules/common/Chooselist'
-import {getFactory} from "@/api/factory";
 import {searchSysLanguage} from "@/api/sysLanguage.js"
+import {getUserAccessSiteList, saveUserAccessSiteList, getUserAuthorizedSites} from "@/api/factory/accessSite.js"
   import {
     searchFunctionButtonList,
   } from "@/api/sysLanguage.js"
@@ -92,6 +96,7 @@ export default {
       roleList: [],
       factorys: [],
       languageList: [],
+      siteOptions: [], // 工厂选项列表
       dataForm: {
         id: 0,
         userName: '',
@@ -103,7 +108,8 @@ export default {
         mobile: '',
         roleIdList: [],
         status: 1,
-        site: '',
+        site: '', // 保持兼容性
+        siteList: [], // 多选工厂列表
         userDisplay: ''
       },
       buttons: {
@@ -168,6 +174,7 @@ export default {
       this.dataForm.id = id || 0
       // this.factoryList();
       this.getLanguageList();
+      this.getSiteOptions(); // 获取工厂选项
       this.$http({
         url: this.$http.adornUrl('/sys/role/select'),
         method: 'get',
@@ -196,6 +203,8 @@ export default {
               this.dataForm.languageDefault = data.user.languageDefault
               this.dataForm.site = data.user.site.toString()
               this.dataForm.userDisplay = data.user.userDisplay
+              // 获取用户工厂权限
+              this.getUserSiteAccess(data.user.username)
             }
           })
         }
@@ -205,34 +214,65 @@ export default {
     dataFormSubmit() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$http({
-            url: this.$http.adornUrl(`/sys/user/${!this.dataForm.id ? 'save' : 'update'}`),
-            method: 'post',
-            data: this.$http.adornData({
-              'userId': this.dataForm.id || undefined,
-              'username': this.dataForm.userName,
-              'password': this.dataForm.password,
-              'salt': this.dataForm.salt,
-              'email': this.dataForm.email,
-              'mobile': this.dataForm.mobile,
-              'status': this.dataForm.status,
-              'roleIdList': this.dataForm.roleIdList,
-              'languageDefault': this.dataForm.languageDefault,
-              'site': this.dataForm.site,
-              'userDisplay': this.dataForm.userDisplay,
+            // 保存用户信息和工厂授权（在一个事务中）
+            this.$http({
+              url: this.$http.adornUrl(`/sys/user/${!this.dataForm.id ? 'save' : 'update'}`),
+              method: 'post',
+              data: this.$http.adornData({
+                'userId': this.dataForm.id || undefined,
+                'username': this.dataForm.userName,
+                'password': this.dataForm.password,
+                'salt': this.dataForm.salt,
+                'email': this.dataForm.email,
+                'mobile': this.dataForm.mobile,
+                'status': this.dataForm.status,
+                'roleIdList': this.dataForm.roleIdList,
+                'languageDefault': this.dataForm.languageDefault,
+                'site': this.dataForm.site,
+                'userDisplay': this.dataForm.userDisplay,
+                'siteList': this.dataForm.siteList || [] // 添加工厂授权列表
+              })
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message.success('操作成功')
+                this.visible = false
+                this.$emit('refreshDataList')
+              } else {
+                let msg = data.msg.split('<br>')[0]
+                this.$message.error( this.$t(`${msg}`))
+              }
             })
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message.success( '操作成功')
-              this.visible = false
-              this.$emit('refreshDataList')
-            } else {
-              let msg = data.msg.split('<br>')[0]
-              this.$message.error( this.$t(`${msg}`))
-            }
-          })
         }
       })
+    },
+    // 获取工厂选项列表
+    getSiteOptions() {
+      // 使用site接口获取工厂列表
+      this.$http({
+        url: this.$http.adornUrl('/site/list'),
+        method: 'post',
+        data: this.$http.adornData({
+          active: 'Y' // 只获取激活的工厂
+        })
+      }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.siteOptions = data.dataList || []
+        }
+      }).catch(() => {
+        this.$message.error('获取工厂列表失败')
+      })
+    },
+    // 获取用户工厂权限
+    getUserSiteAccess(username) {
+      if (!username) return
+      getUserAuthorizedSites({ userName: username }).then(({data}) => {
+        if (data && data.code === 0) {
+          // 数据结构: [{siteCode: 'F001', siteName: '工厂A'}, ...]
+          this.dataForm.siteList = data.data ? data.data.map(item => item.siteCode) : []
+        }
+      }).catch(() => {
+        this.$message.error('获取用户工厂权限失败')
+      })
     }
   },
   created() {
diff --git a/src/views/modules/warehouse/ifsInventoryInit.vue b/src/views/modules/warehouse/ifsInventoryInit.vue
index b34d93a..5f752f2 100644
--- a/src/views/modules/warehouse/ifsInventoryInit.vue
+++ b/src/views/modules/warehouse/ifsInventoryInit.vue
@@ -59,6 +59,12 @@
         align="center"
         label="物料描述">
       </el-table-column>
+      <el-table-column
+        prop="umid"
+        header-align="center"
+        align="center"
+        label="单位">
+      </el-table-column>
       <el-table-column
         prop="batchNo"
         header-align="center"
@@ -78,7 +84,7 @@
         label="库位">
       </el-table-column>
       <el-table-column
-        prop="inQty"
+        prop="qtyOnHand"
         header-align="center"
         align="center"
         label="现有库存">
@@ -150,16 +156,21 @@
            </el-col>
          </el-row>
          <el-row :gutter="20">
-           <el-col :span="12">
-             <el-form-item label="库存数量" prop="inQty" class="form-item-vertical">
-               <el-input v-model="createHuForm.inQty" readonly></el-input>
+           <el-col :span="8">
+             <el-form-item label="库存数量" prop="qtyOnHand" class="form-item-vertical">
+               <el-input v-model="createHuForm.qtyOnHand" readonly></el-input>
              </el-form-item>
            </el-col>
-           <el-col :span="12">
+           <el-col :span="8">
              <el-form-item label="未打印数量" prop="unPrintQty" class="form-item-vertical">
                <el-input v-model="createHuForm.unPrintQty" readonly></el-input>
              </el-form-item>
            </el-col>
+           <el-col :span="8">
+             <el-form-item label="单位" prop="umid" class="form-item-vertical">
+               <el-input v-model="createHuForm.umid" readonly></el-input>
+             </el-form-item>
+           </el-col>
          </el-row>
          <el-row :gutter="20">
            <el-col :span="24">
@@ -229,6 +240,7 @@ export default {
         batchNo: '',
         wdr: '',
         locationId: '',
+        umid: '',
         perPackageQty: 1,
         packageCount: 1
       },
@@ -302,8 +314,9 @@ export default {
         batchNo: row.batchNo,
         wdr: row.wdr,
         locationId: row.locationId,
-        inQty: row.inQty,
+        qtyOnHand: row.qtyOnHand,
         unPrintQty: row.unPrintQty,
+        umid: row.umid,
         perPackageQty: '',
         packageCount: 1
       }
diff --git a/src/views/modules/warehouse/location.vue b/src/views/modules/warehouse/location.vue
index aee56fe..8017c26 100644
--- a/src/views/modules/warehouse/location.vue
+++ b/src/views/modules/warehouse/location.vue
@@ -889,7 +889,7 @@
         this.setUp.saveButton = false
         this.setUp.readonlyFlag = false
         this.saveHeaderData.id = 0
-        this.saveHeaderData.site = this.site
+        this.saveHeaderData.site = localStorage.getItem('site')
         this.saveHeaderData.locationId = ''
         this.saveHeaderData.locationName = ''
         this.saveHeaderData.warehouseId = ''