From e527858f21f3a6cbde63bfcfefe80f00f6d46676 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 26 Dec 2023 15:34:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E9=80=80?= =?UTF-8?q?=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/customerReturn/job/returnDetail.vue | 7 ++++--- static/config.json | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue index 04b46221..93c2d3e4 100644 --- a/pages/customerReturn/job/returnDetail.vue +++ b/pages/customerReturn/job/returnDetail.vue @@ -274,12 +274,12 @@ if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ - this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + - ']不一致,是否继续上架?', res => { + this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + ']不一致,是否继续退货?', res => { if (res) { itemDetail.scaned = true; itemDetail.handleQty = Number(result.balance.qty) - itemDetail.toInventoryStatus = result.balance.inventoryStatus; + itemDetail.inventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty) itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) @@ -403,6 +403,7 @@ detail.toContainerNumber = detail.containerNumber; detail.toBatch = info.batch; detail.toLocationCode = detail.toLocationCode; + detail.toInventoryStatus = 'HOLD'; subList.push(detail) } }) diff --git a/static/config.json b/static/config.json index 7426682e..310a012c 100644 --- a/static/config.json +++ b/static/config.json @@ -18,9 +18,9 @@ "request_url": { "name": "request_url", - "value": "http://dev.ccwin-in.com:25100/api/admin-api", + "value": "http://192.168.0.176:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", - "chefang": "http://192.168.0.180:12080/admin-api", + "chefang": "http://192.168.0.176:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", "liuchen": "http://192.168.0.159:12080/admin-api", "xuebing": "http://192.168.0.106:12080/admin-api",