From 3390e51da8d1c3e0c7e9c7f375517a2c695aeed0 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 4 Jan 2024 16:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E8=AE=B0=E5=BD=95=E5=92=8C=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/balance/moveStatus.vue                 | 3 ++-
 pages/inventoryMove/coms/comInventoryDetailCard.vue | 2 +-
 pages/inventoryMove/coms/comMoveRecord.vue          | 2 +-
 static/config.json                                  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mycomponents/balance/moveStatus.vue b/mycomponents/balance/moveStatus.vue
index 6e23abe1..b65f39db 100644
--- a/mycomponents/balance/moveStatus.vue
+++ b/mycomponents/balance/moveStatus.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="uni-row uni-flex center" style="font-size: 30rpx;">
 		<status :status='fromInventoryStatus' :showDesc="true"></status>
-		<view class="uni-flex uni-row center" v-if='showToInventoryStatus  && toInventoryStatus!=fromInventoryStatus'>
+		<view class="uni-flex uni-row center"
+			v-if='showToInventoryStatus  && toInventoryStatus!="" &&   toInventoryStatus!=fromInventoryStatus'>
 			<text style="color:#909399 ; ">
 				—>
 			</text>
diff --git a/pages/inventoryMove/coms/comInventoryDetailCard.vue b/pages/inventoryMove/coms/comInventoryDetailCard.vue
index 820722f0..bf57a1c9 100644
--- a/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -17,7 +17,7 @@
 				<u-line />
 			</uni-collapse-item>
 		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			></win-scan-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
diff --git a/pages/inventoryMove/coms/comMoveRecord.vue b/pages/inventoryMove/coms/comMoveRecord.vue
index d206bac8..14e52727 100644
--- a/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/pages/inventoryMove/coms/comMoveRecord.vue
@@ -168,7 +168,7 @@
 			initData() {
 				if (this.businessTypeCode == "Move") {
 					this.title = "库存转移记录";
-					this.toInventoryStatus = "OK"
+					this.toInventoryStatus = ""
 					this.toLocationCode = ""
 				} else if (this.businessTypeCode == "HoldToOk") {
 					this.title = "隔离转合格记录";
diff --git a/static/config.json b/static/config.json
index 3f6576ad..6b485191 100644
--- a/static/config.json
+++ b/static/config.json
@@ -22,7 +22,7 @@
 			"dev2": "http://192.168.0.157: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",
+			"liuchen": "http://192.168.0.157:12080/admin-api",
 			"xuebing": "http://192.168.0.106:12080/admin-api",
 			"dev": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"local": "http://localhost:12080",