lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改仓库数据范围报错

Browse Source
This commit is contained in:
liuhanqing
2025-06-16 13:56:41 +08:00
parent fc7364cc99
commit 36c95928ba
14 changed files with 230 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-ui/src/lang/en.js
View File

@@ -1422,6 +1422,7 @@ export default {
placeholderEmail: 'Enter Email',
placeholderPost: 'Select Post',
placeholderGender: 'Select Gender',
selectWarehouse: 'Select Warehouse',
//--------------交互按钮--------------
btnSearch: 'Search',
@@ -3048,16 +3049,6 @@ export default {
deleteSuccess: 'deleteSuccess',
deleteConfirm: 'Are you sure to delete the customerNo with ID {ids}?'
},
// ***************产品基础表添加字段**************
basproduct1:{
englishName:"englishName",
netWeightPerUnit:"netWeightPerUnit",
long:"long",
wide:"wide",
tall:"tall",
volume:"volume",
price:"price",
notes:"notes"
},
}

1
ruoyi-ui/src/lang/hu.js
View File

@@ -1369,6 +1369,7 @@ export default {
placeholderEmail: '请输入邮箱',
placeholderPost: '请选择岗位',
placeholderGender: '请选择性别',
selectWarehouse: '请选择仓库',
//--------------交互按钮--------------
btnSearch: '搜索',

2
ruoyi-ui/src/lang/zh.js
View File

@@ -1409,6 +1409,7 @@ export default {
roleName: '角色名称',
roleKey: '权限字符',
dataScope: '权限范围',
warehouseDataScope: '仓库范围',
menuAccess: '菜单权限',
roleSort: '显示顺序',
status: '角色状态',
@@ -1431,6 +1432,7 @@ export default {
placeholderEmail: '请输入邮箱',
placeholderPost: '请选择岗位',
placeholderGender: '请选择性别',
selectWarehouse: '请选择仓库',
//--------------交互按钮--------------
btnSearch: '搜索',

20
ruoyi-ui/src/views/bas/warehouse/index.vue
View File

@@ -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';
},

23
ruoyi-ui/src/views/system/role/index.vue
View File

@@ -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")
},