From 43d7444ffe2e2ef5f6f5187b7711f77a6e59fa42 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 11 Nov 2024 15:47:59 +0800
Subject: [PATCH] =?UTF-8?q?YT-683WMS05.=E7=BA=BF=E8=BE=B9=E9=80=80?=
 =?UTF-8?q?=E6=96=99=E9=9C=80=E6=B1=82=E5=8F=8A=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/job/jobComMainDetailCard.vue |  2 +-
 src/mycomponents/qty/recommendHandleQty.vue   |  3 +-
 .../productionReturn/job/okToReturnDetail.vue | 29 ++++++++++++-------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 29de7bb7..1b668e91 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -10,7 +10,7 @@
 			<div class="u-p-l-10">
 				<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber">
 				</pack>
-				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
+				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
 				<view class="u-flex u-row-between">
 					<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
 					</location>
diff --git a/src/mycomponents/qty/recommendHandleQty.vue b/src/mycomponents/qty/recommendHandleQty.vue
index 6263af6b..20ac670d 100644
--- a/src/mycomponents/qty/recommendHandleQty.vue
+++ b/src/mycomponents/qty/recommendHandleQty.vue
@@ -9,11 +9,12 @@
 			<view class="text_recommend ">
 				{{Number(dataContent.qty)}}
 			</view>
+			<uom :uom="dataContent.uom"></uom>
 		</view>
 
 		<view>
 			<pack-unit :dataContent="dataContent"></pack-unit>
-			<!-- 	<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
+				<!-- <std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
 		</view>
 	</view>
 </template>
diff --git a/src/pages/productionReturn/job/okToReturnDetail.vue b/src/pages/productionReturn/job/okToReturnDetail.vue
index 5a8ad359..8e5a865a 100644
--- a/src/pages/productionReturn/job/okToReturnDetail.vue
+++ b/src/pages/productionReturn/job/okToReturnDetail.vue
@@ -206,17 +206,26 @@
 							await getManagementPrecisions(itemCodes, that.fromLocationCode, res => {
 								if (res.success) {
 									this.managementList = res.list;
-									this.managementType = this.managementList.some(item => item.ManagementPrecision ==
-										'BY_BATCH') ? 'BY_BATCH' : ''
-										if(this.managementType == 'BY_BATCH'){
-											that.detailSource.forEach(item=>{
-												item.subList.forEach(cur=>{
-													cur.packingNumber=''
-													cur.toPackingNumber=''
-													cur.fromPackingNumber=''
-												})
+									this.managementType = this.managementList&&this.managementList[0]&&this.managementList[0].ManagementPrecision
+									this.managementType = 'BY_QUANTITY'
+									if(this.managementType == 'BY_BATCH'){
+										that.detailSource.forEach(item=>{
+											item.subList.forEach(cur=>{
+												cur.packingNumber=''
+												cur.toPackingNumber=''
+												cur.fromPackingNumber=''
 											})
-										}
+										})
+									}else if(this.managementType == 'BY_QUANTITY'){
+										that.detailSource.forEach(item=>{
+											item.subList.forEach(cur=>{
+												cur.packingNumber=''
+												cur.toPackingNumber=''
+												cur.fromPackingNumber=''
+												cur.batch=''
+											})
+										})
+									}
 								}
 							})
 						} else {