From 9436ab03877246dd893a0f9c61274d10c820ea90 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 28 Nov 2023 16:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=A3=80=E9=AA=8C=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/customerReturn/request/customerReturnRequest.vue  | 1 -
 pages/inspect/job/inspectDetail.vue                     | 9 +++++++++
 pages/productionReturn/request/returnToStoreRequest.vue | 4 ++--
 static/config.json                                      | 3 ++-
 4 files changed, 13 insertions(+), 4 deletions(-)

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 @@
 				</view>
 			</uni-swipe-action>
 			<uni-load-more :status="loadingType" v-if="requestList.length>0" />
-			<requestButton @goScan='openScanDetailPopup'></requestButton>
 			<request-info-popup ref='requestInfoPopup'></request-info-popup>
 		</view>
 		<comMessage ref="comMessage"></comMessage>
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 @@
 				</view>
 			</uni-swipe-action>
 			<uni-load-more :status="loadingType" />
-			
 			<request-info-popup ref='requestInfoPopup'></request-info-popup>
 		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
 	</view>
 	<comMessage ref="comMessage"></comMessage>
 </template>
@@ -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请求地址"
 		},