diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index e0ce228..e9112b9 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -985,7 +985,7 @@ export default { editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', deleteConfirm: 'Are you sure to delete the selected stock freeze records?', - createTime: '创建时间', + createTime: 'CreateTime', }, menu: { //收货单据新增 @@ -995,19 +995,50 @@ export default { ManagementOfInboundDocuments: "ManagementOfInboundDocuments", InboundTaskManagement: "InboundTaskManagement", + //********************基础信息******************** + //容器管理 + ContainerManagement: 'ContainerManagement', - //********************仓库管理******************** + //********************基础信息:仓库管理******************** WarehouseManagement: 'WarehouseManagement', //仓库（库区）管理 WarehouseAreaManagement: 'WarehouseManagement', //货位管理 CargoSpaceManagement: 'CargoSpaceManagement', + //********************出库管理******************** outboundManagement: 'outboundManagement', createNewOutboundDocument: 'createNewOutboundDocument', outboundDocumentManagement: 'outboundDocumentManagement', outboundTaskManagement: 'outboundTaskManagement', + //********************KPI分析******************** + KPIAnalysis: 'KPI Analysis', + // 入库分析 + KPIAnalysis_StockIn: 'StockIn Analysis', + // 出库分析 + KPIAnalysis_StockOut: 'StockOut Analysis', + // 巷道分布 + KPIAnalysis_Roadway: 'Roadway Distribution', + // 货位分析 + KPIAnalysis_CargoSpace: 'Cargo Analysis', + // 库存平面图 + KPIAnalysis_CargoPlan: 'Cargo Plan', + + //********************系统监控******************** + SystemMonitor: 'SystemMonitor', + // 在线用户 + SystemMonitor_Online: 'Online', + // 定时任务 + SystemMonitor_ScheduledTask: 'ScheduledTask', + // 数据监控 + SystemMonitor_DataMonitor: 'DataMonitor', + //服务监控 + SystemMonitor_ServiceMonitor: 'ServiceMonitor', + //缓存监控 + SystemMonitor_CacheMonitor: 'CacheMonitor', + //缓存列表 + SystemMonitor_CacheList: 'CacheList', //********************系统管理******************** SystemManagement: 'SystemManagement', @@ -1034,33 +1065,6 @@ export default { //登录日志 LogManagement_LoginLog: 'LoginLog', - //********************系统监控******************** - SystemMonitor: 'SystemMonitor', - // 在线用户 - SystemMonitor_Online: 'Online', - // 定时任务 - SystemMonitor_ScheduledTask: 'ScheduledTask', - // 数据监控 - SystemMonitor_DataMonitor: 'DataMonitor', - //服务监控 - SystemMonitor_ServiceMonitor: 'ServiceMonitor', - //缓存监控 - SystemMonitor_CacheMonitor: 'CacheMonitor', - //缓存列表 - SystemMonitor_CacheList: 'CacheList', - - //********************KPI分析******************** - KPIAnalysis: 'KPI Analysis', - // 入库分析 - KPIAnalysis_StockIn: 'StockIn Analysis', - // 出库分析 - KPIAnalysis_StockOut: 'StockOut Analysis', - // 巷道分布 - KPIAnalysis_Roadway: 'Roadway Distribution', - // 货位分析 - KPIAnalysis_CargoSpace: 'Cargo Analysis', - // 库存平面图 - KPIAnalysis_CargoPlan: 'Cargo Plan', // ****************盘点管理****************** @@ -1236,6 +1240,89 @@ export default { }, + //=====================基础信息:容器管理===================== + bas_ContainerManagement: { + //--------------标题-------------- + addContainerItem: 'Add Container Item', + editContainerItem: 'Edit Container Item', + + //--------------子页面标题-------------- + addContainerDetailsItem: 'Add ContainerDetails Item', + editContainerDetailsItem: 'Edit ContainerDetails Item', + + //--------------字段名-------------- + containerId: 'ContainerId', + portName: 'PortName', + status: 'Status', + productTypeQuantity: 'TypeQuantity', + capacity: 'Capacity', + createTime: 'CreateTime', + updateTime: 'UpdateTime', + operationMan: 'Operationer', + operation: 'Operation', + + //--------------子页面字段-------------- + id: 'Id', + productId: 'ProductId', + productName: 'ProductName', + quantity: 'Quantity', + unit: 'Unit', + + //--------------文本框输入提示-------------- + placeholderContainerId: 'Enter ContainerId', + placeholderPortName: 'Select PortName', + placeholderStatus: 'Select Status', + placeholderProductTypeQuantity: 'Enter TypeQuantity', + placeholderCapacity: 'Capacity', + placeholderOperationMan: 'Operationer', + + //--------------子页面输入提示-------------- + placeholderProductId: 'Enter ProductId', + placeholderProductName: 'Enter ProductName', + placeholderQuantity: 'Enter Quantity', + placeholderUnit: 'Enter Unit', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnSave: 'Save', + btnExport: 'Export', + btnImport: 'Import', + btnSubmit: 'Submit', + btnConfirm: 'Confirm', + btnCancel: 'Cancel', + btnClose: 'Close', + btnRemark: 'Remark', + btnAddOrBinding: 'Add/Binding', + btnDeleteOrUnbinding: 'Delete/Unbinding', + btnDetails:'Details', + + //--------------交互文本-------------- + //--------------提示信息-------------- + addSuccessInfo: 'Add Success', + editSuccessInfo: 'Edit Success', + deleteSuccessInfo: 'Delete Success', + + //---getList--- + textErrorForGetPortName: 'Failed to get PortName!', + textErrorForRequestException: 'Request exception and check the network', + + //---handleDelete--- + textDeleteConfirm1: 'Are you sure to delete the data item with ContainerId "', + textDeleteConfirm2: '"?', + + //---子页面--- + textDeleteDetailsConfirm1: 'Are you sure to delete the data item with Id "', + textDeleteDetailsConfirm2: '"?', + + //--------------其他-------------- + lblWidthSearch: '100px', + lblWidthDialog: '110px', + }, + //=====================系统管理：用户管理===================== systemManagement_UserManagement: { //--------------数据表标题-------------- @@ -1600,7 +1687,7 @@ export default { MainTitle: 'MainTitle', //---函数：handleDelete--- - textDeleteConfirm1: 'Are you sure to delete the data item with menu name "', + textDeleteConfirm1: 'Are you sure to delete the data item with MenuName "', textDeleteConfirm2: '"?', //--------------操作提示-------------- diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 307aa56..99f8d3c 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 { status } from 'nprogress' // import { Dialog } from 'element-ui' export default { @@ -814,7 +815,7 @@ export default { priceRequired: '价格不能为空' }, - // *************供应商管理*************** + // *************基础信息：供应商管理*************** BasPort: { portName: '点位名称', inputPortName: '请输入点位名称', @@ -1004,6 +1005,9 @@ export default { ManagementOfInboundDocuments: "入库单据管理", InboundTaskManagement: "入库作业管理", + //********************基础信息******************** + //容器管理 + ContainerManagement: '容器管理', //********************仓库管理******************** WarehouseManagement: '仓库管理', @@ -1011,12 +1015,41 @@ export default { WarehouseAreaManagement: '库区管理', //货位管理 CargoSpaceManagement: '货位管理', + //********************出库管理******************** outboundManagement: '出库管理', createNewOutboundDocument: '新建出库单据', outboundDocumentManagement: '出库单据管理', outboundTaskManagement: '出库作业管理', + //********************KPI分析******************** + KPIAnalysis: 'KPI分析', + // 入库分析 + KPIAnalysis_StockIn: '入库分析', + // 出库分析 + KPIAnalysis_StockOut: '出库分析', + // 巷道分布 + KPIAnalysis_Roadway: '巷道分布', + // 货位分析 + KPIAnalysis_CargoSpace: '货位分析', + // 库存平面图 + KPIAnalysis_CargoPlan: '库存平面图', + + //********************系统监控******************** + SystemMonitor: '系统监控', + // 在线用户 + SystemMonitor_Online: '在线用户', + // 定时任务 + SystemMonitor_ScheduledTask: '定时任务', + // 数据监控 + SystemMonitor_DataMonitor: '数据监控', + // 服务监控 + SystemMonitor_ServiceMonitor: '服务监控', + // 缓存监控 + SystemMonitor_CacheMonitor: '缓存监控', + // 缓存列表 + SystemMonitor_CacheList: '缓存列表', + //********************系统管理******************** SystemManagement: '系统管理', //用户管理 @@ -1042,34 +1075,6 @@ export default { //登录日志 LogManagement_LoginLog: '操作日志', - //********************系统监控******************** - SystemMonitor: '系统监控', - // 在线用户 - SystemMonitor_Online: '在线用户', - // 定时任务 - SystemMonitor_ScheduledTask: '定时任务', - // 数据监控 - SystemMonitor_DataMonitor: '数据监控', - // 服务监控 - SystemMonitor_ServiceMonitor: '服务监控', - // 缓存监控 - SystemMonitor_CacheMonitor: '缓存监控', - // 缓存列表 - SystemMonitor_CacheList: '缓存列表', - - //********************KPI分析******************** - KPIAnalysis: 'KPI分析', - // 入库分析 - KPIAnalysis_StockIn: '入库分析', - // 出库分析 - KPIAnalysis_StockOut: '出库分析', - // 巷道分布 - KPIAnalysis_Roadway: '巷道分布', - // 货位分析 - KPIAnalysis_CargoSpace: '货位分析', - // 库存平面图 - KPIAnalysis_CargoPlan: '库存平面图', - // ****************盘点管理****************** inventoryManagement: '盘点管理', @@ -1245,6 +1250,89 @@ export default { lockedIsNull: '是否可用不能为空', }, + //=====================基础信息:容器管理===================== + bas_ContainerManagement: { + //--------------标题-------------- + addContainerItem: '添加容器管理', + editContainerItem: '修改容器管理', + + //--------------子页面标题-------------- + addContainerDetailsItem: '添加容器明细', + editContainerDetailsItem: '修改容器明细', + + //--------------字段名-------------- + containerId: '容器编号', + portName: '点位名称', + status: '容器状态', + productTypeQuantity: '物料种类', + capacity: '容量', + createTime: '创建时间', + updateTime: '更新时间', + operationMan: '操作人', + operation: '人工操作', + + //--------------子页面字段-------------- + id: '序号', + productId: '物料编码', + productName: '物料名称', + quantity: '数量', + unit: '单位', + + //--------------文本框输入提示-------------- + placeholderContainerId: '请输入容器编号', + placeholderPortName: '请选择点位名称', + placeholderStatus: '请选择容器状态', + placeholderProductTypeQuantity: '请输入物料种类', + placeholderCapacity: '请选择料架容量', + placeholderOperationMan: '请输入操作人', + + //--------------子页面输入提示-------------- + placeholderProductId: '请输入物料编码', + placeholderProductName: '请输入物料名称', + placeholderQuantity: '请输入数量', + placeholderUnit: '请输入单位', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnExport: '导出', + btnImport: '导入', + btnSubmit: '提交', + btnConfirm: '确定', + btnCancel: '取消', + btnClose: '关闭', + btnRemark: '备注', + btnAddOrBinding: '新增/绑定', + btnDeleteOrUnbinding: '删除/解绑', + btnDetails:'详情', + + //--------------交互文本-------------- + //--------------提示信息-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + + //---getList--- + textErrorForGetPortName: '获取点位名称失败！', + textErrorForRequestException: '请求异常，请检查网络！', + + //---handleDelete--- + textDeleteConfirm1: '是否确认删除容器管理编号为"', + textDeleteConfirm2: '"的数据项？', + + //---子页面--- + textDeleteDetailsConfirm1: '是否确认删除容器物料明细编号为"', + textDeleteDetailsConfirm2: '"的数据项？', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '80px', + + }, + //=====================系统管理:用户管理===================== systemManagement_UserManagement: { //--------------数据表标题-------------- diff --git a/ruoyi-ui/src/views/bas/container/index.vue b/ruoyi-ui/src/views/bas/container/index.vue index 7dc9896..6adf28c 100644 --- a/ruoyi-ui/src/views/bas/container/index.vue +++ b/ruoyi-ui/src/views/bas/container/index.vue @@ -1,16 +1,18 @@ @@ -220,7 +249,7 @@ export default { operationMan: null, }, portNameOptions: [], - statusOptions: ['空', '有货'], + // statusOptions: ['空', '有货'], // 表单参数 form: {}, // 表单校验 @@ -251,11 +280,13 @@ export default { this.portNameOptions = Array.isArray(res.data) ? [...res.data] : []; // console.log(this.portNameOptions); } else { - this.$message.error('获取点位名称失败'); + // 获取点位名称失败 + this.$message.error(this.$t('bas_ContainerManagement.textErrorForGetPortName')); } }) .catch(error => { - this.$message.error('请求异常，请检查网络'); + // 请求异常 + this.$message.error(this.$t('bas_ContainerManagement.textErrorForRequestException')); console.error(error); }); @@ -304,7 +335,8 @@ export default { this.reset() this.containerIdIsEnabled = true this.open = true - this.title = "添加容器管理" + // 标题：添加容器管理 + this.title = this.$t('bas_ContainerManagement.addContainerItem') }, /** 修改按钮操作 */ handleUpdate(row) { @@ -314,7 +346,8 @@ export default { this.form = response.data this.containerIdIsEnabled = false this.open = true - this.title = "修改容器管理" + // 标题：修改容器管理 + this.title = this.$t('bas_ContainerManagement.editContainerItem') }) }, /** 详情按钮操作 */ @@ -331,9 +364,11 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - if (this.title === "修改容器管理") { + // 标题：修改容器管理 + if (this.title === this.$t('bas_ContainerManagement.editContainerItem')) { updateContainer(this.form).then(response => { - this.$modal.msgSuccess("修改成功") + // 提示信息：修改成功 + this.$modal.msgSuccess(this.$t('bas_ContainerManagement.editSuccessInfo')) this.open = false this.getList() }) @@ -342,7 +377,8 @@ export default { this.form.productTypeQuantity = '3'; this.form.capacity = 10; addContainer(this.form).then(response => { - this.$modal.msgSuccess("新增成功") + // 提示信息：新增成功 + this.$modal.msgSuccess(this.$t('bas_ContainerManagement.addSuccessInfo')) // console.log(this.form.containerId + this.form.portName +this.form.operationMan); this.open = false this.getList() @@ -354,11 +390,13 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const containerIds = row.containerId || this.ids - this.$modal.confirm('是否确认删除容器管理编号为"' + containerIds + '"的数据项？').then(function() { + // 提示信息：是否确认删除容器编号为" + containerIds + "的数据项？ + this.$modal.confirm(this.$t('bas_ContainerManagement.textDeleteConfirm1') + containerIds + this.$t('bas_ContainerManagement.textDeleteConfirm2')).then(function() { return delContainer(containerIds) }).then(() => { this.getList() - this.$modal.msgSuccess("删除成功") + // 提示信息：删除成功 + this.$modal.msgSuccess(this.$t('bas_ContainerManagement.deleteSuccessInfo')) }).catch(() => {}) }, /** 导出按钮操作 */ diff --git a/ruoyi-ui/src/views/bas/containerDetails/index.vue b/ruoyi-ui/src/views/bas/containerDetails/index.vue index 268a85e..448bb65 100644 --- a/ruoyi-ui/src/views/bas/containerDetails/index.vue +++ b/ruoyi-ui/src/views/bas/containerDetails/index.vue @@ -1,78 +1,86 @@