From ebd4bff71c3ef6bcb66573c1183ddfe0decb9b04 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 29 Jul 2025 11:32:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/lang/zh.js | 28 ++- ruoyi-ui/src/views/in/job/index.vue | 46 +---- ruoyi-ui/src/views/in/receive/index.vue | 154 +-------------- ruoyi-ui/src/views/in/stockIn/index.vue | 248 ++---------------------- 4 files changed, 56 insertions(+), 420 deletions(-) diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index b24e827..50fa9eb 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -88,8 +88,8 @@ export default { }, // ***************收货单据管理************* inReceiveStockin: { - stockinId: '入库订单ID', - inputstockinId: '请输入入库订单ID', + stockinId: '收货订单ID', + inputstockinId: '请输入收货订单ID', supplierNo: '供应商编码', selecInType: "请选择入库类型", inputSupplierNo: '请输入供应商编码', @@ -126,6 +126,13 @@ export default { totalPrice: '总价格', totalNetWeight: '总净重', grossWeight: '毛重', + deleteInfo1:'是否确认删除收货单据编号为"', + deleteInfo2:'"的数据项?', + deleteSuccess:'删除成功', + selectInspection:'请选择需要质检的记录', + selectNoInspection:'未找到需要质检的记录', + inspectionSuccess:'质检成功', + inspectionFail:'质检失败:', }, // ***************入库单据管理************* inStockin: { @@ -136,7 +143,17 @@ export default { printBarcode: '打印条码', finishDate: '完成日期', scanNum: '扫码数量', - assignNum: '实际数量' + assignNum: '实际数量', + invalidateSuccess:'作废成功', + alreadyReviewed:'单据已审核,请勿重复审核', + onlyUnreviewedCanInvalidate:'只有未审核的单据可以作废', + reviewSuccess:'审核成功', + confirmSuccess:'确认成功', + onlyUnconfirmedCanConfirm:'单据未执行完成', + printSuccess:'打印成功', + selectPrintData:'请选择要打印的数据', + printFail:'打印控件未安装或启动失败', + printFail1:'打印失败', }, // ***************入库作业管理************* inJob: { @@ -199,7 +216,10 @@ export default { englishDesc: '英文描述', cartonNo: '箱号', packingMethod: '包装方式', - createTime:"创建时间" + createTime:"创建时间", + selectPrintData:"请选择要操作的数据", + selectOnePrintData:"请选择一条任务", + operaSuccess:"操作成功", }, // ***************新建出库单据************** addOutStockout: { diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 0b85e86..1f40c75 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -95,14 +95,6 @@ /> - {{ $t('outJobManagement.search') }} {{ $t('outJobManagement.reset') }} @@ -130,16 +122,6 @@ v-hasPermi="['job:mydoJob:manualCompleted']" >{{ $t('outJobManagement.manualComplete') }} - @@ -316,18 +298,6 @@ export default { }, // 表单参数 form: {}, - // 表单校验 - rules: { - jobId: [ - { required: true, message: "任务ID不能为空", trigger: "blur" } - ], - status: [ - { required: true, message: "任务状态不能为空", trigger: "change" } - ], - taskNo: [ - { required: true, message: "任务号不能为空", trigger: "blur" } - ], - } } }, created() { @@ -426,11 +396,11 @@ export default { handleCompletedManually(row) { const jobIds = this.ids; if (jobIds.length === 0) { - this.$modal.msgError("请选择要操作的数据"); + this.$modal.msgError(this.$t('inJob.selectPrintData')); return; } if (jobIds.length > 1) { - this.$modal.msgError("请选择一条任务"); + this.$modal.msgError(this.$t('inJob.selectOnePrintData')); return; } var data = { @@ -439,20 +409,20 @@ export default { if (row.type === 'invalid'){ //手动作废 manualInvalidation(data).then(response => { - this.$modal.msgSuccess("操作成功"); + this.$modal.msgSuccess(this.$t('inJob.inJob.operaSuccess')); this.getList(); }) - - + + }else if (row.type === 'completed'){ //手动完成 manualCompleted(data).then(response => { - this.$modal.msgSuccess("操作成功"); + this.$modal.msgSuccess(this.$t('inJob.operaSuccess')); this.getList(); }) - + } - + }, /** 导出按钮操作 */ handleExport() { diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue index 7058a0e..6a2b260 100644 --- a/ruoyi-ui/src/views/in/receive/index.vue +++ b/ruoyi-ui/src/views/in/receive/index.vue @@ -1,105 +1,6 @@