From 8f3b3264cb5f345ef3f982043f38b8d8fc21bd52 Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Wed, 10 Apr 2024 13:52:16 +0800
Subject: [PATCH] =?UTF-8?q?4.10=E9=87=8D=E5=BA=86=E4=BB=93=E5=82=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/http.js                                                  | 4 ++--
 manifest.json                                                 | 4 ++--
 pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue | 2 ++
 pages/crashExam/crashExam.vue                                 | 4 ++--
 pages/fixDetail/fixDetail.vue                                 | 1 -
 pages/numReceive/numReceive.vue                               | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apis/http.js b/apis/http.js
index bed4e96..6dce761 100644
--- a/apis/http.js
+++ b/apis/http.js
@@ -3,9 +3,9 @@ class HttpConfig {
 	baseUrl = "/api"
 	// #endif
 	// #ifdef APP-PLUS
-	baseUrl = "http://112.29.103.165:21624"
+	// baseUrl = "http://112.29.103.165:21624"
 	// baseUrl = "http://192.168.0.14:21624"
-	// baseUrl = "http://112.29.103.165:21626"
+	baseUrl = "http://112.29.103.165:21626"
 	// baseUrl = "http://172.20.10.3:8080"
 	// baseUrl = "http://10.40.92.13:8080"
 	// baseUrl = "http://10.40.92.75:8080"
diff --git a/manifest.json b/manifest.json
index 7f545ef..e5bf375 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "智慧仓储",
     "appid" : "__UNI__9D122E1",
     "description" : "",
-    "versionName" : "1.0.5",
-    "versionCode" : 105,
+    "versionName" : "1.0.6",
+    "versionCode" : 106,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
index 6201087..21017eb 100644
--- a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
+++ b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
@@ -145,6 +145,7 @@
 						taskId,
 						id,
 						typeId,
+						modelId,
 						manageType,
 						typeName,
 						typeCode,
@@ -154,6 +155,7 @@
 						taskId,
 						id,
 						typeId,
+						modelId,
 						manageType,
 						userId,
 						typeName,
diff --git a/pages/crashExam/crashExam.vue b/pages/crashExam/crashExam.vue
index ddd25e4..7137fce 100644
--- a/pages/crashExam/crashExam.vue
+++ b/pages/crashExam/crashExam.vue
@@ -34,10 +34,10 @@
 					<span>工机具类型</span>
 					<h4>{{ fetch.itemType }}</h4>
 				</view>
-				<view>
+				<!-- <view>
 					<span>报废数量</span>
 					<h4>{{ fetch.backTime }}</h4>
-				</view>
+				</view> -->
 				<view>
 					<span>申请日期</span>
 					<h4>{{ fetch.createTime }}</h4>
diff --git a/pages/fixDetail/fixDetail.vue b/pages/fixDetail/fixDetail.vue
index ed49ab7..a287baf 100644
--- a/pages/fixDetail/fixDetail.vue
+++ b/pages/fixDetail/fixDetail.vue
@@ -53,7 +53,6 @@
 					<uni-icons 
 						style="color: #AAAAAA; font-weight: bold;" 
 						type="closeempty" 
-						size="32"
 						@click="closePopup"
 					>
 					</uni-icons>
diff --git a/pages/numReceive/numReceive.vue b/pages/numReceive/numReceive.vue
index 9bd8e08..d14022c 100644
--- a/pages/numReceive/numReceive.vue
+++ b/pages/numReceive/numReceive.vue
@@ -112,7 +112,7 @@
 				let list = []
 				const baseInfo = {
 					parentId: this.upperInfo.id,
-					typeId: this.upperInfo.typeId,
+					typeId: this.upperInfo.modelId,
 					manageType: this.upperInfo.manageType,
 					createBy: this.upperInfo.userId
 				}