Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -1,13 +1,11 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<view class="header-view">
 				<view class="header_job_top">
 					<job-top :dataContent="jobContent"></job-top>
 				</view>
-		</view>
-		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+
 				<view class="cen_card" style="padding: 5rpx;">
 					<view class="cell_box uni-flex uni-row">
 						<view class="cell_info">
@@ -19,7 +17,7 @@
 						<view class="cell_info">
 							<view class="text_lightblue">生产线</view>
 							<view>
-									{{item.subList[0].productionLineCode}}
+								{{productionLineCode}}
 							</view>
 						</view>
 						<view class="cell_info">
@@ -35,8 +33,12 @@
 							</view>
 						</view>
 					</view>
-						<view class="split_line"></view>
 				</view>
+			</view>
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-product-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
 							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
@@ -70,7 +72,9 @@
 	import {
 		getManagementPrecisions
 	} from '@/common/balance.js';
-	import { getCurrDateTime} from '@/common/basic.js';
+	import {
+		getCurrDateTime
+	} from '@/common/basic.js';
 
 	import {
 		getProductReceiptJobDetail,
@@ -143,6 +147,7 @@
 				jobToLocationCode: "",
 				fgList: [],
 				itemCode: "",
+				productionLineCode: "",
 				scanMessage: "",
 			};
 		},
@@ -226,6 +231,7 @@
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
 							that.jobToLocationCode = that.subList[0].toLocationCode
+							that.productionLineCode = that.subList[0].productionLineCode;
 							if (that.jobContent.allowModifyLocation == 'FALSE') {
 								that.toLocationCode = that.subList[0].toLocationCode
 							}
@@ -270,7 +276,8 @@
 										subItem.fgList.push(result);
 										that.calcFgQty(this.detailSource);
 									} else {
-										this.showQuestionMessage("标签【" + result.content + '】已经扫描，是否移除', confirm => {
+										this.showQuestionMessage("标签【" + result.content + '】已经扫描，是否移除',
+											confirm => {
 												subItem.fgList.splice(itemIndex, 1)
 												that.calcFgQty(this.detailSource);
 											})