YT-683WMS05.线边退料需求及变更

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>

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>

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 ==
+									this.managementType = this.managementList&&this.managementList[0]&&this.managementList[0].ManagementPrecision
-										'BY_BATCH') ? 'BY_BATCH' : ''
+									this.managementType = 'BY_QUANTITY'
-										if(this.managementType == 'BY_BATCH'){
+									if(this.managementType == 'BY_BATCH'){
-											that.detailSource.forEach(item=>{
+										that.detailSource.forEach(item=>{
-												item.subList.forEach(cur=>{
+											item.subList.forEach(cur=>{
-													cur.packingNumber=''
+												cur.packingNumber=''
-													cur.toPackingNumber=''
+												cur.toPackingNumber=''
-													cur.fromPackingNumber=''
+												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 {