From 4a9fea2be73fcd48575e02144b78cfcbf87a70f3 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Sun, 5 Oct 2025 15:43:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E9=80=80=E6=96=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outsourcingDirectIssue.vue | 2 +- .../outsourcingDirectIssueDetail.vue | 28 +++++++++---------- .../outsourcingDirectIssueList.vue | 16 +++++------ .../outsourcing-return/outsourcingReturn.vue | 4 +-- .../outsourcingReturnPDAIssueList.vue | 18 ++++++------ 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue index 896560a..10de5e2 100644 --- a/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue +++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue @@ -200,7 +200,7 @@ export default { selectMaterial(material) { this.$router.push({ name: 'outsourcingDirectIssueList', - params: { + query: { outsourcingNo: this.selectedOrder.orderNo, partNo: material.partNo, outsourcingInfo:{ diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue index 5ef7651..6ceaafb 100644 --- a/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue +++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue @@ -2,7 +2,7 @@
-
+
委外直接发料
@@ -192,12 +192,12 @@ export default { }) .then(() => { this.scannedLabels = [] - this.$router.back() + this.$router.push({name:'outsourcingDirectIssue'}) this.$message.success('已清空') }) .catch(() => {}) } else { - this.$router.back() + this.$router.push({name:'outsourcingDirectIssue'}) } }, confirmIssue() { @@ -229,7 +229,7 @@ export default { .then(({ data }) => { if (data && data.code === 0) { this.$message.success('委外发料成功') - this.$router.back() + this.$router.push({name:'outsourcingDirectIssue'}) } else { this.$message.error(data.msg || '委外发料失败') } @@ -241,15 +241,15 @@ export default { }) }, initFromRoute() { - this.outsourcingNo = this.$route.params.outsourcingNo - this.partNo = this.$route.params.partNo + this.outsourcingNo = this.$route.query.outsourcingNo + this.partNo = this.$route.query.partNo // 如果存在发料记录信息，从中获取详细信息 - const issueRecord = this.$route.params.issueRecord + const issueRecord = this.$route.query.issueRecord if (issueRecord) { this.componentPartNo = issueRecord.componentPartNo this.componentPartDesc = issueRecord.componentPartDescription || '' - this.requiredQty = Number(issueRecord.requiredQty || this.$route.params.requiredQty || 0) + this.requiredQty = Number(issueRecord.requiredQty || this.$route.query.requiredQty || 0) this.issuedQty = Number(issueRecord.issuedQty || 0) this.releaseNo = issueRecord.releaseNo this.lineNo = issueRecord.lineNo @@ -257,12 +257,12 @@ export default { } else { // 兼容旧的参数结构 this.componentPartNo = issueRecord.componentPartNo - this.componentPartDesc = this.$route.params.componentPartDescription || '' - this.requiredQty = Number(this.$route.params.requiredQty || 0) - this.issuedQty = Number(this.$route.params.issuedQty || 0) - this.releaseNo = this.$route.params.releaseNo - this.lineNo = this.$route.params.lineNo - this.itemNo = this.$route.params.lineItemNo + this.componentPartDesc = this.$route.query.componentPartDescription || '' + this.requiredQty = Number(this.$route.query.requiredQty || 0) + this.issuedQty = Number(this.$route.query.issuedQty || 0) + this.releaseNo = this.$route.query.releaseNo + this.lineNo = this.$route.query.lineNo + this.itemNo = this.$route.query.lineItemNo } }, }, diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssueList.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssueList.vue index 76af190..f6a0814 100644 --- a/src/views/modules/outsourcing-issue/outsourcingDirectIssueList.vue +++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssueList.vue @@ -111,18 +111,18 @@ export default { goDetail(item) { this.$router.push({ name: 'outsourcingDirectIssueDetail', - params: { + query: { outsourcingNo: this.outsourcingNo, partNo: this.partNo, partDesc: item.partDesc || '', requiredQty: this.requiredQty, - issuedQty: item.issuedQty || 0, + issuedQty:item.qtyIssued, issueRecord: { orderType: 'outsourcing', transactionId: item.transactionId, quantity: item.quantity, batchNo: item.batchNo, - issuedQty: item.issuedQty || 0, + issuedQty: item.qtyIssued || 0, accountingId: item.accountingId, componentPartNo: item.componentPartNo, componentPartDescription: item.componentPartDescription, @@ -135,11 +135,11 @@ export default { }, }, mounted() { - this.outsourcingNo = this.$route.params.outsourcingNo - this.partNo = this.$route.params.partNo - this.requiredQty = this.$route.params.outsourcingInfo.requiredQty - this.lineNo = this.$route.params.outsourcingInfo.lineNo - this.releaseNo = this.$route.params.outsourcingInfo.releaseNo + this.outsourcingNo = this.$route.query.outsourcingNo + this.partNo = this.$route.query.partNo + this.requiredQty = this.$route.query.outsourcingInfo.requiredQty + this.lineNo = this.$route.query.outsourcingInfo.lineNo + this.releaseNo = this.$route.query.outsourcingInfo.releaseNo this.loadIssueList() }, } diff --git a/src/views/modules/outsourcing-return/outsourcingReturn.vue b/src/views/modules/outsourcing-return/outsourcingReturn.vue index 88ff55d..d0afcc0 100644 --- a/src/views/modules/outsourcing-return/outsourcingReturn.vue +++ b/src/views/modules/outsourcing-return/outsourcingReturn.vue @@ -44,11 +44,11 @@
-
库存数量
+
工单数量
{{ item.inventoryQty }}
-
已退数量
+
待接收数量
{{ item.invQtyToReceive || 0 }}
diff --git a/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue b/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue index f984ebf..efa2286 100644 --- a/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue +++ b/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue @@ -2,7 +2,7 @@
-
+
委外退料成功
@@ -66,9 +66,9 @@ 退料信息确认
-
+
@@ -304,7 +304,7 @@ export default { this.$message.success('操作成功') } else { - this.$message.error(data.message || '该标签不符合退料要求，请检查') + this.$message.error(data.msg || '该标签不符合退料要求，请检查') } }) .catch(() => { @@ -379,8 +379,8 @@ export default { return } - if(this.totalScannedQty > this.orderInfo.quantity){ - this.$message.warning('请先扫描退料数量大于发料数量') + if(this.totalScannedQty > this.unissureQty){ + this.$message.warning('请先扫描退料数量大于可退数量') return } @@ -440,13 +440,13 @@ export default { type: 'warning', }) .then(() => { - this.$router.back() + this.$router.push({ name: 'outsourcingReturn' }) }) .catch(() => { // 用户选择继续操作 }) } else { - this.$router.back() + this.$router.push({ name: 'outsourcingReturn' }) } }, @@ -557,7 +557,7 @@ export default { if (!this.orderNo) { this.$message.error('参数错误') - this.$router.back() + this.$router.push({ name: 'outsourcingReturn' }) return }