From 02d3734e9fb290c96ee3492481d69104f093cd56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Thu, 5 Jun 2025 16:02:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8B5=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/lang/en.js | 371 +++++++++++--- ruoyi-ui/src/lang/zh.js | 477 +++++++++++++----- ruoyi-ui/src/views/check/create/index.vue | 84 ++- ruoyi-ui/src/views/check/difference/index.vue | 108 ++-- ruoyi-ui/src/views/check/job/in/index.vue | 204 ++++---- ruoyi-ui/src/views/check/job/out/index.vue | 214 ++++---- ruoyi-ui/src/views/check/stockCheck/index.vue | 93 ++-- 7 files changed, 1021 insertions(+), 530 deletions(-) diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 5915e5c..c5ac9f6 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -22,7 +22,7 @@ export default { sidebarLogo: 'Sidebar Logo' }, // ***************收货单据新增************* - receiveStockinAdd:{ + receiveStockinAdd: { title: 'Add Receive Stockin', warehouse: 'Warehouse', supplier: 'Supplier', @@ -79,7 +79,7 @@ export default { grossWeight: 'Gross Weight (KG)' }, // ***************收货单据管理************* - inReceiveStockin:{ + inReceiveStockin: { stockinId: 'Stockin Order ID', inputstockinId: 'Please input stockin order ID', supplierNo: 'Supplier Code', @@ -114,7 +114,7 @@ export default { selecInType: 'Please select stockin type', }, // ***************入库单据管理************* - inStockin:{ + inStockin: { selecInType: 'Please select stockin type', cancel: 'Cancel Document', examine: 'Document Review', @@ -166,7 +166,7 @@ export default { selectStatus: 'Please select Task Status', inputTaskNo: 'Please input Task No.', inputTrayCode: 'Please input Tray Code', - targetCargoSpaceId:'TargetCargoSpaceID', + targetCargoSpaceId: 'TargetCargoSpaceID', inputTargetCargoSpaceId: 'Please input Target Cargo Space ID', selectExecutionPhase: 'Please select Execution Phase', selectInOrOut: 'Please select Task Type', @@ -175,8 +175,8 @@ export default { inputEntranceId: 'Please input Entrance ID', inputExitId: 'Please input Exit ID' }, - - outStockoutManage:{ + // ***************出库单据管理************** + outStockoutManage: { stockoutId: 'Outbound Order ID', outType: 'Outbound Type', status: 'Document Status', @@ -210,7 +210,8 @@ export default { selectStatus: 'Please select document status', inputCustomerNo: 'Please input customer code' }, - addOutStockout:{ + // ***************新建出库单据************** + addOutStockout: { warehouse: 'Warehouse', selectWarehouse: 'Please select warehouse', customer: 'Customer', @@ -235,7 +236,7 @@ export default { confirm: 'Confirm', cancel: 'Cancel' }, - productAndStock:{ + productAndStock: { serialNumber: 'Serial Number1111111111', productId: 'Material Code', lotNo: 'Batch Number', @@ -252,6 +253,7 @@ export default { inputProductName: 'Please input material name', inputWarehouse: 'Please input warehouse' }, + // ***************出库作业管理************** outJobManagement: { // Status and Job Type status: 'Status', @@ -300,14 +302,248 @@ export default { manualComplete: 'Manual Complete', manualInvalidate: 'Manual Invalidate' }, + // *****************新建盘点单据*************** + checkCreate: { + warehouse: 'Warehouse', + selectWarehouse: 'Please select warehouse', + customer: 'Customer', + inputCustomerNo: 'Please input customer number', + documentType: 'Document Type', + selectDocumentType: 'Please select document type', + reset: 'Reset', + saveDocument: 'Save Document', + selectMaterial: 'Select Material', + recreateDocument: 'Recreate Document', + materialCode: 'Material Code', + materialName: 'Material Name', + batchNo: 'Batch No.', + inputBatchNo: 'Please input batch number', + quantity: 'Quantity', + operation: 'Operation', + delete: 'Delete', + inputMaterialCode: 'Please input material code', + inputMaterialName: 'Please input material name', + search: 'Search', + confirm: 'Confirm', + cancel: 'Cancel', + warehouseRequired: 'Please select warehouse', + customerRequired: 'Please input customer number', + documentTypeRequired: 'Please select document type', + selectMaterialRequired: 'Please select material', + materialExistWarning: 'Selected material already exists, please reselect', + quantityExceedError: 'Quantity cannot exceed stock quantity', + saveSuccess: 'Document {msg} saved successfully' + }, + //***************盘点单据管理*************** + checkStockCheck: { + stockCheckId: 'Stock Check ID', + inputStockCheckId: 'Please input stock check ID', + checkType: 'Check Type', + selectCheckType: 'Please select check type', + status: 'Status', + selectStatus: 'Please select status', + warehouse: 'Warehouse', + selectWarehouse: 'Please select warehouse', + search: 'Search', + reset: 'Reset', + invalidate: 'Invalidate', + review: 'Review', + confirm: 'Confirm', + warehouseId: 'Warehouse ID', + stockSource: 'Stock Source', + departmentNo: 'Department No', + createManId: 'Creator', + createDate: 'Create Date', + finishDate: 'Finish Date', + detailId: 'Detail ID', + mainId: 'Main ID', + lotNo: 'Lot No', + productId: 'Product ID', + materialDesc: 'Material Description', + englishDesc: 'English Description', + cartonNo: 'Carton No', + packingMethod: 'Packing Method', + quantity: 'Planned Quantity', + scanNum: 'Scanned Quantity', + assignNum: 'Actual Quantity', + stockCheckIdRequired: 'Stock check ID is required', + checkTypeRequired: 'Check type is required', + createDateRequired: 'Create date is required', + statusRequired: 'Status is required', + editSuccess: 'Edit successful', + addSuccess: 'Add successful', + invalidateSuccess: 'Invalidate successful', + onlyUnreviewedCanInvalidate: 'Only unreviewed documents can be invalidated', + alreadyReviewed: 'Document has been reviewed, please do not review again', + reviewSuccess: 'Review successful', + onlyUnreviewedCanReview: 'Only unreviewed documents can be reviewed', + confirmSuccess: 'Confirm successful', + onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed' + }, + // ***************盘点入库作业************* + checkJobIn: { + jobId: 'Task ID', + status: 'Task Status', + onLineType: 'Online Type', + jobType: 'Task Type', + taskNo: 'Task No.', + supplier: 'Supplier', + department: 'Department', + trayCode: 'Tray Code', + roadwayId: 'Roadway ID', + cargoSpace: 'Cargo Space', + targetRoadway: 'Target Roadway', + targetCargoSpace: 'Target Cargo Space', + lineId: 'Production Line ID', + workshopId: 'Workshop ID', + priority: 'Priority', + executionPhase: 'Execution Phase', + startTime: 'Start Time', + finishTime: 'Finish Time', + entrance: 'Entrance', + entranceId: 'Entrance ID', + exit: 'Exit', + exitId: 'Exit ID', + classId: 'Class ID', + warehouseId: 'Warehouse ID', + warehouse: 'Warehouse', + faultFlag: 'Fault Flag', + jobDetailId: 'Sub-task ID', + stockId: 'Stock ID', + lotNo: 'Lot No.', + inDate: 'Storage Time', + inOrOutId: 'Document ID', + inOrOutDId: 'Sub-document ID', + productGuid: 'Material GUID', + productId: 'Material Code', + stockStatus: 'Stock Status', + inQuantity: 'Storage Quantity', + printDate: 'Production Date', + supplierId: 'Supplier ID', + // 按钮和操作文本 + search: 'Search', + reset: 'Reset', + manualVoid: 'Manual Void', + manualFinish: 'Manual Complete', + // 输入框提示文本 + inputJobId: 'Please input Task ID', + selectStatus: 'Please select Task Status', + inputTaskNo: 'Please input Task No.', + inputTrayCode: 'Please input Tray Code', + inputTargetCargoSpace: 'Please input Target Cargo Space', + selectExecutionPhase: 'Please select Execution Phase', + selectJobType: 'Please select Task Type', + selectStartTime: 'Please select Start Time', + selectFinishTime: 'Please select Finish Time', + inputEntranceId: 'Please input Entrance ID', + inputExitId: 'Please input Exit ID', + inputWarehouseId: 'Please input Warehouse ID', + // 校验提示信息 + jobIdRequired: 'Task ID cannot be empty', + statusRequired: 'Task Status cannot be empty', + taskNoRequired: 'Task No. cannot be empty', + selectData: 'Please select data to operate' + }, + // **************盘点出库作业**************** + checkJobOut: { + jobId: 'Task ID', + status: 'Task Status', + onLineType: 'Online Type', + jobType: 'Task Type', + taskNo: 'Task No.', + supplierId: 'Supplier ID', + departmentId: 'Department ID', + trayCode: 'Tray Code', + roadwayId: 'Roadway ID', + cargoSpaceId: 'Cargo Space ID', + targetRoadwayId: 'Target Roadway ID', + targetCargoSpace: 'Target Cargo Space', + lineId: 'Production Line ID', + workshopId: 'Workshop ID', + priority: 'Priority', + executionPhase: 'Execution Phase', + startTime: 'Start Time', + finishTime: 'Finish Time', + entranceId: 'Entrance ID', + exitId: 'Exit ID', + classId: 'Class ID', + warehouse: 'Warehouse', + faultFlag: 'Fault Flag', + operation: 'Operation', + subJobId: 'Sub Task ID', + stockId: 'Stock ID', + batchNo: 'Batch No.', + inTime: 'In Time', + billId: 'Bill ID', + subBillId: 'Sub Bill ID', + materialGuid: 'Material GUID', + materialCode: 'Material Code', + stockStatus: 'Stock Status', + inQty: 'In Quantity', + productDate: 'Production Date', + search: 'Search', + reset: 'Reset', + manualFinish: 'Manual Finish', + manualInvalid: 'Manual Invalid', + inputJobId: 'Please input task ID', + selectStatus: 'Please select task status', + inputTaskNo: 'Please input task No.', + inputTrayCode: 'Please input tray code', + inputTargetCargoSpace: 'Please input target cargo space ID', + selectExecutionPhase: 'Please select execution phase', + selectJobType: 'Please select task type', + selectStartTime: 'Please select start time', + selectFinishTime: 'Please select finish time', + inputEntranceId: 'Please input entrance ID', + inputExitId: 'Please input exit ID', + inputWarehouseId: 'Please input warehouse ID', + selectData: 'Please select data to operate', + confirmFinish: 'Are you sure to manually finish the data with ID "{jobIds}"?', + finishSuccess: 'Manual finish successful', + confirmInvalid: 'Are you sure to manually invalid the data with ID "{jobIds}"?', + invalidSuccess: 'Manual invalid successful' + }, + // ****************盘点差异管理***************** + checkDifference: { + checkGuid: 'Check ID', + checkStockDetailId: 'Check Document ID', + stockId: 'Stock ID', + trayCode: 'Tray', + cargoSpaceId: 'Cargo Space ID', + productId: 'Product ID', + lotNo: 'Lot No.', + supplier: 'Supplier', + customer: 'Customer', + oldQuantity: 'Original Value', + newQuantity: 'New Value', + recordType: 'Operation Type', + productGuid: 'Product GUID', + operation: 'Operation', + edit: 'Edit', + delete: 'Delete', + search: 'Search', + reset: 'Reset', + confirm: 'Confirm', + cancel: 'Cancel', + inputCheckStockDetailId: 'Please enter check document ID', + inputStockId: 'Please enter stock ID', + inputTrayCode: 'Please enter tray', + inputCargoSpaceId: 'Please enter cargo space ID', + inputProductId: 'Please enter product ID', + inputLotNo: 'Please enter lot No.', + inputSupplier: 'Please enter supplier', + inputCustomer: 'Please enter customer', + inputOldQuantity: 'Please enter original value', + inputNewQuantity: 'Please enter new value', + inputProductGuid: 'Please enter product GUID' + }, menu: { //收货单据新增 InboundManagement: 'InboundManagement', - ReceivingDocumentsAdd:"ReceivingDocumentsAdd", - ReceiptDocumentManagement:"ReceiptDocumentManagement", - ManagementOfInboundDocuments:"ManagementOfInboundDocuments", - InboundTaskManagement:"InboundTaskManagement", - + ReceivingDocumentsAdd: "ReceivingDocumentsAdd", + ReceiptDocumentManagement: "ReceiptDocumentManagement", + ManagementOfInboundDocuments: "ManagementOfInboundDocuments", + InboundTaskManagement: "InboundTaskManagement", //********************仓库管理******************** @@ -317,33 +553,39 @@ export default { //货位管理 CargoSpaceManagement: 'CargoSpaceManagement', //********************出库管理******************** - outboundManagement:'outboundManagement', - createNewOutboundDocument:'createNewOutboundDocument', - outboundDocumentManagement:'outboundDocumentManagement', - outboundTaskManagement:'outboundTaskManagement', + outboundManagement: 'outboundManagement', + createNewOutboundDocument: 'createNewOutboundDocument', + outboundDocumentManagement: 'outboundDocumentManagement', + outboundTaskManagement: 'outboundTaskManagement', //********************系统管理******************** SystemManagement: 'SystemManagement', - //用户管理 - UserManagement: 'UserManagement', - //角色管理 - RoleManagement: 'RoleManagement', - //菜单管理 - MenuManagement: 'MenuManagement', - //部门管理 - DepartmentManagement: 'DepartmentManagement', - //岗位管理 - PostManagement: 'PostManagement', - //字典管理 - DictionaryManagement: 'DictionaryManagement', - //参数管理 - ParameterManagement: 'ParameterManagement', - //通知公告 - NoticeManagement: 'NoticeManagement', - //日志管理 - LogManagement: 'LogManagement', - + //用户管理 + UserManagement: 'UserManagement', + //角色管理 + RoleManagement: 'RoleManagement', + //菜单管理 + MenuManagement: 'MenuManagement', + //部门管理 + DepartmentManagement: 'DepartmentManagement', + //岗位管理 + PostManagement: 'PostManagement', + //字典管理 + DictionaryManagement: 'DictionaryManagement', + //参数管理 + ParameterManagement: 'ParameterManagement', + //通知公告 + NoticeManagement: 'NoticeManagement', + //日志管理 + LogManagement: 'LogManagement', + // ****************盘点管理****************** + inventoryManagement: 'inventoryManagement', + createNewInventoryDocument: 'createNewInventoryDocument', + inventoryDocumentManagement: 'inventoryDocumentManagement', + inventoryStorageTask: 'inventoryStorageTask', + inventoryOutboundTask: 'inventoryOutboundTask', + inventoryDiscrepancyManagement: 'inventoryDiscrepancyManagement' }, //=====================仓库（库区）管理===================== @@ -406,7 +648,7 @@ export default { }, //=====================货位管理===================== - cargoSpace:{ + cargoSpace: { //--------------数据表标题-------------- title: 'CargoSpace Management', cargoSpaceId: 'CargoSpaceId', @@ -489,9 +731,6 @@ export default { }, - - - //=====================系统管理===================== systemManagement_RoleManagement: { //--------------数据表标题-------------- @@ -546,37 +785,37 @@ export default { 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', + //---布局--- + 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', + //---函数：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:', + //---函数：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: '"?', + //---函数：handleDelete--- + textDeleteConfirm1: 'Is it confirmed to delete the data item with user number "', + textDeleteConfirm2: '"?', - //---函数：handleImport--- - textImportTitle: 'Import User Data', + //---函数：handleImport--- + textImportTitle: 'Import User Data', - //---函数：textUploadTitle--- - textImportResult: 'Result', + //---函数：textUploadTitle--- + textImportResult: 'Result', //--------------提示信息-------------- diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index af117e4..8588a0c 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -26,7 +26,7 @@ export default { sidebarLogo: '侧边栏 Logo' }, // ***************收货单据新增************* - receiveStockinAdd:{ + receiveStockinAdd: { title: '新增收货单据', warehouse: '仓库', supplier: '供应商', @@ -69,64 +69,64 @@ export default { totalAmount: '总金额', submit: '提交', selectProduct: '选择物料', - productId:'物料编码', - spare1:'英文描述', - spare2:'单件净重KG', - totalNetWeight:'总净重', - spare3:'箱号', - spare4:'包装方式', - spare5:'长MM', - spare6:'宽MM', - spare7:'高MM', - spare8:'体积m³', - netWeight:'净重KG', - grossWeight:'毛重KG' + productId: '物料编码', + spare1: '英文描述', + spare2: '单件净重KG', + totalNetWeight: '总净重', + spare3: '箱号', + spare4: '包装方式', + spare5: '长MM', + spare6: '宽MM', + spare7: '高MM', + spare8: '体积m³', + netWeight: '净重KG', + grossWeight: '毛重KG' }, // ***************收货单据管理************* - inReceiveStockin:{ - stockinId:'入库订单ID', - inputstockinId:'请输入入库订单ID', - supplierNo:'供应商编码', - selecInType:"请选择入库类型", - inputSupplierNo:'请输入供应商编码', - stockSource:'单据来源', - inputStockSource:'请输入单据来源', - warehouseId:'仓库', - selectWarehouseId:'请选择仓库', - status:'单据状态', - selectStatus:'请选择单据状态', - search:'搜索', - reset:'重置', - generateStockin:'生成入库单据', - delet:'删除', - inType:'入库类型', - createDate:'建立时间', - createManName:'创建人', - warehouseName:'仓库', - departmentName:'部门', - supplierName:'供应商', - testing:'质检', - stockinDetailId:'子单ID', - lotNo:'批次号', - productId:'物料编码', - materialDesc:'物料描述', - englishDesc:'英文描述', - cartonNo:'箱号', - packingMethod:'包装方式', - quantity:'计划数量', - stockStatus:'单据状态', - operate:'操作' + inReceiveStockin: { + stockinId: '入库订单ID', + inputstockinId: '请输入入库订单ID', + supplierNo: '供应商编码', + selecInType: "请选择入库类型", + inputSupplierNo: '请输入供应商编码', + stockSource: '单据来源', + inputStockSource: '请输入单据来源', + warehouseId: '仓库', + selectWarehouseId: '请选择仓库', + status: '单据状态', + selectStatus: '请选择单据状态', + search: '搜索', + reset: '重置', + generateStockin: '生成入库单据', + delet: '删除', + inType: '入库类型', + createDate: '建立时间', + createManName: '创建人', + warehouseName: '仓库', + departmentName: '部门', + supplierName: '供应商', + testing: '质检', + stockinDetailId: '子单ID', + lotNo: '批次号', + productId: '物料编码', + materialDesc: '物料描述', + englishDesc: '英文描述', + cartonNo: '箱号', + packingMethod: '包装方式', + quantity: '计划数量', + stockStatus: '单据状态', + operate: '操作' }, // ***************入库单据管理************* - inStockin:{ - selecInType:"请选择入库类型", - cancel:'单据作废', - examine:'单据审核', - confirm:'单据确认', - printBarcode:'打印条码', - finishDate:'完成日期', - scanNum:'扫码数量', - assignNum:'实际数量' + inStockin: { + selecInType: "请选择入库类型", + cancel: '单据作废', + examine: '单据审核', + confirm: '单据确认', + printBarcode: '打印条码', + finishDate: '完成日期', + scanNum: '扫码数量', + assignNum: '实际数量' }, // ***************入库作业管理************* inJob: { @@ -170,7 +170,7 @@ export default { selectStatus: '请选择任务状态', inputTaskNo: '请输入任务号', inputTrayCode: '请输入托盘码', - targetCargoSpaceId:'目标货位ID', + targetCargoSpaceId: '目标货位ID', inputTargetCargoSpaceId: '请输入目标货位ID', selectExecutionPhase: '请选择执行阶段', selectInOrOut: '请选择任务类型', @@ -179,7 +179,8 @@ export default { inputEntranceId: '请输入入口ID', inputExitId: '请输入出口ID' }, - addOutStockout:{ + // ***************新建出库单据************** + addOutStockout: { warehouse: '仓库', selectWarehouse: '请选择仓库', customer: '客户', @@ -204,7 +205,8 @@ export default { confirm: '确 定', cancel: '取 消' }, - outStockoutManage:{ + // ***************出库单据管理************** + outStockoutManage: { stockoutId: '出库单编号', outType: '出库类型', status: '单据状态', @@ -238,7 +240,7 @@ export default { selectStatus: '请选择单据状态', inputCustomerNo: '请输入客户编码' }, - productAndStock:{ + productAndStock: { serialNumber: '序号', productId: '物资编码', lotNo: '批号', @@ -255,6 +257,7 @@ export default { inputProductName: '请输入物资名称', inputWarehouse: '请输入仓库' }, + // ***************出库作业管理************** outJobManagement: { // 状态和作业类型 status: '状态', @@ -303,14 +306,248 @@ export default { manualComplete: '手动完成', manualInvalidate: '手动作废' }, - menu:{ - InboundManagement:"入库管理", + // *****************新建盘点单据*************** + checkCreate: { + warehouse: '仓库', + selectWarehouse: '请选择仓库', + customer: '客户', + inputCustomerNo: '请输入客户编号', + documentType: '单据类型', + selectDocumentType: '请选择单据类型', + reset: '重置', + saveDocument: '保存单据', + selectMaterial: '选择物资', + recreateDocument: '重新建单', + materialCode: '物资编号', + materialName: '物资名称', + batchNo: '批号', + inputBatchNo: '请输入批号', + quantity: '数量', + operation: '操作', + delete: '删除', + inputMaterialCode: '请输入物资编码', + inputMaterialName: '请输入物资名称', + search: '搜索', + confirm: '确定', + cancel: '取消', + warehouseRequired: '请选择仓库', + customerRequired: '请输入客户编号', + documentTypeRequired: '请选择单据类型', + selectMaterialRequired: '请选择物资', + materialExistWarning: '所选物资已存在，请重新选择', + quantityExceedError: '数量不能大于库存数量', + saveSuccess: '单据{msg}保存成功' + }, + //***************盘点单据管理*************** + checkStockCheck: { + stockCheckId: '盘点单据ID', + inputStockCheckId: '请输入盘点单据ID', + checkType: '盘库类型', + selectCheckType: '请选择盘库类型', + status: '状态', + selectStatus: '请选择状态', + warehouse: '仓库', + selectWarehouse: '请选择仓库', + search: '搜索', + reset: '重置', + invalidate: '单据作废', + review: '单据审核', + confirm: '单据确认', + warehouseId: '仓库ID', + stockSource: '单据来源', + departmentNo: '部门编码', + createManId: '创建人', + createDate: '建立时间', + finishDate: '完成日期', + detailId: '子单ID', + mainId: '主单ID', + lotNo: '批次号', + productId: '物料编码', + materialDesc: '物料描述', + englishDesc: '英文描述', + cartonNo: '箱号', + packingMethod: '包装方式', + quantity: '计划数量', + scanNum: '扫码数量', + assignNum: '实际数量', + stockCheckIdRequired: '盘点单据ID不能为空', + checkTypeRequired: '盘库类型不能为空', + createDateRequired: '建立时间不能为空', + statusRequired: '单据状态不能为空', + editSuccess: '修改成功', + addSuccess: '新增成功', + invalidateSuccess: '作废成功', + onlyUnreviewedCanInvalidate: '只有未审核的单据可以作废', + alreadyReviewed: '单据已审核，请勿重复审核', + reviewSuccess: '审核成功', + onlyUnreviewedCanReview: '只有未审核的单据可以审核', + confirmSuccess: '确认成功', + onlyReviewedCanConfirm: '只有已审核的单据可以确认' + }, + // ***************盘点入库作业************* + checkJobIn: { + jobId: '任务ID', + status: '任务状态', + onLineType: '上线类型', + jobType: '任务类型', + taskNo: '任务号', + supplier: '供应商', + department: '部门', + trayCode: '托盘码', + roadwayId: '巷道ID', + cargoSpace: '货位', + targetRoadway: '目标巷道', + targetCargoSpace: '目标货位', + lineId: '产线ID', + workshopId: '车间ID', + priority: '优先级', + executionPhase: '执行阶段', + startTime: '开始时间', + finishTime: '结束时间', + entrance: '入口', + entranceId: '入口ID', + exit: '出口', + exitId: '出口ID', + classId: '班组ID', + warehouseId: '仓库ID', + warehouse: '仓库', + faultFlag: '重分标记', + jobDetailId: '子任务ID', + stockId: '库存ID', + lotNo: '批次号', + inDate: '入库时间', + inOrOutId: '单据ID', + inOrOutDId: '子单据ID', + productGuid: '物料GUID', + productId: '物料编码', + stockStatus: '库存状态', + inQuantity: '入库数量', + printDate: '生产日期', + supplierId: '供应商ID', + // 按钮和操作文本 + search: '搜索', + reset: '重置', + manualVoid: '手动作废', + manualFinish: '手动完成', + // 输入框提示文本 + inputJobId: '请输入任务ID', + selectStatus: '请选择任务状态', + inputTaskNo: '请输入任务号', + inputTrayCode: '请输入托盘码', + inputTargetCargoSpace: '请输入目标货位', + selectExecutionPhase: '请选择执行阶段', + selectJobType: '请选择任务类型', + selectStartTime: '请选择开始时间', + selectFinishTime: '请选择结束时间', + inputEntranceId: '请输入入口ID', + inputExitId: '请输入出口ID', + inputWarehouseId: '请输入仓库ID', + // 校验提示信息 + jobIdRequired: '任务ID不能为空', + statusRequired: '任务状态不能为空', + taskNoRequired: '任务号不能为空', + selectData: '请选择要操作的数据' + }, + // **************盘点出库作业**************** + checkJobOut: { + jobId: '任务ID', + status: '任务状态', + onLineType: '上线类型', + jobType: '任务类型', + taskNo: '任务号', + supplierId: '供应商ID', + departmentId: '部门ID', + trayCode: '托盘码', + roadwayId: '巷道ID', + cargoSpaceId: '货位ID', + targetRoadwayId: '目标巷道ID', + targetCargoSpace: '目标货位', + lineId: '产线ID', + workshopId: '车间ID', + priority: '优先级', + executionPhase: '执行阶段', + startTime: '开始时间', + finishTime: '结束时间', + entranceId: '入口ID', + exitId: '出口ID', + classId: '班组ID', + warehouse: '仓库', + faultFlag: '重分标记', + operation: '操作', + subJobId: '子任务ID', + stockId: '库存ID', + batchNo: '批次号', + inTime: '入库时间', + billId: '单据ID', + subBillId: '子单据ID', + materialGuid: '物料GUID', + materialCode: '物料编码', + stockStatus: '库存状态', + inQty: '入库数量', + productDate: '生产日期', + search: '搜索', + reset: '重置', + manualFinish: '手动完成', + manualInvalid: '手动作废', + inputJobId: '请输入任务ID', + selectStatus: '请选择任务状态', + inputTaskNo: '请输入任务号', + inputTrayCode: '请输入托盘码', + inputTargetCargoSpace: '请输入目标货位ID', + selectExecutionPhase: '请选择执行阶段', + selectJobType: '请选择任务类型', + selectStartTime: '请选择开始时间', + selectFinishTime: '请选择结束时间', + inputEntranceId: '请输入入口ID', + inputExitId: '请输入出口ID', + inputWarehouseId: '请输入仓库ID', + selectData: '请选择要操作的数据', + confirmFinish: '是否确认手动完成编号为"{jobIds}"的数据项?', + finishSuccess: '手动完成成功', + confirmInvalid: '是否确认手动作废编号为"{jobIds}"的数据项?', + invalidSuccess: '手动作废成功' + }, + // ****************盘点差异管理***************** + checkDifference: { + checkGuid: '盘点id', + checkStockDetailId: '盘点单据id', + stockId: '库存id', + trayCode: '托盘', + cargoSpaceId: '货位id', + productId: '物料id', + lotNo: '批次号', + supplier: '供应商', + customer: '客户', + oldQuantity: '原值', + newQuantity: '新值', + recordType: '操作方式', + productGuid: '物料guid', + operation: '操作', + edit: '修改', + delete: '删除', + search: '搜索', + reset: '重置', + confirm: '确定', + cancel: '取消', + inputCheckStockDetailId: '请输入盘点单据id', + inputStockId: '请输入库存id', + inputTrayCode: '请输入托盘', + inputCargoSpaceId: '请输入货位id', + inputProductId: '请输入物料id', + inputLotNo: '请输入批次号', + inputSupplier: '请输入供应商', + inputCustomer: '请输入客户', + inputOldQuantity: '请输入原值', + inputNewQuantity: '请输入新值', + inputProductGuid: '请输入物料guid' +}, + menu: { + InboundManagement: "入库管理", //收货单据新增 ReceivingDocumentsAdd: '收货单据新增', - ReceiptDocumentManagement:"收货单据管理", - ManagementOfInboundDocuments:"入库单据管理", - InboundTaskManagement:"入库作业管理", - + ReceiptDocumentManagement: "收货单据管理", + ManagementOfInboundDocuments: "入库单据管理", + InboundTaskManagement: "入库作业管理", //********************仓库管理******************** @@ -320,32 +557,38 @@ export default { //货位管理 CargoSpaceManagement: '货位管理', //********************出库管理******************** - outboundManagement:'出库管理', - createNewOutboundDocument:'新建出库单据', - outboundDocumentManagement:'出库单据管理', - outboundTaskManagement:'出库作业管理', + outboundManagement: '出库管理', + createNewOutboundDocument: '新建出库单据', + outboundDocumentManagement: '出库单据管理', + outboundTaskManagement: '出库作业管理', //********************系统管理******************** SystemManagement: '系统管理', - //用户管理 - UserManagement: '用户管理', - //角色管理 - RoleManagement: '角色管理', - //菜单管理 - MenuManagement: '菜单管理', - //部门管理 - DepartmentManagement: '部门管理', - //岗位管理 - PostManagement: '岗位管理', - //字典管理 - DictionaryManagement: '字典管理', - //参数管理 - ParameterManagement: '参数管理', - //通知公告 - NoticeManagement: '通知公告', - //日志管理 - LogManagement: '日志管理', - + //用户管理 + UserManagement: '用户管理', + //角色管理 + RoleManagement: '角色管理', + //菜单管理 + MenuManagement: '菜单管理', + //部门管理 + DepartmentManagement: '部门管理', + //岗位管理 + PostManagement: '岗位管理', + //字典管理 + DictionaryManagement: '字典管理', + //参数管理 + ParameterManagement: '参数管理', + //通知公告 + NoticeManagement: '通知公告', + //日志管理 + LogManagement: '日志管理', + // ****************盘点管理****************** + inventoryManagement: '盘点管理', + createNewInventoryDocument: '新建盘点单据', + inventoryDocumentManagement: '盘点单据管理', + inventoryStorageTask: '盘点入库作业', + inventoryOutboundTask: '盘点出库作业', + inventoryDiscrepancyManagement: '盘点差异管理' }, @@ -490,11 +733,6 @@ export default { }, - - - - - //=====================系统管理:用户管理===================== systemManagement_RoleManagement: { //--------------数据表标题-------------- @@ -549,37 +787,37 @@ export default { editUserItem: '修改用户', //--------------提示文本-------------- - //---布局--- - textDragOrClick1: '将文件拖到此处，或', - textDragOrClick2: '点击上传', - textUpdateExistingData: '是否更新已经存在的用户数据？', - textUploadTip: '仅允许导入xls、xlsx格式文件。', - textDownloadTemplate: '下载模板', + //---布局--- + textDragOrClick1: '将文件拖到此处，或', + textDragOrClick2: '点击上传', + textUpdateExistingData: '是否更新已经存在的用户数据？', + textUploadTip: '仅允许导入xls、xlsx格式文件。', + textDownloadTemplate: '下载模板', - //---函数：handleStatusChange--- - textEnable: '启用', - textDisable: '禁用', - textUserConfirm1:"确认要\"", - textUserConfirm2:"\"用户吗？", - textSuccess: '成功', + //---函数：handleStatusChange--- + textEnable: '启用', + textDisable: '禁用', + textUserConfirm1: "确认要\"", + textUserConfirm2: "\"用户吗？", + textSuccess: '成功', - //---函数：handleResetPwd--- - textInputPassword1: '请输入', - textInputPassword2: '的新密码', - textTips: '提示', - textConfirm: '确认', - textCancel: '取消', - textResetPassword: '修改成功，新密码是：', + //---函数：handleResetPwd--- + textInputPassword1: '请输入', + textInputPassword2: '的新密码', + textTips: '提示', + textConfirm: '确认', + textCancel: '取消', + textResetPassword: '修改成功，新密码是：', - //---函数：handleDelete--- - textDeleteConfirm1: '是否确认删除用户编号为"', - textDeleteConfirm2: '"的数据项？', + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除用户编号为"', + textDeleteConfirm2: '"的数据项？', - //---函数：handleImport--- - textImportTitle: '导入成功', + //---函数：handleImport--- + textImportTitle: '导入成功', - //---函数：textUploadTitle--- - textImportResult: '导入结果', + //---函数：textUploadTitle--- + textImportResult: '导入结果', //--------------提示信息-------------- @@ -606,5 +844,4 @@ export default { }, - } diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 0d61eec..1de94cf 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -2,8 +2,8 @@
- - + + - + - - + + - 重置 - 保存单据 + {{ $t('checkCreate.reset') }} + {{ $t('checkCreate.saveDocument') }}
- 选择物资 - 重新建单 + {{ $t('checkCreate.selectMaterial') }} + {{ $t('checkCreate.recreateDocument') }}
- - - + + + - + - + - + - + - + - + @@ -97,27 +97,21 @@ /> --> - 搜索 - 重置 + {{ $t('checkCreate.search') }} + {{ $t('checkCreate.reset') }} - - - - - + + +
- 确 定 - 取 消 + {{ $t('checkCreate.confirm') }} + {{ $t('checkCreate.cancel') }}
@@ -139,13 +133,13 @@ // 表单验证规则 rules: { warehouseId: [ - { required: true, message: "请选择仓库", trigger: "change" } + { required: true, message: this.$t('checkCreate.warehouseRequired'), trigger: "change" } ], customerNo: [ - { required: true, message: "请输入客户编号", trigger: "blur" } + { required: true, message: this.$t('checkCreate.customerRequired'), trigger: "blur" } ], billType: [ - { required: true, message: "请选择单据类型", trigger: "change" } + { required: true, message: this.$t('checkCreate.documentTypeRequired'), trigger: "change" } ] }, // 主表数据 @@ -208,7 +202,7 @@ /** 确认选择物资 */ confirmSelectMaterials() { if (this.selectedMaterials.length === 0) { - this.$modal.msgError("请选择物资"); + this.$modal.msgError(this.$t('checkCreate.selectMaterialRequired')); return; } // 过滤掉已经存在的物资 @@ -217,7 +211,7 @@ }); if (newMaterials.length === 0) { - this.$modal.msgWarning("所选物资已存在，请重新选择"); + this.$modal.msgWarning(this.$t('checkCreate.materialExistWarning')); return; } @@ -260,7 +254,7 @@ // 如果修改后的数量大于初始数量，给出提示并重置为当前值 if (row.quantity > row.quantityOrignal) { - this.$modal.msgError("数量不能大于库存数量"); + this.$modal.msgError(this.$t('checkCreate.quantityExceedError')); row.quantity = row.quantityOrignal; } }, @@ -269,7 +263,7 @@ this.$refs.formRef.validate(valid => { if (valid) { if (this.materialList.length === 0) { - this.$modal.msgError("请选择物资"); + this.$modal.msgError(this.$t('checkCreate.selectMaterialRequired')); return; } const data = { @@ -279,7 +273,7 @@ // 这里需要调用保存接口 saveCheckStock(data).then(response => { console.log(response) - this.$modal.msgSuccess("单据"+response.msg+"保存成功"); + this.$modal.msgSuccess(this.$t('checkCreate.saveSuccess', { msg: response.msg })); this.$tab.refreshPage(this.$route); // this.reset(); }); diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue index b169cec..182b1bc 100644 --- a/ruoyi-ui/src/views/check/difference/index.vue +++ b/ruoyi-ui/src/views/check/difference/index.vue @@ -1,50 +1,50 @@