diff --git a/src/api/warehouse/warehouse.js b/src/api/warehouse/warehouse.js
index 92c9ae8..f5fed7f 100644
--- a/src/api/warehouse/warehouse.js
+++ b/src/api/warehouse/warehouse.js
@@ -11,5 +11,12 @@ export const delWarehouse = data => createAPI(`warehouse/delWarehouse`,'POST',da
 
 export const getWareHouseTypeList = data => createAPI(`factory/tblbasedata/getTblBaseList`,'POST',data)
 
+// 获取用户仓库授权列表
+export const getUserAccessWarehouseList = data => createAPI(`sys/user/getWarehouseAccess?userid=${data.userid}`,'GET')
 
+// 保存用户仓库授权
+export const saveUserAccessWarehouseList = data => createAPI(`sys/user/saveWarehouseAccess`,'POST',data)
+
+// 获取仓库列表（用于授权选择）
+export const getWarehouseListForAuth = data => createAPI(`warehouse/list`,'POST',data)
 
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 9e8e2d3..b9a6687 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -177,6 +177,27 @@ export default {
 
     init(id) {
       this.dataForm.id = id || 0
+      
+      // 如果是新增模式，清空表单数据
+      if (!this.dataForm.id) {
+        this.dataForm = {
+          id: 0,
+          userName: '',
+          password: '',
+          comfirmPassword: '',
+          languageDefault: '',
+          salt: '',
+          email: '',
+          mobile: '',
+          roleIdList: [],
+          status: 1,
+          site: '',
+          siteList: [],
+          userDisplay: '',
+          domainAccount: ''
+        }
+      }
+      
       // this.factoryList();
       this.getLanguageList();
       this.getSiteOptions(); // 获取工厂选项
@@ -193,6 +214,7 @@ export default {
         })
       }).then(() => {
         if (this.dataForm.id) {
+          // 编辑模式：加载用户数据
           this.$http({
             url: this.$http.adornUrl(`/sys/user/info/${this.dataForm.id}`),
             method: 'get',
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 88fe48e..7a4e0a6 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -17,6 +17,10 @@
                    @click="siteAuthorize()"
         > {{ buttons.factoryAuthorization || '工厂授权' }}
         </el-button>
+        <el-button type="primary"
+                   @click="warehouseAuthorize()"
+        > {{ buttons.warehouseAuthorization || '仓库授权' }}
+        </el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -169,12 +173,30 @@
 
     </span>
     </el-dialog>
+    <!--  仓库授权  -->
+    <el-dialog
+      style="font-size: 12px"
+      v-drag
+      :title="'仓库授权'"
+      :visible.sync="warehouseVisible"
+      width="518px"
+      :append-to-body="true">
+      <el-transfer v-model="selectWarehouseList" :data="warehouseList" :titles="['未授权仓库', '已授权仓库']"></el-transfer>
+      <span slot="footer" class="dialog-footer">
+        <div style="margin-top: 5px">
+                <el-button type="primary" @click="saveUserAccessWarehouse()">确定</el-button>
+                <el-button @click="warehouseVisible = false" type="primary">取消</el-button>
+        </div>
+
+    </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {getUserAccessSiteList, saveUserAccessSiteList} from '@/api/factory/accessSite.js'
 import {getSiteList} from '@/api/factory/site.js'
+import {getUserAccessWarehouseList, saveUserAccessWarehouseList, getWarehouseListForAuth} from '@/api/warehouse/warehouse.js'
 import AddOrUpdate from './user-add-or-update'
 import {getUserBusinessRoleList, saveUserBusinessRole,} from '@/api/auditManagement/auditType.js'
 
@@ -196,6 +218,7 @@ export default {
       securityHeight: 300,
       specialVisible: false,
       siteVisible: false,
+      warehouseVisible: false,
       currentData: {},
       userId: this.$store.state.user.name,
       transferData: [],
@@ -270,6 +293,7 @@ export default {
         delete: '删除',
         specialCompetencies: '特殊权限',
         factoryAuthorization: '工厂授权',
+        warehouseAuthorization: '仓库授权',
         createTime: '创建时间',
         username: '用户账号',
         userDisplay: '用户名',
@@ -288,6 +312,8 @@ export default {
       selectSpecialList: [],
       siteList: [],
       selectSitList: [],
+      warehouseList: [],
+      selectWarehouseList: [],
       selectUser: {},
       pageIndex: 1,
       pageSize: 20,
@@ -365,6 +391,11 @@ export default {
       this.searchSiteList()
 
     },
+    // 授权仓库
+    warehouseAuthorize() {
+      this.warehouseVisible = true
+      this.searchWarehouseList()
+    },
     // 保存选中的授权工厂
     saveUserAssessSite() {
       let accessSiteList = this.selectSitList.map(item => {
@@ -405,6 +436,51 @@ export default {
         }
       })
     },
+    // 保存选中的授权仓库
+    saveUserAccessWarehouse() {
+      let accessWarehouseData = {
+        userid: this.selectUser.username,
+        accessWarehouseList: this.selectWarehouseList // selectWarehouseList已经是仓库ID数组
+      }
+
+      saveUserAccessWarehouseList(accessWarehouseData).then(({data}) => {
+        if (data.code === 0) {
+          this.$message.success(data.msg || '操作成功')
+          this.warehouseList = []
+          this.selectWarehouseList = []
+          this.warehouseVisible = false
+        } else {
+          this.$message.warning(data.msg || '操作失败')
+        }
+      }).catch(() => {
+        this.$message.error('保存仓库授权失败')
+      })
+    },
+    // 获取用户已授权的仓库列表
+    searchUserAccessWarehouseList() {
+      getUserAccessWarehouseList({userid: this.selectUser.username}).then(({data}) => {
+        if (data.code === 0) {
+          this.selectWarehouseList = data.dataList || []
+        }
+      }).catch(() => {
+        this.$message.error('获取用户仓库权限失败')
+      })
+    },
+    // 获取所有可用仓库
+    searchWarehouseList() {
+      getWarehouseListForAuth({active: 'Y',site:localStorage.getItem('site')}).then(({data}) => {
+        if (data.code === 0) {
+          // 转换为el-transfer需要的数据格式
+          this.warehouseList = (data.dataList || []).map(item => ({
+            key: item.wareHouseId,
+            label: `${item.wareHouseId} - ${item.wareHouseName || item.wareHouseId}`
+          }))
+          this.searchUserAccessWarehouseList()
+        }
+      }).catch(() => {
+        this.$message.error('获取仓库列表失败')
+      })
+    },
     // 选中行
     handleCurrentChange(val) {
       this.selectUser = val