From 97f7bc486d9589cb2db3e5a17ca24fda76cd53bb Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 22 Dec 2023 09:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=93=81=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/scan/winScanPackAndLocation.vue |  2 +-
 pages/deliver/job/deliverDetail.vue          | 56 +++++++++++---------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index 98d9f6f0..222e1ef4 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -97,7 +97,7 @@
 			},
 			headerType: {
 				type: String,
-				default: "HPQ"
+				default: "HPQ,HMQ"
 			},
 		},
 		data() {
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
index eb804fbb..6d090fa0 100644
--- a/pages/deliver/job/deliverDetail.vue
+++ b/pages/deliver/job/deliverDetail.vue
@@ -1,30 +1,31 @@
 <template>
 	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent" ></job-top>
+			</view>
+			<view class="header_item" >
+				申请单号：{{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
+			<view class="cen_card" style="padding: 5rpx;">
+				<view class="cell_box uni-flex uni-row">
+					<view class="cell_info">
+						<view class="text_lightblue">客户代码</view>
+						<view>{{jobContent.customerCode}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">客户寄售库</view>
+						<view>{{toLocationCode}}</view>
+					</view>
+				</view>
+				<u-line />
+			</view>
+		</view>
+		
 		<view class="page-main">
-
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
-					<view class="cen_card" style="padding: 20rpx;">
-						<view class="cell_box uni-flex uni-row">
-							<view class="cell_info">
-								<view class="text_lightblue">客户代码</view>
-								<view>{{jobContent.customerCode}}</view>
-							</view>
-							<!-- <view class="cell_info">
-								<view class="text_lightblue">生产线</view>
-								<view>{{toLocation.productionLineCode}}</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">工位</view>
-								<view>{{ toLocation.workStationCode }}</view>
-							</view> -->
-							<view class="cell_info">
-								<view class="text_lightblue">客户寄售库</view>
-								<view>{{ toLocation.toLocationCode}}</view>
-							</view>
-						</view>
-						<u-line />
-					</view>
 					<comDeliverDetailCard ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
 					</comDeliverDetailCard>
 				</view>
@@ -78,7 +79,8 @@
 	import comDeliverDetailCard from '@/pages/deliver/coms/comDeliverDetailCard.vue'
 	import comScanDeliverPack from '@/pages/deliver/coms/comScanDeliverPack.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
-
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	
 	export default {
 		name: 'issueDetail',
 		components: {
@@ -86,7 +88,8 @@
 			winScanButton,
 			comDeliverDetailCard,
 			comScanDeliverPack,
-			comMessage
+			comMessage,
+			jobTop
 		},
 		data() {
 			return {
@@ -97,7 +100,8 @@
 				detailOptions: [],
 				scanOptions: [],
 				status:"",
-				received :false
+				received :false,
+				toLocationCode:""
 			};
 		},
 
@@ -164,8 +168,8 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
+							that.toLocationCode =that.subList[0].toLocationCode
 							that.resizeCollapse();
-							uni.hideLoading();
 						} else {
 							that.showMessage('列表数据为0');
 						}