diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 37a540d..3f178b0 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -31,9 +31,15 @@
           </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||'工厂'">
+            <el-select v-model="dataForm.site" filterable clearable placeholder="请选择工厂" style="width: 150px;">
+              <el-option
+                v-for="i in siteOptions"
+                :key="i.siteid"
+                :label="i.sitename"
+                :value="i.siteid">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="车间">
             <el-select v-model="dataForm.workShopId" placeholder="请选择" style="width: 150px;"  clearable>
@@ -83,7 +89,7 @@
 
 <script>
   import Chooselist from '@/views/modules/common/Chooselist'
-import {getEamWorkShop} from "@/api/factory/site.js";
+import {getEamWorkShop, getSite2} from "@/api/factory/site.js";
 import {searchSysLanguage} from "@/api/sysLanguage.js"
   import {
     searchFunctionButtonList,
@@ -133,6 +139,7 @@ export default {
         language: '语言',
       },
       workShopList:[],
+      siteOptions: [],
       showSupplierPicker: false,
     }
   },
@@ -164,9 +171,6 @@ export default {
       })
     },
     getBaseData(val){
-      if (this.tagNo === 93){
-        this.dataForm.site = val.SiteID
-      }
       if (this.tagNo === 1100){
         this.dataForm.supplierNo = val.supplier_no
       }
@@ -177,9 +181,6 @@ export default {
       this.$nextTick(() => {
         let strVal = "";
         let conSql = "";
-        if (val === 93){
-          strVal = this.dataForm.site
-        }
         if (val === 1100) {
           if (!this.dataForm.site) {
             this.$message.warning('请先选择工厂')
@@ -191,6 +192,25 @@ export default {
         this.$refs.baseList.init(val,strVal,conSql)
       })
     },
+    // 加载工厂下拉（site表） - rqrq
+    loadSiteOptions () {
+      let inData = {
+        username: this.$store.state.user.name,
+        siteid: '',
+        sitename: ''
+      }
+      getSite2(inData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.siteOptions = data.rows || []
+        } else {
+          this.siteOptions = []
+          this.$message.error((data && data.msg) || '加载工厂失败')
+        }
+      }).catch(() => {
+        this.siteOptions = []
+        this.$message.error('加载工厂失败')
+      })
+    },
     // 获取多语言列表
     getLanguageList() {
       let queryLanguage = { languageCode: this.$i18n.locale}
@@ -201,7 +221,7 @@ export default {
 
     init(id) {
       this.dataForm.id = id || 0
-      // this.factoryList();
+      this.loadSiteOptions()
       this.getLanguageList();
       this.$http({
         url: this.$http.adornUrl('/sys/role/select'),
@@ -229,7 +249,7 @@ export default {
               this.dataForm.roleIdList = data.user.roleIdList
               this.dataForm.status = data.user.status
               this.dataForm.languageDefault = data.user.languageDefault
-              this.dataForm.site = data.user.site.toString()
+              this.dataForm.site = data.user.site == null ? '' : data.user.site.toString()
               this.dataForm.userDisplay = data.user.userDisplay
               this.dataForm.workShopId = data.user.workShopId
               this.dataForm.supplierNo = data.user.supplierNo
@@ -245,6 +265,10 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
+      if (!this.dataForm.site) {
+        this.$message.warning('请选择工厂')
+        return
+      }
       if (this.showSupplierPicker && !this.dataForm.supplierNo) {
           this.$message.warning('请选择供应商')
           return
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index ef3fa0b..a8494da 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -11,9 +11,9 @@
         <el-button @click="getDataList" type="primary">{{ buttons.search || '查询' }}</el-button>
         <el-button v-if="isAuth('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ buttons.add || '新增' }}</el-button>
         <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="siteAuthorize()">{{ buttons.factoryAuthorization || '工厂授权' }}</el-button>
-        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="buAuthorize()">{{ buttons.buAuthorization || 'BU授权' }}</el-button>
+<!--        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="buAuthorize()">{{ buttons.buAuthorization || 'BU授权' }}</el-button>-->
         <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="viewUserDept()">{{ buttons.viewUserDept || '查看部门' }}</el-button>
-        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="deptAuthorize()">{{ buttons.deptAuthorization || '部门授权' }}</el-button>
+<!--        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="deptAuthorize()">{{ buttons.deptAuthorization || '部门授权' }}</el-button>-->
         <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="businessRoleAuthorize()">{{ buttons.businessRoleAuthorization || '岗位' }}
         </el-button>
         <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="specialAuthorize()">{{ buttons.specialCompetencies || '特殊权限' }}</el-button>