From 6462002b7f201f2807158d46a6cde59edfa13c38 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Thu, 5 Jun 2025 09:47:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=98=BE=E7=A4=BA=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/lang/en.js | 155 ++++++++++- ruoyi-ui/src/lang/zh.js | 151 ++++++++++- ruoyi-ui/src/views/bas/cargoSpace/index.vue | 80 +++++- ruoyi-ui/src/views/bas/warehouse/index.vue | 42 ++- ruoyi-ui/src/views/system/user/index.vue | 277 +++++++++++++------- 5 files changed, 589 insertions(+), 116 deletions(-) diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index a15cb3a..b57353b 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -73,12 +73,37 @@ export default { ManagementOfInboundDocuments:"ManagementOfInboundDocuments", InboundTaskManagement:"InboundTaskManagement", + + //********************仓库管理******************** WarehouseManagement: 'WarehouseManagement', - //仓库（库区）管理 - WarehouseAreaManagement: 'WarehouseManagement', - //货位管理 - CargoSpaceManagement: 'CargoSpaceManagement', + //仓库（库区）管理 + WarehouseAreaManagement: 'WarehouseManagement', + //货位管理 + CargoSpaceManagement: 'CargoSpaceManagement', + + + //********************系统管理******************** + SystemManagement: 'SystemManagement', + //用户管理 + UserManagement: 'UserManagement', + //角色管理 + RoleManagement: 'RoleManagement', + //菜单管理 + MenuManagement: 'MenuManagement', + //部门管理 + DepartmentManagement: 'DepartmentManagement', + //岗位管理 + PostManagement: 'PostManagement', + //字典管理 + DictionaryManagement: 'DictionaryManagement', + //参数管理 + ParameterManagement: 'ParameterManagement', + //通知公告 + NoticeManagement: 'NoticeManagement', + //日志管理 + LogManagement: 'LogManagement', + }, @@ -211,17 +236,133 @@ export default { deleteSuccessInfo: 'Delete Success', //--------------提示文本-------------- - dialogText1: 'Are you sure to delete the data with the number【', + dialogText1: 'Are you sure to delete the data with the number 【', dialogText2: '】？', - //--------------错误提示-------------- + //--------------校验提示-------------- warehosueIdIsNull: 'WarehouseId cannot be null!', platoonIsNull: 'Platoon cannot be null!', columnIsNull: 'Column cannot be null!', floorIsNull: 'Floor cannot be null!', statusIsNull: 'Status cannot be null!', lockedIsNull: 'Locked cannot be null!', - } + + }, + + + + + + //=====================系统管理===================== + systemManagement_RoleManagement: { + //--------------数据表标题-------------- + userId: 'UserId', + userName: 'UserName', + password: 'Password', + nickName: 'NickName', + deptName: 'DeptName', + phoneNumber: 'PhoneNumber', + status: 'Status', + creatTime: 'CreatTime', + operation: 'Operation', + email: 'Email', + post: 'Post', + role: 'Role', + gender: 'Gender', + remark: 'Remark', + + //--------------交互框提示信息-------------- + placeholderDeptName: 'Enter DeptName', + placeholderUserId: 'Enter UserId', + placeholderUserName: 'Enter UserName', + placeholderPassword: 'Enter Password', + placeholderNickName: 'Enter NickName', + placeholderPhoneNumber: 'Enter PhoneNumber', + placeholderStatus: 'Enter Status', + placeholderCreatTime: 'Enter CreatTime', + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', + placeholderEmail: 'Enter Email', + placeholderPost: 'Select Post', + placeholderRole: 'Select Role', + placeholderGender: 'Select Gender', + placeholderRemark: 'Enter Remark', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnImport: 'Import', + btnExport: 'Export', + btnSubmit: 'Submit', + btnCancel: 'Cancel', + btnMore: 'More', + btnResetPassword: 'Reset Password', + btnAssignRole: 'Assign Role', + + //--------------二级窗口标题-------------- + addUserItem: 'Add User', + editUserItem: 'Edit User', + + //--------------提示文本-------------- + //---布局--- + textDragOrClick1: 'Drag file here, or ', + textDragOrClick2: 'click to upload', + textUpdateExistingData: 'Do you want to update existing user data?', + textUploadTip: 'Only xlsx and xls files are allowed.', + textDownloadTemplate: 'Download Template', + + //---函数：handleStatusChange--- + textEnable: 'enable', + textDisable: 'disable', + textUserConfirm1:"Are you sure you want to \"", + textUserConfirm2:"\" user？", + textSuccess: 'success', + + //---函数：handleResetPwd--- + textInputPassword1: 'Please enter the new password for the \"', + textInputPassword2: '\" user', + textTips: 'Tip', + textConfirm: 'Confirm', + textCancel: 'Cancel', + textResetPassword: 'The change was successful and the new password is:', + + //---函数：handleDelete--- + textDeleteConfirm1: 'Is it confirmed to delete the data item with user number "', + textDeleteConfirm2: '"?', + + //---函数：handleImport--- + textImportTitle: 'Import User Data', + + //---函数：textUploadTitle--- + textImportResult: 'Result', + + + //--------------提示信息-------------- + addSuccessInfo: 'Add Success', + editSuccessInfo: 'Edit Success', + deleteSuccessInfo: 'Delete Success', + resetPasswordSuccessInfo: 'Reset Password Success', + assignRoleSuccessInfo: 'Assign Role Success', + + //--------------校验提示-------------- + checkUserNameIsNull: 'UserName cannot be null!', + checkUserNameLength: 'UserName length must be between 2-20 characters!', + checkNickNameIsNull: 'NickName cannot be null!', + checkPasswordIsNull: 'Password cannot be null!', + checkPasswordLength: 'Password length must be between 5-20 characters!', + checkPasswordCharacter: "Password cannot contain illegal characters: < > \" \' \\\ |", + checkEmailFormat: 'Please enter a valid email address!', + checkPhoneNumberFormat: 'Please enter a valid phone number!', + + //--------------其他-------------- + lblWidthUserName: '80px', + lblWidthPhoneNumber: '90px', + + + }, } diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 011cf41..7c43180 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -1,6 +1,7 @@ // import "core-js/fn/symbol"; +// import { assign } from 'core-js/core/object' import 'core-js/features/symbol' -import { Dialog } from 'element-ui' +// import { Dialog } from 'element-ui' export default { login: { @@ -76,12 +77,36 @@ export default { ManagementOfInboundDocuments:"入库单据管理", InboundTaskManagement:"入库作业管理", + + //********************仓库管理******************** WarehouseManagement: '仓库管理', - //仓库（库区）管理 - WarehouseAreaManagement: '库区管理', - //货位管理 - CargoSpaceManagement: '货位管理', + //仓库（库区）管理 + WarehouseAreaManagement: '库区管理', + //货位管理 + CargoSpaceManagement: '货位管理', + + //********************系统管理******************** + SystemManagement: '系统管理', + //用户管理 + UserManagement: '用户管理', + //角色管理 + RoleManagement: '角色管理', + //菜单管理 + MenuManagement: '菜单管理', + //部门管理 + DepartmentManagement: '部门管理', + //岗位管理 + PostManagement: '岗位管理', + //字典管理 + DictionaryManagement: '字典管理', + //参数管理 + ParameterManagement: '参数管理', + //通知公告 + NoticeManagement: '通知公告', + //日志管理 + LogManagement: '日志管理', + }, @@ -227,4 +252,120 @@ export default { + + + + + //=====================系统管理:用户管理===================== + systemManagement_RoleManagement: { + //--------------数据表标题-------------- + userId: '用户编号', + userName: '用户名称', + password: '密码', + nickName: '用户昵称', + deptName: '部门', + phoneNumber: '手机号', + status: '状态', + creatTime: '创建时间', + operation: '操作', + email: '邮箱', + post: '岗位', + role: '角色', + gender: '性别', + remark: '备注', + + //--------------交互框提示信息-------------- + placeholderDeptName: '请输入部门名称', + placeholderUserId: '请输入用户编号', + placeholderUserName: '请输入用户名称', + placeholderPassword: '请输入密码', + placeholderNickName: '请输入用户昵称', + placeholderPhoneNumber: '请输入手机号', + placeholderStatus: '请选择状态', + placeholderCreatTime: '请选择创建时间', + placeholderDateStart: '开始日期', + placeholderDateEnd: '结束日期', + placeholderEmail: '请输入邮箱', + placeholderPost: '请选择岗位', + placeholderRole: '请选择角色', + placeholderGender: '请选择性别', + placeholderRemark: '请输入备注信息', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnImport: '导入', + btnExport: '导出', + btnSubmit: '确定', + btnCancel: '取消', + btnMore: '更多', + btnResetPassword: '重置密码', + btnAssignRole: '分配角色', + + //--------------二级窗口标题-------------- + addUserItem: '添加用户', + editUserItem: '修改用户', + + //--------------提示文本-------------- + //---布局--- + textDragOrClick1: '将文件拖到此处，或', + textDragOrClick2: '点击上传', + textUpdateExistingData: '是否更新已经存在的用户数据？', + textUploadTip: '仅允许导入xls、xlsx格式文件。', + textDownloadTemplate: '下载模板', + + //---函数：handleStatusChange--- + textEnable: '启用', + textDisable: '禁用', + textUserConfirm1:"确认要\"", + textUserConfirm2:"\"用户吗？", + textSuccess: '成功', + + //---函数：handleResetPwd--- + textInputPassword1: '请输入', + textInputPassword2: '的新密码', + textTips: '提示', + textConfirm: '确认', + textCancel: '取消', + textResetPassword: '修改成功，新密码是：', + + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除用户编号为"', + textDeleteConfirm2: '"的数据项？', + + //---函数：handleImport--- + textImportTitle: '导入成功', + + //---函数：textUploadTitle--- + textImportResult: '导入结果', + + + //--------------提示信息-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + resetPasswordSuccessInfo: '重置密码成功', + assignRoleSuccessInfo: '分配角色成功', + + //--------------校验提示-------------- + checkUserNameIsNull: '用户名称不能为空', + checkUserNameLength: '用户名称长度必须介于2-20个字符', + checkNickNameIsNull: '用户昵称不能为空', + checkPasswordIsNull: '密码不能为空', + checkPasswordLength: '密码长度必须介于5-20个字符', + checkPasswordCharacter: "不能包含非法字符：< > \" ' \\\ |", + checkEmailFormat: '请输入正确的邮箱地址', + checkPhoneNumberFormat: '请输入正确的手机号', + + //--------------其他-------------- + lblWidthUserName: '68px', + lblWidthPhoneNumber: '68px', + + }, + + + } diff --git a/ruoyi-ui/src/views/bas/cargoSpace/index.vue b/ruoyi-ui/src/views/bas/cargoSpace/index.vue index 5e7480e..35eae80 100644 --- a/ruoyi-ui/src/views/bas/cargoSpace/index.vue +++ b/ruoyi-ui/src/views/bas/cargoSpace/index.vue @@ -1,6 +1,7 @@