修改仓库数据范围报错

ruoyi-ui/src/views/bas/warehouse/index.vue

@@ -1,8 +1,8 @@
 
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="labelWidthForSearch"> 
-      <el-form-item :label="$t('warehouse.Id')" prop="warehouseId"> 
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="labelWidthForSearch">
+      <el-form-item :label="$t('warehouse.Id')" prop="warehouseId">
         <!-- 仓库ID（序号） -->
         <el-input
           v-model="queryParams.warehouseId"
@@ -148,7 +148,7 @@
       <!-- 仓库地址 -->
       <el-table-column :label="$t('warehouse.address')" align="center" prop="address" />
       <!-- 备注 -->
-      <el-table-column :label="$t('warehouse.cDesc')" align="center" prop="cDesc" />
+      <el-table-column :label="$t('warehouse.cDesc')" align="center" prop="cdesc" />
       <!-- 仓库级别 -->
       <el-table-column :label="$t('warehouse.warehouseKind')" align="center" prop="warehouseKind" />
       <!-- 仓库类型 -->
@@ -181,7 +181,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -215,7 +215,7 @@
         </el-form-item>
         <!-- 备注 -->
         <el-form-item :label="$t('warehouse.cDesc')" prop="cDesc">
-          <el-input v-model="form.cDesc" :placeholder="$t('warehouse.placeholderCDesc')" />
+          <el-input v-model="form.cdesc" :placeholder="$t('warehouse.placeholderCDesc')" />
         </el-form-item>
         <!-- 仓库级别 -->
         <el-form-item :label="$t('warehouse.warehouseKind')" prop="warehouseKind">
@@ -377,7 +377,7 @@ export default {
       //---------------------------------
       this.isDisabledForId = true
 
-      this.reset()   
+      this.reset()
       const warehouseId = row.warehouseId || this.ids
       getWarehouse(warehouseId).then(response => {
         this.form = response.data
@@ -396,7 +396,7 @@ export default {
               this.open = false
               this.getList()
             })
-          } 
+          }
           if (this.title == this.$t('warehouse.addWarehouseItem')) {
             addWarehouse(this.form).then(response => {
               this.$modal.msgSuccess(this.$t('warehouse.addsuccessInfo'))
@@ -434,7 +434,7 @@ export default {
       if (this.$i18n.locale.startsWith('en')) {
         if (this.title === "修改仓库管理") {
           return "Edit Warehouse Management Item";
-        } 
+        }
         if (this.title === "添加仓库管理") {
           return "Add Warehouse Management Item";
         }
@@ -448,11 +448,11 @@ export default {
 
   computed: {
         labelWidthForSearch() {
-            const lang = this.$i18n.locale; 
+            const lang = this.$i18n.locale;
             return lang.startsWith('en') ? '84px' : '68px';
         },
         labelWidthForFunction() {
-            const lang = this.$i18n.locale; 
+            const lang = this.$i18n.locale;
             return lang.startsWith('en') ? '150px' : '120px';
         },
 

ruoyi-ui/src/views/system/role/index.vue

@@ -265,6 +265,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('systemManagement_RoleManagement.warehouseDataScope')">
+          <el-select v-model="form.warehouseDataScope" @change="dataScopeSelectChange" multiple collapse-tags :placeholder="$t('systemManagement_RoleManagement.selectWarehouse')">
+            <el-option
+              v-for="item in warehouseOptions"
+              :key="item.warehouseId"
+              :label="item.warehouseName"
+              :value="item.warehouseId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <!-- 数据权限 -->
         <el-form-item :label="$t('systemManagement_RoleManagement.dataScope')" v-show="form.dataScope == 2">
           <!-- 标签文本：展开/折叠 -->
@@ -300,6 +310,7 @@
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"
+import {listWarehouse} from "@/api/bas/warehouse"
 
 export default {
   name: "Role",
@@ -364,6 +375,8 @@ export default {
       menuOptions: [],
       // 部门列表
       deptOptions: [],
+      // 仓库选项
+      warehouseOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -397,8 +410,15 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList();
   },
   methods: {
+    /** 获取仓库列表 */
+    getWarehouseList() {
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+      });
+    },
     /** 查询角色列表 */
     getList() {
       this.loading = true
@@ -505,7 +525,8 @@ export default {
         deptIds: [],
         menuCheckStrictly: true,
         deptCheckStrictly: true,
-        remark: undefined
+        remark: undefined,
+        warehouseDataScope: []
       }
       this.resetForm("form")
     },