From f12df7b7b34c5bc346149af388de296ee304e47c Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Fri, 3 Oct 2025 16:40:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outsourcingDirectIssue.vue | 2 ++ .../outsourcingDirectIssueDetail.vue | 20 +++++++++++++------ .../outsourcingDirectIssueList.vue | 8 +++++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue index 746716a..896560a 100644 --- a/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue +++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue @@ -205,6 +205,8 @@ export default { partNo: material.partNo, outsourcingInfo:{ requiredQty: material.purchaseQty || 0, + lineNo: material.lineNo, + releaseNo: material.releaseNo, } }, diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue index aafd9a1..aa95eff 100644 --- a/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue +++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue @@ -115,7 +115,9 @@ export default { issuedQty: 0, itemNo: '', loading: false, - partNo:'' + partNo:'', + releaseNo:'', + lineNo:'' } }, computed: { @@ -205,10 +207,12 @@ export default { const params = { site: localStorage.getItem('site'), - outsourcingNo: this.outsourcingNo, + orderNo: this.outsourcingNo, componentPartNo: this.componentPartNo, operatorName: localStorage.getItem('userName'), itemNo: this.itemNo, + releaseNo: this.releaseNo, + lineNo: this.lineNo, selectedMaterials: this.scannedLabels.map((l, i) => ({ labelCode: l.labelCode, issueQty: l.quantity, @@ -245,14 +249,18 @@ export default { this.componentPartDesc = issueRecord.componentPartDescription || '' this.requiredQty = Number(issueRecord.requiredQty || this.$route.params.requiredQty || 0) this.issuedQty = Number(issueRecord.issuedQty || 0) - this.itemNo = issueRecord.itemNo || '' + this.releaseNo = issueRecord.releaseNo + this.lineNo = issueRecord.lineNo + this.itemNo = issueRecord.lineItemNo } 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.itemNo = this.$route.params.itemNo || '' + this.releaseNo = this.$route.params.releaseNo + this.lineNo = this.$route.params.lineNo + this.itemNo = this.$route.params.lineItemNo } }, }, @@ -420,7 +428,7 @@ export default { justify-content: space-between; padding: 6px 8px; background: white; - margin: 0 16px; + margin: 0 10px; margin-top: 4px; border-radius: 8px 8px 0 0; border-bottom: 2px solid #17B3A3; @@ -462,7 +470,7 @@ export default { } .label-list { background: white; - margin: 0 16px 12px; + margin: 0 10px 12px; border-radius: 8px; overflow: hidden; } diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssueList.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssueList.vue index 14617c3..76af190 100644 --- a/src/views/modules/outsourcing-issue/outsourcingDirectIssueList.vue +++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssueList.vue @@ -82,6 +82,8 @@ export default { requiredQty: 0, loading: false, issueList: [], + lineNo:'', + releaseNo:'', } }, methods: { @@ -116,7 +118,6 @@ export default { requiredQty: this.requiredQty, issuedQty: item.issuedQty || 0, issueRecord: { - itemNo: item.itemNo, orderType: 'outsourcing', transactionId: item.transactionId, quantity: item.quantity, @@ -125,6 +126,9 @@ export default { accountingId: item.accountingId, componentPartNo: item.componentPartNo, componentPartDescription: item.componentPartDescription, + lineNo: this.lineNo, + releaseNo: this.releaseNo, + lineItemNo:item.lineItemNo } }, }) @@ -134,6 +138,8 @@ export default { 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.loadIssueList() }, }