From 2d0f95fe5a3f4185b4f2cea39c62a43c7a11661c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 14 Nov 2024 18:30:31 +0800
Subject: [PATCH] =?UTF-8?q?YT-933=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E6=97=B6PDA=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/detail/comRecommendDetailCard.vue |  5 ++---
 src/pages/unPlanned/job/receiptJobDetail.vue       | 13 +++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/mycomponents/detail/comRecommendDetailCard.vue b/src/mycomponents/detail/comRecommendDetailCard.vue
index 4eda6a01..090774ac 100644
--- a/src/mycomponents/detail/comRecommendDetailCard.vue
+++ b/src/mycomponents/detail/comRecommendDetailCard.vue
@@ -13,14 +13,13 @@
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions"
 							style='padding:0px 0px  5px 0px;align-items: center;'>
-							
 							<view  v-if="item.isRecommend" class="uni-flex" style="flex-direction: row; align-items: center;">
 								<view class="" style="font-size: 32rpx; color: #3c9cff; font-weight: bold; text-align: center;padding: 10px;">
 									推<br/>
 									荐
 								</view>
 								
-								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation" style="flex:1">
+								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation" style="flex:1" :isShowBatch='item.isShowBatch'>
 								</recommend>
 							</view>
 							
@@ -30,7 +29,7 @@
 									际
 								</view>
 								
-								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation" style="flex:1">
+								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation" style="flex:1" :isShowBatch='item.isShowBatch'>
 								</recommend>
 							</view>
 							
diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index cee1ad27..34389bae 100644
--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@@ -17,7 +17,7 @@
 							:locationAreaTypeList='toLocationAreaTypeList'>
 						</com-receipt-detail-card> -->
 						<comRecommendDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail" :isShowFromLocation='false'>
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail" :isShowFromLocation='false' :isShowBatch='item.isShowBatch'>
 						</comRecommendDetailCard>
 					</view>
 					<view class='split_line'></view>
@@ -105,7 +105,7 @@
 				managementList: [],
 				managementType:'',
 				jobStatus: "",
-				jobToLocationCode: ""
+				jobToLocationCode: "",
 			};
 		},
 		onLoad(option) {
@@ -190,6 +190,13 @@
 							this.detailSource.forEach(item => {
 								itemCodes.push(item.itemCode)
 								item.scaned = false
+								item.subList.forEach((cur,index)=>{
+									if(index == 0){
+										console.log(222,cur)
+										cur.batch = ''
+									}
+									cur.isShowBatch = cur.batch ? true :false
+								})
 							})
 							getManagementPrecisions(itemCodes, that.jobToLocationCode, res => {
 								if (res.success) {
@@ -385,8 +392,6 @@
 							return;
 						}
 					}
-					console.log(11,scanCount)
-					console.log(11,this.subList.length)
 					if (scanCount < this.subList.length){
 						if(this.jobContent.allowPartialComplete == "TRUE"){
 							this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {