diff --git a/src/router/index.js b/src/router/index.js index 624df66..5664cff 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/:partDesc/:requiredQty/:issuedQty", name: "directIssueDetail", component: resolve => require(["@/views/modules/production-issue/directIssueDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + { path: "/directIssueDetail/:workOrderNo/:partNo/:partDesc/:requiredQty/:issuedQty/:issueInfo", 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 f529471..afb0ddb 100644 --- a/src/views/modules/production-issue/directIssue.vue +++ b/src/views/modules/production-issue/directIssue.vue @@ -261,12 +261,16 @@ export default { this.$router.push({ name: "directIssueDetail", params: { - workOrderNo: this.selectedWorkOrder.orderNo+'-'+this.selectedWorkOrder.releaseNo+'-'+this.selectedWorkOrder.sequenceNo, + workOrderNo: this.selectedWorkOrder.orderNo, partNo: material.componentPartNo, partDesc: material.componentPartDesc, requiredQty: material.qtyRequired, issuedQty: material.qtyIssued || 0, itemNo: material.lineItemNo, + issueInfo:{ + releaseNo:this.selectedWorkOrder.releaseNo, + sequenceNo:this.selectedWorkOrder.sequenceNo + } }, }); }, diff --git a/src/views/modules/production-issue/directIssueDetail.vue b/src/views/modules/production-issue/directIssueDetail.vue index 0b4b957..d456f07 100644 --- a/src/views/modules/production-issue/directIssueDetail.vue +++ b/src/views/modules/production-issue/directIssueDetail.vue @@ -119,6 +119,7 @@ export default { issuedQty: 0, itemNo: '', loading: false, + issueInfo:{} } }, computed: { @@ -219,6 +220,8 @@ export default { componentPartNo: this.componentPartNo, operatorName: localStorage.getItem('userName'), itemNo: this.itemNo, + releaseNo:this.issueInfo.releaseNo, + sequenceNo:this.issueInfo.sequenceNo, selectedMaterials: this.scannedLabels.map((l, i) => ({ labelCode: l.labelCode, issueQty: l.quantity, @@ -251,6 +254,7 @@ export default { this.requiredQty = Number(this.$route.params.requiredQty || 0) this.issuedQty = Number(this.$route.params.issuedQty || 0) this.itemNo = this.$route.params.itemNo || '' + this.issueInfo = this.$route.params.issueInfo /* if (!this.workOrderNo || !this.materialCode) { this.$message.error('参数错误')