From 9067c125a869bf30bbaf503ad3e5d34758f00182 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Tue, 3 Jun 2025 17:50:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E5=AD=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=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 | 150 ++++++++++++++ ruoyi-ui/src/lang/zh.js | 157 +++++++++++++- ruoyi-ui/src/views/bas/cargoSpace/index.vue | 217 +++++++++++--------- ruoyi-ui/src/views/bas/warehouse/index.vue | 190 +++++++++++------ 4 files changed, 544 insertions(+), 170 deletions(-) diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 13cc482..03f698b 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -73,5 +73,155 @@ export default { ManagementOfInboundDocuments:"ManagementOfInboundDocuments", InboundTaskManagement:"InboundTaskManagement", + //********************仓库管理******************** + WarehouseManagement: 'WarehouseManagement', + //仓库(库区)管理 + WarehouseAreaManagement: 'WarehouseManagement', + //货位管理 + CargoSpaceManagement: 'CargoSpaceManagement', + }, + + //=====================仓库(库区)管理===================== + warehouse: { + //--------------数据表表标题-------------- + title: 'Warehouse Management', + Id: 'ID', + warehouseId: 'Warehouse Id', + projectNo: 'Project Number', + warehouseName: 'Warehouse Name', + address: 'Warehouse Address', + cDesc: 'Description', + warehouseKind: 'Warehouse Level', + warehouseType: 'Warehouse Type', + isCurrent: 'Enable', + operation: 'Operation', + + //--------------交互框提示信息-------------- + placeholderId: 'Enter ID', + placeholderWarehouseId: 'Enter WarehouseId', + placeholderProjectNo: 'Enter WarehouseNo', + placeholderWarehouseName: 'Enter Project Number', + placeholderAddress: 'Enter Warehouse Address', + placeholderCDesc: 'Enter Description', + placeholderWarehouseKind: 'Enter Warehouse Level', + placeholderWarehouseType: 'Enter Warehouse Type', + placeholderIsCurrent: 'Select IsEnable', + + //--------------交互按钮-------------- + search: 'Search', + reset: 'Reset', + add: 'Add', + edit: 'Edit', + del: 'Delete', + export: 'Export', + import: 'Import', + submit: 'Submit', + cancel: 'Cancel', + remark: 'Remark', + + //--------------二级窗口标题-------------- + addWarehouseItem: 'Add Warehouse Item', + editWarehouseItem: 'Edit Warehouse Item', + + //--------------提示信息-------------- + addSuccessInfo: 'Add Success', + editSuccessInfo: 'Edit Success', + deleteSuccessInfo: 'Delete Success', + + //--------------提示文本-------------- + dialogText1: 'Are you sure to delete the data with the number【', + dialogText2: '】?', + + //--------------错误提示-------------- + idIsNull: 'WarehouseId cannot be null!', + warehouseIdIsNull: 'WarehouseNo cannot be null!', + warehouseNameIsNull: 'WarehouseName cannot be null!', + isCurrentIsNull: 'IsCurrent cannot be null!', + + }, + + //=====================货位管理===================== + cargoSpace:{ + //--------------数据表标题-------------- + title: 'CargoSpace Management', + cargoSpaceId: 'CargoSpace Id', + warehouseId: 'Warehouse Id', + roadwayId: 'Roadway Id', + cargoAreaId: 'CargoArea Id', + cargoSpaceType: 'CargoSpace Type', + cargoSpaceTypeName: 'CargoSpace TypeName', + cargoSpaceName: 'CargoSpace Name', + platoon: 'Platoon', + column: 'Column', + floor: 'Floor', + locked: 'Locked', + trayCode: 'TrayCode', + status: 'Status', + cargoHeight: 'Cargo Height', + isDouble: 'Is Double (Y/N)', + groupCodingNo: 'Group Coding No', + groupCodingName: 'Group Coding Name (1, 2...)', + cargoSpaceLogo: 'Cargo Space Logo (0 Outside, 1 Inside)', + thisCargoAreaId: 'This Cargo Area Id', + operation: 'Operation', + + //--------------交互框提示信息-------------- + placeholderCargoSpaceId: 'Enter CargoSpace Id', + placeholderWarehouseId: 'Enter Warehouse Id', + placeholderRoadwayId: 'Enter Roadway Id', + placeholderCargoAreaId: 'Enter CargoArea Id', + placeholderCargoSpaceType: 'Enter CargoSpace Type', + placeholderCargoSpaceTypeName: 'Enter CargoSpace TypeName', + placeholderCargoSpaceName: 'Enter CargoSpace Name', + placeholderPlatoon: 'Enter Platoon', + placeholderColumn: 'Enter Column', + placeholderFloor: 'Enter Floor', + placeholderLocked: 'Enter Locked (Y/N)', + placeholderTrayCode: 'Enter Tray Code', + placeholderStatus: 'Enter Status', + placeholderCargoHeight: 'Enter Cargo Height', + placeholderIsDouble: 'Enter Is Double (Y/N)', + placeholderGroupCodingNo: 'Enter Group Coding No', + placeholderGroupCodingName: 'Enter Group Coding Name (1, 2...)', + placeholderCargoSpaceLogo: 'Enter Cargo Space Logo (0 Outside, 1 Inside)', + placeholderThisCargoAreaId: 'Enter This Cargo Area Id', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnSave: 'Save', + btnExport: 'Export', + btnImport: 'Import', + btnSubmit: 'Submit', + btnCancel: 'Cancel', + btnClose: 'Close', + btnRemark: 'Remark', + + //--------------二级窗口标题-------------- + addCargoSpaceItem: 'Add CargoSpace Item', + editCargoSpaceItem: 'Edit CargoSpace Item', + + //--------------提示信息-------------- + addSuccessInfo: 'Add Success', + editSuccessInfo: 'Edit Success', + deleteSuccessInfo: 'Delete Success', + + //--------------提示文本-------------- + 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!', + } + + } diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 4ee9065..011cf41 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -1,3 +1,7 @@ +// import "core-js/fn/symbol"; +import 'core-js/features/symbol' +import { Dialog } from 'element-ui' + export default { login: { title: '若依后台管理系统', @@ -71,5 +75,156 @@ export default { ReceiptDocumentManagement:"收货单据管理", ManagementOfInboundDocuments:"入库单据管理", InboundTaskManagement:"入库作业管理", - } + + //********************仓库管理******************** + WarehouseManagement: '仓库管理', + //仓库(库区)管理 + WarehouseAreaManagement: '库区管理', + //货位管理 + CargoSpaceManagement: '货位管理', + + }, + + //=====================仓库(库区)管理===================== + warehouse: { + //--------------数据表标题-------------- + title: '仓库管理', + Id: '序号', + warehouseId: '仓库编码', + projectNo: '项目编号', + warehouseName: '仓库名称', + address: '仓库地址', + cDesc: '描述', + warehouseKind: '仓库级别', + warehouseType: '仓库类型', + isCurrent: '是否可用', + operation: '操作', + + //--------------交互框提示信息-------------- + placeholderId: '序号', + placeholderWarehouseId: '请输入仓库编码', + placeholderProjectNo: '请输入项目编号', + placeholderWarehouseName: '请输入仓库名称', + placeholderAddress: '请输入仓库地址', + placeholderCDesc: '请输入描述', + placeholderWarehouseKind: '请输入仓库级别', + placeholderWarehouseType: '请输入仓库类型', + placeholderIsCurrent: '请选择是否可用', + + //--------------交互按钮-------------- + search: '搜索', + reset: '重置', + add: '新增', + edit: '修改', + del: '删除', + export: '导出', + import: '导入', + submit: '提交', + cancel: '取消', + remark: '备注', + + //--------------二级窗口标题-------------- + addWarehouseItem: '添加仓库管理', + editWarehouseItem: '修改仓库管理', + + //--------------提示信息-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + + //--------------提示文本-------------- + dialogText1: '是否确认删除编号【', + dialogText2: '】的数据项? ', + + //--------------错误提示-------------- + idIsNull: '序号不能为空', + warehouseIdIsNull: '仓库编码不能为空', + warehouseNameIsNull: '仓库名称不能为空', + isCurrentIsNull: '是否可用不能为空', + + + }, + + //=====================货位管理===================== + cargoSpace: { + //--------------数据表标题-------------- + title: '货位管理', + cargoSpaceId: '货位编码', + warehouseId: '仓库编码', + roadwayId: '巷道号', + cargoAreaId: '货区编码', + cargoSpaceType: '货位类型', + cargoSpaceTypeName: '货位类型名称', + cargoSpaceName: '货位名称', + platoon: '排', + column: '列', + floor: '层', + locked: '是否锁定', + trayCode: '托盘编码', + status: '货位状态', + cargoHeight: '货位高度', + isDouble: '是否双伸(Y/N)', + groupCodingNo: '双货位分组编码', + groupCodingName: '双货位分组编码(1、2...)', + cargoSpaceLogo: '双货位标识(0外1内)', + thisCargoAreaId: '仓库区域编码', + + operation: '操作', + + //--------------交互框提示信息-------------- + placeholderCargoSpaceId: '请输入货位编码', + placeholderWarehouseId: '请输入仓库编码', + placeholderRoadwayId: '请输入巷道号', + placeholderCargoAreaId: '请输入货区编码', + placeholderCargoSpaceType: '请输入货位类型', + placeholderCargoSpaceName: '请输入货位名称', + placeholderPlatoon: '请输入排', + placeholderColumn: '请输入列', + placeholderFloor: '请输入层', + placeholderLocked: '请输入是否锁定', + placeholderTrayCode: '请输入托盘编码', + placeholderStatus: '请输入货位状态', + placeholderCargoHeight: '请输入货位高度', + placeholderIsDouble: '请输入是否双伸(Y/N)', + // placeholdergroupCodingNo: '双货位分组编码', + // placeholdergroupCodingName: '双货位分组编码(1、2...)', + // placeholdercargoSpaceLogo: '双货位标识(0外1内)', + // placeholderthisCargoAreaId: '仓库区域编码', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDel: '删除', + btnExport: '导出', + btnImport: '导入', + btnSubmit: '提交', + btnCancel: '取消', + btnRemark: '备注', + + //--------------二级窗口标题-------------- + addCargoSpaceItem: '添加库存信息', + editCargoSpaceItem: '修改仓库管理', + + //--------------提示信息-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + + //--------------提示文本-------------- + dialogText1: '是否确认删除编号【', + dialogText2: '】的数据项? ', + + //--------------错误提示-------------- + warehosueIdIsNull: '仓库编号不能为空', + platoonIsNull: '排不能为空', + columnIsNull: '列不能为空', + floorIsNull: '层不能为空', + statusIsNull: '货位状态不能为空', + lockedIsNull: '是否可用不能为空', + }, + + + } diff --git a/ruoyi-ui/src/views/bas/cargoSpace/index.vue b/ruoyi-ui/src/views/bas/cargoSpace/index.vue index e5a070d..5e7480e 100644 --- a/ruoyi-ui/src/views/bas/cargoSpace/index.vue +++ b/ruoyi-ui/src/views/bas/cargoSpace/index.vue @@ -1,82 +1,90 @@