From 69913f06c25a3d3f47ca1b1ca5af104769383b60 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 26 Dec 2023 17:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/balance/moveStatus.vue         | 21 ++++++++++++++-------
 mycomponents/status/status.vue              | 13 ++++++++++++-
 pages/inventoryMove/coms/comMovebalance.vue |  4 ++--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/mycomponents/balance/moveStatus.vue b/mycomponents/balance/moveStatus.vue
index a626435b..0122e4ce 100644
--- a/mycomponents/balance/moveStatus.vue
+++ b/mycomponents/balance/moveStatus.vue
@@ -1,14 +1,18 @@
 <template>
-	<view class="uni-inline-item" style="font-size: 30rpx;">
-		<view :class="statusStyle(fromInventoryStatus)">
+	<view class="uni-row uni-flex center" style="font-size: 30rpx;">
+		<!-- 	<view :class="statusStyle(fromInventoryStatus)">
 			•
 			{{statusDesc(fromInventoryStatus)}}
-		</view>
-		—>
-		<view :class="statusStyle(toInventoryStatus)">
+		</view> -->
+		<status :status='fromInventoryStatus'></status>
+		<text style="color:#909399 ; ">
+			—>
+		</text>
+		<status :status='toInventoryStatus'></status>
+		<!-- 	<view :class="statusStyle(toInventoryStatus)">
 			•
 			{{statusDesc(toInventoryStatus)}}
-		</view>
+		</view> -->
 	</view>
 
 </template>
@@ -18,8 +22,11 @@
 		getInventoryStatusStyle,
 		getInventoryStatusName
 	} from '@/common/directory.js';
+	import status from '@/mycomponents/status/status.vue'
 	export default {
-		components: {},
+		components: {
+			status
+		},
 
 		data() {
 			return {
diff --git a/mycomponents/status/status.vue b/mycomponents/status/status.vue
index e884b25e..b771d9e5 100644
--- a/mycomponents/status/status.vue
+++ b/mycomponents/status/status.vue
@@ -2,6 +2,9 @@
 	<view class="center" style="margin: 5rpx;">
 		<view :class="statusStyle(status)">
 			•
+			<text v-if="showDesc" >
+				{{statusDesc(status)}}
+			</text>
 		</view>
 	</view>
 </template>
@@ -9,6 +12,7 @@
 <script>
 	import {
 		getInventoryStatusStyle,
+		getInventoryStatusName
 	} from '@/common/directory.js';
 	export default {
 		data() {
@@ -22,11 +26,18 @@
 				type: String,
 				default: "1"
 			},
+			showDesc: {
+				type: Boolean,
+				default: false
+			},
 		},
 		methods: {
 			statusStyle: function(val) {
-				return  getInventoryStatusStyle(val);
+				return getInventoryStatusStyle(val);
 			},
+			statusDesc(value) {
+				return getInventoryStatusName(value)
+			}
 		}
 	}
 </script>
diff --git a/pages/inventoryMove/coms/comMovebalance.vue b/pages/inventoryMove/coms/comMovebalance.vue
index 12142f4f..03089c58 100644
--- a/pages/inventoryMove/coms/comMovebalance.vue
+++ b/pages/inventoryMove/coms/comMovebalance.vue
@@ -15,12 +15,12 @@
 					<compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty"
 						:handleQty="dataContent.record.qty" :isShowStdPack="isShowStdPack">
 					</compare-qty>
+					
 					<moveStatus v-if="dataContent.inventoryStatus!=dataContent.toInventoryStatus"
 						:fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus">
 					</moveStatus>
 					
-					<status :status='fromInventoryStatus'></status>
-					
+					<status v-else :status='fromInventoryStatus'></status>
 				</view>
 				<!-- <view class="" v-if="isDevlement()">
 					<view class="" style="font-size: 40rpx;">