From f1d71b7339f7d4900f265a7ee393fe94dd5f7c40 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Dec 2023 09:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=96=99=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/balance/balance.vue            |  4 ++--
 mycomponents/record/recordComDetailCard.vue |  4 ++--
 pages/putaway/record/putawayRecord.vue      | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/mycomponents/balance/balance.vue b/mycomponents/balance/balance.vue
index 1d9e56ed..24244efd 100644
--- a/mycomponents/balance/balance.vue
+++ b/mycomponents/balance/balance.vue
@@ -4,7 +4,7 @@
 			<view>
 				<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
 				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
-				<location title="来源库位" v-if="isShowLocation" :locationCode="dataContent.locationCode"></location>
+				<location title="来源库位" v-if="isShowFromLocation" :locationCode="dataContent.locationCode"></location>
 				<location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode"></location>
 			</view>
 			<view>
@@ -61,7 +61,7 @@
 				type: Boolean,
 				default: true
 			},
-			isShowLocation: {
+			isShowFromLocation: {
 				type: Boolean,
 				default: true
 			},
diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index a27e9af7..393053e6 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -16,7 +16,7 @@
 						<uni-swipe-action-item @click="swipeClick($event,detail,index)"
 							:right-options="detail.scaned?scanOptions:detailOptions">
 							<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="true"
-								:isShowPack="true" :isShowLocation="isShowLocation"></balance>
+								:isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="true"></balance>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<!-- <u-line /> -->
@@ -73,7 +73,7 @@
 				default: false
 			},
 
-			isShowLocation: {
+			isShowFromLocation: {
 				type: Boolean,
 				default: true
 			},
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 93dd25a9..62fdf419 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -1,24 +1,26 @@
 <template>
 	<view class="page-wraper">
-		<view class="page-header">
 
-			<view class="header_item">
-				需求零件 : {{jobContent.requestNumber}}
-			</view>
-		</view>
 		<view class="">
 			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<u-line />
+			</view>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
-								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
 							</record-com-detail-card>
 						</view>
-						<u-line />
+
 					</view>
 				</scroll-view>
 			</view>
@@ -37,7 +39,8 @@
 			</view>
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'>
+		</win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationTypeList="fromlocationTypeList"></win-scan-location>