diff --git a/pages/customerReturn/request/customerReturnRequest.vue b/pages/customerReturn/request/customerReturnRequest.vue index 1e976e3f..e9e50424 100644 --- a/pages/customerReturn/request/customerReturnRequest.vue +++ b/pages/customerReturn/request/customerReturnRequest.vue @@ -14,7 +14,6 @@ - diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue index 5cc879dc..97d1309c 100644 --- a/pages/inspect/job/inspectDetail.vue +++ b/pages/inspect/job/inspectDetail.vue @@ -282,6 +282,7 @@ itemDetail.scaned = true; itemDetail.handleQty = Number(result.label.qty) > Number(result.balance .qty) ? Number(result.balance.qty) : Number(result.label.qty); + itemDetail.balance = result.balance; this.calcHandleQty(); } else { this.scanPopupGetFocus(); @@ -289,6 +290,7 @@ }); } else { itemDetail.scaned = true; + itemDetail.balance = result.balance; itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number( result.balance.qty) : Number(result.label.qty); this.calcHandleQty(); @@ -430,6 +432,13 @@ detail.toInventoryStatus = "NOK" } } + + detail.singlePrice = detail.balance.singlePrice; + detail.amount = detail.balance.singlePrice * detail.handleQty; + + detail.arriveDate = detail.balance.arriveDate; + detail.produceDate = detail.balance.produceDate; + detail.expireDate = detail.balance.expireDate; list.push(detail) } }) diff --git a/pages/productionReturn/request/returnToStoreRequest.vue b/pages/productionReturn/request/returnToStoreRequest.vue index 002f607c..cfd869bf 100644 --- a/pages/productionReturn/request/returnToStoreRequest.vue +++ b/pages/productionReturn/request/returnToStoreRequest.vue @@ -14,9 +14,9 @@ - + @@ -205,7 +205,7 @@ openScanDetailPopup() { uni.navigateTo({ - url: "../record/returnToHold?fromType=" + this.fromType + url: "../record/returnToStore?fromType=" + this.fromType }) }, diff --git a/static/config.json b/static/config.json index b7d517fc..98262940 100644 --- a/static/config.json +++ b/static/config.json @@ -19,7 +19,8 @@ "request_url": { "name": "request_url", "value": "http://192.168.0.157:12080/admin-api", - "dev":"http://dev.ccwin-in.com:25100/api", + "dev2":"http://192.168.0.157:12080/admin-api", + "dev":"http://dev.ccwin-in.com:25100/api/admin-api", "local":"http://localhost:12080", "desc": "api请求地址" },