diff --git a/src/router/index.js b/src/router/index.js index 739f562..6b4a672 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,8 +58,8 @@ const globalRoutes = [ {path: "/productionReturnIssueList", name: "productionReturnIssueList", component: resolve => require(["@/views/modules/production-return/productionReturnIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, {path: "/productionReturnPickingDetail/:orderNo/:orderType/:partNo/:transactionId/:quantity/:batchNo", name: "productionReturnPickingDetail", component: resolve => require(["@/views/modules/production-return/productionReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, {path: "/productionReturnPDA", name: "productionReturnPDA", component: resolve => require(["@/views/modules/production-return/productionReturnPDA.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: false } }, - {path: "/productionReturnPDAList/:workOrderNo/:partNo/:unissureQty/:itemNo", name: "productionReturnPDAList", component: resolve => require(["@/views/modules/production-return/productionReturnPDAList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, - {path: "/productionReturnPDAIssueList/:workOrderNo/:material", name: "productionReturnPDAIssueList", component: resolve => require(["@/views/modules/production-return/productionReturnPDAIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + {path: "/productionReturnPDAList", name: "productionReturnPDAList", component: resolve => require(["@/views/modules/production-return/productionReturnPDAList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + {path: "/productionReturnPDAIssueList", name: "productionReturnPDAIssueList", component: resolve => require(["@/views/modules/production-return/productionReturnPDAIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, {path: '/production-return/pick/:orderNo', name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-return/pick.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, diff --git a/src/views/modules/production-return/production.vue b/src/views/modules/production-return/production.vue index 2c61b67..1c0f66e 100644 --- a/src/views/modules/production-return/production.vue +++ b/src/views/modules/production-return/production.vue @@ -31,7 +31,7 @@ export default { data() { return { buttons: [ - { icon: 'scan', label: '直接退料', iconClass: 'direct', to: 'productionReturnPicking', disabled: false }, + { icon: 'scan', label: '直接退料', iconClass: 'direct', to: 'productionReturnPicking', disabled: true }, { icon: 'records', label: '申请单退料', iconClass: 'request', to: 'productionReturnPDA', disabled: false }, { icon: 'logistics', label: '移库退料', iconClass: 'move', to: 'productionReturnPicking', disabled: true }, { icon: 'revoke', label: '退料撤销', iconClass: 'cancel', to: 'productionReturnPicking', disabled: true }, diff --git a/src/views/modules/production-return/productionReturnPDA.vue b/src/views/modules/production-return/productionReturnPDA.vue index 3bcffab..7740e33 100644 --- a/src/views/modules/production-return/productionReturnPDA.vue +++ b/src/views/modules/production-return/productionReturnPDA.vue @@ -252,7 +252,7 @@ export default { openReturnDetail(material) { this.$router.push({ name: 'productionReturnPDAList', - params: { + query: { notifyNo: this.selectedRequestMaterial.notifyNo, // 申请单号 itemNo: this.selectedRequestMaterial.itemNo, // 申请单行号 workOrderNo: this.selectedRequestMaterial.soorderNo, // 工单号 diff --git a/src/views/modules/production-return/productionReturnPDAIssueList.vue b/src/views/modules/production-return/productionReturnPDAIssueList.vue index 011ee1a..5f5c601 100644 --- a/src/views/modules/production-return/productionReturnPDAIssueList.vue +++ b/src/views/modules/production-return/productionReturnPDAIssueList.vue @@ -783,18 +783,18 @@ export default { mounted() { // 获取路由参数 - console.log('路由参数:', this.$route.params.material) - - this.orderNo = this.$route.params.workOrderNo - this.orderType = this.$route.params.material.orderType || 'workOrder' - this.partNo = this.$route.params.material.partNo - this.transactionId = this.$route.params.material.ifsTransactionID - this.accountingId = this.$route.params.material.ifsAccountingID - this.quantity = this.$route.params.material.quantity - this.batchNo = this.$route.params.material.batchNo - this.unissureQty = this.$route.params.material.unissureQty - this.itemNo = this.$route.params.material.itemNo - this.qtyReversed = this.$route.params.material.qtyReversed || 0 + console.log('路由参数:', this.$route.query.material) + + this.orderNo = this.$route.query.workOrderNo + this.orderType = this.$route.query.material.orderType || 'workOrder' + this.partNo = this.$route.query.material.partNo + this.transactionId = this.$route.query.material.ifsTransactionID + this.accountingId = this.$route.query.material.ifsAccountingID + this.quantity = this.$route.query.material.quantity + this.batchNo = this.$route.query.material.batchNo + this.unissureQty = this.$route.query.material.unissureQty + this.itemNo = this.$route.query.material.itemNo + this.qtyReversed = this.$route.query.material.qtyReversed || 0 if (!this.orderNo) { this.$message.error('参数错误') diff --git a/src/views/modules/production-return/productionReturnPDAList.vue b/src/views/modules/production-return/productionReturnPDAList.vue index 5ac10bc..b7692f3 100644 --- a/src/views/modules/production-return/productionReturnPDAList.vue +++ b/src/views/modules/production-return/productionReturnPDAList.vue @@ -109,7 +109,7 @@ export default { goDetail(item) { this.$router.push({ name: 'productionReturnPDAIssueList', - params: { + query: { workOrderNo: this.workOrderNo, material:{ itemNo: this.itemNo, @@ -127,10 +127,10 @@ export default { }, }, mounted() { - this.workOrderNo = this.$route.params.workOrderNo; - this.partNo = this.$route.params.partNo; - this.unissureQty = this.$route.params.unissureQty; - this.itemNo = this.$route.params.itemNo; + this.workOrderNo = this.$route.query.workOrderNo; + this.partNo = this.$route.query.partNo; + this.unissureQty = this.$route.query.unissureQty; + this.itemNo = this.$route.query.itemNo; this.loadIssueList(); }, };