diff --git a/src/router/index.js b/src/router/index.js index fa35142..c8398de 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,7 +36,7 @@ const globalRoutes = [ { path: "/salesReturn", name: "salesReturn", component: resolve => require(["@/views/modules/sales-return/sales-return.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, { path: "/salesReturnList", name: "salesReturnList", component: resolve => require(["@/views/modules/sales-return/salesReturnList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, { - path: "/salesReturnStorage/:returnNo/:partNo/:buNo", name: "SalesReturnStorage", + path: "/salesReturnStorage/:returnNo/:buNo", name: "SalesReturnStorage", component: resolve => require(["@/views/modules/sales-return/salesReturnStorage.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, @@ -44,7 +44,7 @@ const globalRoutes = [ { path: "/productionissue", name: "productionissue", component: resolve => require(["@/views/modules/production-issue/productionIssuePda.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, // 生产领料 - { path: "/production", name: "salesReturn", component: resolve => require(["@/views/modules/production-pick/production.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + { path: "/production", name: "production", component: resolve => require(["@/views/modules/production-pick/production.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, { path: "/productionPicking", name: "productionPicking", component: resolve => require(["@/views/modules/production-pick/productionPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, { path: "/productionPickingDetail/:buNo/:outboundNo", name: "productionPickingDetail", component: resolve => require(["@/views/modules/production-pick/productionPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, diff --git a/src/views/modules/production/productionInboundStorage.vue b/src/views/modules/production/productionInboundStorage.vue index 3a2e445..764d278 100644 --- a/src/views/modules/production/productionInboundStorage.vue +++ b/src/views/modules/production/productionInboundStorage.vue @@ -321,12 +321,10 @@ export default { this.$message.warning('请输入库位号'); return; } - const params = { site: this.materialInfo.site, buNo: this.materialInfo.buNo, inboundNo: this.inboundNo, - warehouseId: getCurrentWarehouse(), locationCode: this.locationCode.trim(), labels: this.labelList.map(label => ({ labelCode: label.labelCode, diff --git a/src/views/modules/purchase-inbound/inboundStorage.vue b/src/views/modules/purchase-inbound/inboundStorage.vue index c775c92..dda33c6 100644 --- a/src/views/modules/purchase-inbound/inboundStorage.vue +++ b/src/views/modules/purchase-inbound/inboundStorage.vue @@ -323,10 +323,9 @@ export default { return; } const params = { - site:this.materialInfo.site, + site: this.materialInfo.site, buNo: this.materialInfo.buNo, inboundNo: this.inboundNo, - warehouseId: getCurrentWarehouse(), locationCode: this.locationCode.trim(), labels: this.labelList.map(label => ({ labelCode: label.labelCode, diff --git a/src/views/modules/sales-return/salesReturnList.vue b/src/views/modules/sales-return/salesReturnList.vue index 2ca6977..fdd6150 100644 --- a/src/views/modules/sales-return/salesReturnList.vue +++ b/src/views/modules/sales-return/salesReturnList.vue @@ -164,12 +164,12 @@ export default { // 跳转到退货处理页面 goToReturnDetail(item) { + console.log(item) this.$router.push({ name: 'SalesReturnStorage', params: { buNo: item.buNo, returnNo: item.inboundNo, - partNo: item.partNo } }); } diff --git a/src/views/modules/sales-return/salesReturnStorage.vue b/src/views/modules/sales-return/salesReturnStorage.vue index ec24afe..992ffbe 100644 --- a/src/views/modules/sales-return/salesReturnStorage.vue +++ b/src/views/modules/sales-return/salesReturnStorage.vue @@ -33,7 +33,7 @@ -