From 9507f591f076393d313f0ef141d0b08c23b66d28 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 26 Jun 2024 09:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E5=A4=96?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/balance/balance.vue       | 38 +++++++++++++++-------
 src/pages/unPlanned/record/issueRecord.vue |  4 +--
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index 3239f206..a1e31de1 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -2,28 +2,40 @@
 	<view :class="dataContent.scaned?'scan_view':''" style="background-color: #ffffff;margin-bottom: 1px; ">
 		<view class="uni-flex uni-row space-between" style="align-items: center">
 			<view>
-				<pack v-if="dataContent.parentNumber" title="父包装"  :packingCode="dataContent.parentNumber"></pack>
+				<pack v-if="dataContent.parentNumber" title="父包装" :packingCode="dataContent.parentNumber"></pack>
 				<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
 				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
 				<location title="来源库位" v-if="isShowFromLocation" :locationCode="dataContent.locationCode"></location>
 				<to-location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode">
 				</to-location>
 			</view>
-			<view class="uni-flex uni-row center">
-				<!-- 	<qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
-					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> -->
-				<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
-					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
-				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
-					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack"
-					:isShowStatus='isShowStatus'>
-				</compare-qty>
+			<view class="uni-flex" style="flex-direction: column;">
+				<view class="uni-flex uni-row center">
 
-				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
-					<text style="font-size: 30rpx;color: #2979ff;  width: 20px;" @click="copy">复制</text>
+
+					<!-- 	<qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
+						:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> -->
+					<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
+						:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
+					<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
+						:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack"
+						:isShowStatus='isShowStatus'>
+					</compare-qty>
+
+
+					<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
+						<text style="font-size: 30rpx;color: #2979ff;  width: 20px;" @click="copy">复制</text>
+					</view>
+				</view>
+				<view class="" v-if="dataContent.inventoryStatus">
+					<move-status :fromInventoryStatus="dataContent.inventoryStatus">
+					</move-status>
 				</view>
+
 			</view>
 
+
+
 		</view>
 		<!-- <u-line></u-line> -->
 	</view>
@@ -38,6 +50,7 @@
 	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
 	import config from '@/static/config.js'
+	import moveStatus from '@/mycomponents/balance/moveStatus.vue'
 
 	export default {
 		components: {
@@ -48,6 +61,7 @@
 			qty,
 			recommendQty,
 			compareQty,
+			moveStatus
 		},
 
 		data() {
diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue
index ffe8fda5..89e1fb3a 100644
--- a/src/pages/unPlanned/record/issueRecord.vue
+++ b/src/pages/unPlanned/record/issueRecord.vue
@@ -13,7 +13,7 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index"
 								@removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true"
-								@removePack="removePack">
+								@removePack="removePack" :isShowToLocation="false">
 							</record-com-detail-card>
 						</view>
 						<view class='split_line'></view>
@@ -151,7 +151,7 @@
 				if (item == undefined) {
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
-					newDetail.inventoryStatus ="OK";
+					// newDetail.inventoryStatus ="OK";
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {