From 59c98e7748b1890a5625475ab7deb021d167aa6b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 24 Dec 2024 15:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E6=B7=BB=E5=8A=A0=E8=B4=A7?=
 =?UTF-8?q?=E6=9E=B6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/style/new_style.css                |  6 ++++++
 src/mycomponents/job/jobComMainDetailCard.vue |  9 ++++++++-
 src/mycomponents/workStation/workStation.vue  | 16 ++++++++++++----
 src/pages/issue/coms/comIssueJobCard.vue      |  8 ++++++--
 src/pages/issue/job/issueDetailBatch.vue      |  3 ++-
 src/pages/issue/job/issueJob.vue              |  2 +-
 6 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 0391c5ca..251857ce 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2097,6 +2097,12 @@ button::after {
 	font-size: 30rpx;
 }
 
+.card_packing_code1 {
+	color: rgb(24,173,240);
+	padding: 5px;
+	font-size: 30rpx;
+}
+
 .card_batch {
 	color: #9747FF;
 	padding: 5px;
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index f30c8508..be5e64e9 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -9,6 +9,7 @@
 				></itemCompareQty>
 				<!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" -->
 			<div class="u-p-l-10">
+				<goodsShelves v-if="isShowGoodsShelves && dataContent.itemGroup" :goodsShelves="dataContent.itemGroup"></goodsShelves>
 				<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber">
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
@@ -33,6 +34,7 @@
 	import toLocation from '@/mycomponents/balance/toLocation.vue'
 	import batch from '@/mycomponents/balance/batch.vue'
 	import intoDeliNo from '@/mycomponents/balance/intoDeliNo.vue'
+	import goodsShelves from '@/mycomponents/balance/goodsShelves.vue'
 	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
 	import level from '@/mycomponents/balance/level.vue'
 
@@ -44,7 +46,8 @@
 			batch,
 			intoDeliNo,
 			itemCompareQty,
-			level
+			level,
+			goodsShelves
 		},
 		data() {
 			return {};
@@ -91,6 +94,10 @@
 				type: Boolean,
 				default: false
 			},
+			isShowGoodsShelves:{
+				type:Boolean,
+				default:false
+			}
 		},
 
 
diff --git a/src/mycomponents/workStation/workStation.vue b/src/mycomponents/workStation/workStation.vue
index 799d3ffb..5988b949 100644
--- a/src/mycomponents/workStation/workStation.vue
+++ b/src/mycomponents/workStation/workStation.vue
@@ -22,10 +22,10 @@
 				<view class="text_lightblue">原料库位</view>
 				<view>{{ rawLocationCode }}</view>
 			</view>
-			<!-- 	<view class="cell_info">
-					<view class="text_lightblue">成品库位</view>
-					<view>{{ fgLocationCode }}</view>
-				</view> -->
+			<view class="cell_info" v-if="isShowItemGroup">
+				<view class="text_lightblue">货架号</view>
+				<view>{{ itemGroup }}</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -65,6 +65,14 @@
 				type: String,
 				default: ""
 			},
+			itemGroup: {
+				type: String,
+				default: ""
+			},
+			isShowItemGroup: {
+				type: Boolean,
+				default: false
+			},
 		},
 
 		methods: {}
diff --git a/src/pages/issue/coms/comIssueJobCard.vue b/src/pages/issue/coms/comIssueJobCard.vue
index bded9d84..8b518919 100644
--- a/src/pages/issue/coms/comIssueJobCard.vue
+++ b/src/pages/issue/coms/comIssueJobCard.vue
@@ -1,7 +1,7 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
 		
-		<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
+		<jobComMainDetailCard :dataContent="dataContent" :isShowGoodsShelves='isShowGoodsShelves'></jobComMainDetailCard>
 		
 		<view class="task_item" style="margin-left: 15px;">
 			<view class="task_text">
@@ -36,10 +36,14 @@
 				type: Object,
 				default: {}
 			},
+			isShowGoodsShelves:{
+				type:Boolean,
+				default:false
+			}
 		},
 
 		methods: {
-
+			
 		}
 	}
 </script>
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index 40fa52f0..e4c1e0cb 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -8,7 +8,8 @@
 				<work-station :workshopCode="jobContent.workShopCode"
 					:productionLineCode="jobContent.detailProductionLineCode"
 					:workStationCode="jobContent.detailWorkStationCode"
-					:rawLocationCode="jobContent.detailToLocationCode">
+					:rawLocationCode="jobContent.detailToLocationCode"
+					:itemGroup="jobContent.itemGroup" :isShowItemGroup='true'>
 				</work-station>
 			</view>
 		</view>
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 9f98eadc..02f9b69f 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -14,7 +14,7 @@
 						:right-options="item.status=='2'?detailGiveupOptions:item.status=='1'?detailCloseOptions:detailOptions"
 						@click="swipeClick($event,item)">
 
-						<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card>
+						<com-issue-job-card :dataContent="item" @click='openJobDetail(item)' :isShowGoodsShelves='true'></com-issue-job-card>
 
 					</uni-swipe-action-item>
 				</view>