From fedf07772caeb8d09a0a630a2b8f6a6bda4c245f Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 7 Aug 2024 10:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              | 11 +++++------
 src/pages/customerReturn/job/returnDetail.vue |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index bc989d6e..a216fad1 100644
--- a/.env.development
+++ b/.env.development
@@ -1,12 +1,11 @@
-VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
+VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
+VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
+VITE_TENANT='[{"text":"长春1379","value":1}]'
 
 # 是否是测试环境
-VITE_isDevelopment=false
-
+VITE_isDevelopment=true
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'
+VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 058553d6..824cde5c 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -252,7 +252,7 @@
 
 			getScanResult(result) {
 				try {
-					var packingNumber = result.balance.packingNumber;
+					var packingNumber = result.package.number;
 					var batch = result.balance.batch;
 					var qty = result.balance.qty;
 					var itemCode = result.balance.itemCode;