diff --git a/pages-order/orderList/orderList.vue b/pages-order/orderList/orderList.vue index 9e6b5e2..b46882e 100644 --- a/pages-order/orderList/orderList.vue +++ b/pages-order/orderList/orderList.vue @@ -121,9 +121,15 @@ export default { cusFromValueList:[''], // 客户来源选中下标 cusFromIndex:0, + twId: null, } }, - onLoad(){ + onLoad(data){ + if (data && data.twId){ + this.twId = data.twId + }else { + this.twId = null + } if(!getToken()){ uni.reLaunch({ url: '/pages/login/login' @@ -372,6 +378,9 @@ export default { userId: this.userInfo.id, soType: "01" } + if (this.twId){ + paramsObj.twId = this.twId + } request({ url: '/admin-api/repair/so/page', method: 'get', diff --git a/pages-warehouse/inOutWarehouse/inOutWarehouse.vue b/pages-warehouse/inOutWarehouse/inOutWarehouse.vue index 98f3001..6c8f43a 100644 --- a/pages-warehouse/inOutWarehouse/inOutWarehouse.vue +++ b/pages-warehouse/inOutWarehouse/inOutWarehouse.vue @@ -50,6 +50,7 @@ 采购 + 入库单 {{ isReceive ? '通知领料' : '通知退料' }} @@ -122,6 +123,11 @@ export default { computed: {}, methods: { + toInWares(){ + uni.navigateTo({ + url: '/pages-order/orderList/orderList?twId=' + this.twId + }) + }, async submitBefore(){ if (!this.selectRows || this.selectRows.length === 0){ uni.showToast({ diff --git a/pages-warehouse/inOutWarehouse/part.vue b/pages-warehouse/inOutWarehouse/part.vue index 0971f87..889de05 100644 --- a/pages-warehouse/inOutWarehouse/part.vue +++ b/pages-warehouse/inOutWarehouse/part.vue @@ -166,6 +166,7 @@ export default { if (getJSONData("applyWaresForm")) { this.formData = getJSONData("applyWaresForm") this.wares = this.formData.items + this.twId = this.formData.id this.init() } } @@ -387,6 +388,9 @@ export default { } })] data.waresList = [...values.map(item => item.wares)] + if (this.twId){ + data.twId = this.twId + } request({ url: '/admin-api/repair/so/create', method: 'post',