From 29342c920ff848375141101f23de21d24e768ffb Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Sat, 4 Oct 2025 14:24:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/production/production-issue.js | 2 +- src/router/index.js | 2 +- .../modules/production-issue/directIssue.vue | 16 +++++++-------- .../production-issue/directIssueDetail.vue | 20 ++++++++++++------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/api/production/production-issue.js b/src/api/production/production-issue.js index 9a5d6db..0c36b64 100644 --- a/src/api/production/production-issue.js +++ b/src/api/production/production-issue.js @@ -26,7 +26,7 @@ export const validateWorkOrder = data => createAPI(`/pda/production/issue/valida // 验证申请单状态 export const validateNotify = data => createAPI(`/pda/production/issue/validateNotify`,'post',data) // 扫描材料是否存在 -export const scanMaterialLabelIssue = data => createAPI(`/pda/production/issue/scanMaterialLabelIssue`,'post',data) +export const scanMaterialLabelIssue = data => createAPI(`/pda/production/issue/scanMaterialLabel`,'post',data) // 获取工单列表 export const getIssureNotifyByNo = data => createAPI(`/pda/production/issue/getIssureNotifyByNo`,'post',data) // 获取工单列表 diff --git a/src/router/index.js b/src/router/index.js index 9c4a0bb..02a2138 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -51,7 +51,7 @@ const globalRoutes = [ { path: "/productionPicking", name: "productionPicking", component: resolve => require(["@/views/modules/production-issue/productionPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, { path: "/productionPickingDetail/:outboundNo", name: "productionPickingDetail", component: resolve => require(["@/views/modules/production-issue/productionPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, { path: "/directIssue", name: "directIssue", component: resolve => require(["@/views/modules/production-issue/directIssue.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, - { path: "/directIssueDetail/:workOrderNo/:partNo/:issueInfo", name: "directIssueDetail", component: resolve => require(["@/views/modules/production-issue/directIssueDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + { path: "/directIssueDetail", name: "directIssueDetail", component: resolve => require(["@/views/modules/production-issue/directIssueDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, //生产退料 {path: "/productionreturn",name: "productionreturn", component: resolve => require(["@/views/modules/production-return/production.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/productionReturnPicking", name: "productionReturnPicking", component: resolve => require(["@/views/modules/production-return/productionReturnPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, diff --git a/src/views/modules/production-issue/directIssue.vue b/src/views/modules/production-issue/directIssue.vue index c7418f4..1881ecb 100644 --- a/src/views/modules/production-issue/directIssue.vue +++ b/src/views/modules/production-issue/directIssue.vue @@ -260,18 +260,16 @@ export default { } this.$router.push({ name: "directIssueDetail", - params: { + query: { workOrderNo: this.selectedWorkOrder.orderNo, partNo: material.componentPartNo, itemNo: material.lineItemNo, - issueInfo:{ - releaseNo:this.selectedWorkOrder.releaseNo, - sequenceNo:this.selectedWorkOrder.sequenceNo, - requiredQty: material.qtyRequired, - issuedQty: material.qtyIssued || 0, - partDesc: material.componentPartDesc, - } - }, + releaseNo: this.selectedWorkOrder.releaseNo, + sequenceNo: this.selectedWorkOrder.sequenceNo, + requiredQty: material.qtyRequired, + issuedQty: material.qtyIssued || 0, + partDesc: material.componentPartDesc, + } }); }, }, diff --git a/src/views/modules/production-issue/directIssueDetail.vue b/src/views/modules/production-issue/directIssueDetail.vue index 01af054..45ca27e 100644 --- a/src/views/modules/production-issue/directIssueDetail.vue +++ b/src/views/modules/production-issue/directIssueDetail.vue @@ -253,13 +253,19 @@ export default { }) }, initFromRoute() { - this.workOrderNo = this.$route.params.workOrderNo - this.componentPartNo = this.$route.params.partNo - this.componentPartDesc = this.$route.params.issueInfo.partDesc || '' - this.requiredQty = this.$route.params.issueInfo.requiredQty - this.issuedQty = this.$route.params.issueInfo.issuedQty - this.itemNo = this.$route.params.itemNo || '' - this.issueInfo = this.$route.params.issueInfo + this.workOrderNo = this.$route.query.workOrderNo + this.componentPartNo = this.$route.query.partNo + this.componentPartDesc = this.$route.query.partDesc || '' + this.requiredQty = Number(this.$route.query.requiredQty || 0) + this.issuedQty = Number(this.$route.query.issuedQty || 0) + this.itemNo = this.$route.query.itemNo || '' + this.issueInfo = { + releaseNo: this.$route.query.releaseNo, + sequenceNo: this.$route.query.sequenceNo, + requiredQty: Number(this.$route.query.requiredQty || 0), + issuedQty: Number(this.$route.query.issuedQty || 0), + partDesc: this.$route.query.partDesc || '' + } /* if (!this.workOrderNo || !this.materialCode) { this.$message.error('参数错误')