From 11598d0fe9e5a1e9339b17c5dbb0601d551fca10 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Apr 2024 16:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=B8=8A=E6=9E=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemCompareQty.vue      |  6 +-
 src/mycomponents/job/jobComMainDetailCard.vue | 79 +++++++++++++++++++
 src/mycomponents/qty/recommendQty.vue         |  6 +-
 src/pages/putaway/coms/comPutawayJobCard.vue  | 79 ++++++-------------
 src/pages/putaway/job/putawayJob.vue          |  4 +-
 5 files changed, 115 insertions(+), 59 deletions(-)
 create mode 100644 src/mycomponents/job/jobComMainDetailCard.vue

diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index 6d46301b..b1c6bf9a 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -4,7 +4,7 @@
 			<item :dataContent="dataContent"></item>
 		</view>
 		<view style="word-break: break-all;width: 50%;display: flex;justify-content:flex-end;margin-right: 10rpx;">
-			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack ="true"></recommend-qty>
+			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack ="true" :objTextStyle='objTextStyle'></recommend-qty>
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
 				:handleQty="Number(handleQty)" :isShowStatus="false"
 				:isShowPackUnit ="isShowPackUnit">
@@ -48,6 +48,10 @@
 			isShowPackUnit:{
 				type: Boolean,
 				default: true
+			},
+			objTextStyle:{
+				type: Object,
+				default: null
 			}
 		},
 		watch: {
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
new file mode 100644
index 00000000..464570e5
--- /dev/null
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="task_item">
+		<view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;">
+			<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"
+				:objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}"></itemCompareQty>
+			<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>
+				<div class="u-flex justify-between">
+					<location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode">
+					</location>
+					<!-- 	<to-location></to-location> -->
+					<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode">
+					</to-location>
+				</div>
+			</div>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import toLocation from '@/mycomponents/balance/toLocation.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			toLocation,
+			batch,
+			jobComMainCard,
+			itemCompareQty,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowContainer: {
+				type: Boolean,
+				default: true
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: true
+			},
+		},
+
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/qty/recommendQty.vue b/src/mycomponents/qty/recommendQty.vue
index ad328385..c96707ac 100644
--- a/src/mycomponents/qty/recommendQty.vue
+++ b/src/mycomponents/qty/recommendQty.vue
@@ -3,7 +3,7 @@
 		<status v-if="isShowStatus" :status='dataContent.inventoryStatus'></status>
 
 		<view class="uni-flex uni-row  center">
-			<view class="text_recommend ">
+			<view class="text_recommend " :style='objTextStyle'>
 				{{Number(dataContent.qty)}}
 			</view>
 			<!-- 	/{{Number(dataContent.packQty)}} -->
@@ -65,6 +65,10 @@
 			isShowStdPack: {
 				type: Boolean,
 				default: true
+			},
+			objTextStyle:{
+				type: Object,
+				default: null
 			}
 		},
 		watch: {
diff --git a/src/pages/putaway/coms/comPutawayJobCard.vue b/src/pages/putaway/coms/comPutawayJobCard.vue
index 88701f3a..27fcac4d 100644
--- a/src/pages/putaway/coms/comPutawayJobCard.vue
+++ b/src/pages/putaway/coms/comPutawayJobCard.vue
@@ -1,67 +1,17 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<view class="task_item" style="margin-left: 20rpx;">
-			<view class="task_text">
-				<view>
-					<view class="uni-flex u-col-center space-between">
-						<view>
-							<view class="card_itemCode">
-								065.120-11M
-							</view>
-							<view class="card_itemName">
-								PCMAKROLONAL2447透明
-							</view>
-						</view>
-						<view class="uni-flex uni-row ">
-							<view class="text_recommend ">
-								5
-							</view>
-							<view class="uom">
-								公斤
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view style="margin-left: 20rpx;">
-				<view class="task_text">
-					<view class="card_view">
-						<text class="card_packing_code card_content ">PN0401-000067</text>
-					</view>
-
-				</view>
-				<view class="task_text">
-					<view class="card_view ">
-						<text class="card_batch card_content ">20240331</text>
-						<!-- <text class="card_content ">20240331</text> -->
-					</view>
-				</view>
-				<view class="task_text">
-					<view>
-						<view class="uni-row space-between">
-							<view class="card_view ">
-								<text class="card_location card_content ">从  902</text>
-								<!-- <text class="card_content ">902</text> -->
-								<text class="card_to_location card_content ">到  N02-140-16</text>
-								<!-- <text class="card_content ">N02-140-16</text> -->
-							</view>
-						</view>
-						<view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
 	</job-com-main-card>
 </template>
 
 <script>
 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
-	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
+	
 	export default {
 		components: {
 			jobComMainCard,
-			itemCompareQty
+			jobComMainDetailCard
 		},
 		data() {
 			return {};
@@ -72,6 +22,26 @@
 				type: Object,
 				default: {}
 			},
+			isShowContainer: {
+				type: Boolean,
+				default: true
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: true
+			},
 		},
 
 		methods: {
@@ -81,5 +51,4 @@
 </script>
 
 <style lang="scss">
-
 </style>
\ No newline at end of file
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 14d8f9e2..1c52bbdc 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -177,7 +177,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './putawayDetail?id=' + item.id + '&status=' + item.status
+					url: './putawayDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -196,7 +196,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}