diff --git a/src/api/request2.js b/src/api/request2.js
index b4cce1fa..c25d17c1 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1895,6 +1895,7 @@ export function getProductReceiptJobList(params) {
 	});
 }
 
+
 /**
  * 制品收货 获取任务明细
  * @param {*}   id 任务id
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 9516a3f7..adf36fbc 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2077,22 +2077,11 @@ button::after {
 	padding: 5px;
 }
 
-.card_packing_code_content {
-	font-size: 32rpx;
-	padding: 5px;
-}
-
 .card_batch {
 	color: #9747FF;
 	padding: 5px;
 }
 
-
-.card_batch_content {
-	font-size: 32rpx;
-	padding: 5px;
-}
-
 .card_container {
 	color: #0076F6;
 	padding: 5px;
@@ -2131,12 +2120,28 @@ button::after {
 
 .card_supportCode {
 	color: #DA8910;
+	padding: 5px;
 }
 
 .card_supportCode_content {
 	font-size: 32rpx;
 }
 
+.card_item_code {
+	color: #F1A532;
+	padding: 5px;
+}
+
+.card_product_date {
+	color: #329362;
+	padding: 5px;
+}
+
+.card_order {
+	color: #0076F6;
+	padding: 5px;
+}
+
 .scan_view {
 	/* #0CC2B6 20% */
 	background: linear-gradient(90deg, rgba(12, 194, 182, 0.2) 0%, rgba(12, 194, 182, 0) 100%)
diff --git a/src/mycomponents/scan/winComScanFG.vue b/src/mycomponents/scan/winComScanFG.vue
new file mode 100644
index 00000000..d6e2628e
--- /dev/null
+++ b/src/mycomponents/scan/winComScanFG.vue
@@ -0,0 +1,263 @@
+<!--扫描组件-->
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view>
+		<view class="pop_tab">
+			<view class="tab_info">
+				<view class="conbox">
+					<textarea inputmode="none" v-model="scanMsg" trim="all" maxlength="1000"
+						style="margin-left: 5px;width: 90%;" :focus="boxfocus" :placeholder="placeholderValue"
+						@focus="getfocus" @blur="losefocus" @input="handelScanMsg" :cursor="cursorIndex"></textarea>
+				</view>
+				<view class="uni-flex uni-row space-between u-col-center">
+					<view class="uni-flex">
+						<button class="clean_scan_btn" @click="clearScanValue()">清空</button>
+						<button class="scan_btn" @click="clickScanMsg()">扫描</button>
+					</view>
+				</view>
+			</view>
+
+			<view style="width: 100%;">
+				<view style="width: 100%;" v-if="scanList.length>0&&isShowHistory">
+					<view class="uni-flex uni-row space-between u-col-center">
+						<view class="" style="padding: 10rpx;">
+							历史记录
+						</view>
+						<view class="" style="padding-right: 10rpx;">
+							<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+						</view>
+					</view>
+					<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'></u-line>
+					<scroll-view scroll-y="true" class="scroll-view" v-if="expand&&scanList.length>0"
+						style="height: 70px;">
+						<view class="uni-flex u-col" v-for="(item,index) in scanList">
+							<view style="width: 100%;max-height: 100px;">
+								<view class="uni-flex u-row space-between u-col-center" @click="showItem(item)">
+									<view class="text_ellipsis" style="padding: 15rpx;">
+										{{item}}
+									</view>
+									<view class="">
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</view>
+								<u-line class='line_color'></u-line>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+<script>
+	import {
+		getLabelInfo
+	} from '../../common/label.js';
+
+	export default {
+		name: "winComScan",
+		emits: ["getResult"],
+		components: {},
+		props: {
+			placeholder: {
+				type: String,
+				default: '请扫描标签'
+			},
+			clearResult: {
+				type: Boolean,
+				default: true
+			},
+			boxFocus: {
+				type: Boolean,
+				default: true
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			headerType: {
+				type: String,
+				default: 'HPQ' //HLB   HMQ   HCQ HPQ
+			}
+		},
+		data() {
+			return {
+				// scanMsg: "HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q100",
+				scanMsg: "",
+				boxfocus: false,
+				placeholderValue: '',
+				scanResult: {},
+				scanList: [],
+				expand: true,
+				expendIcon: 'arrow-down',
+				cursorIndex: 0
+			}
+		},
+		mounted() {
+			this.boxfocus = true;
+			uni.hideKeyboard();
+
+			// #ifdef H5
+			if (document.querySelector('textarea') != null) {
+				document.querySelector('textarea').setAttribute('inputmode', 'none')
+			}
+			// #endif 
+			this.hide()
+			// #ifdef APP-PLUS
+
+			// #endif 
+		},
+		watch: {
+			placeholder() {
+				this.placeholderValue = '请扫描' + this.placeholder;
+			}
+		},
+		created() {
+			this.placeholderValue = '请扫描' + this.placeholder;
+		},
+		methods: {
+			hide() {
+				// #ifdef APP-PLUS
+				// 只是解决软键盘的闪现
+				var interval = setInterval(function() {
+					uni.hideKeyboard(); //隐藏软键盘
+					console.log('刷新')
+				}, 5);
+				setTimeout(() => {
+					clearInterval(interval);
+					console.log('停止刷新')
+				}, 1000);
+				// #endif 
+			},
+			getValue() {
+				return this.scanMsg
+			},
+			setValue(val) {
+				this.scanMsg = val
+			},
+			clearScanValue() {
+				this.scanMsg = ''
+				this.getfocus();
+			},
+			clickScanMsg() {
+				this.scanMsg = this.scanMsg + "\n";
+				this.handelScanMsg();
+			},
+			handelScanMsg() {
+				let that = this;
+				setTimeout(() => {
+					that.losefocus();
+					// let content = uni.$u.trim(that.scanMsg)
+					let content = that.scanMsg;
+					if (content == "") {
+						that.getfocus();
+						this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
+							if (res) {
+								that.scanMsg = ""
+								that.getfocus();
+							}
+						})
+						return;
+					}
+
+					if (that.isShowHistory) {
+						that.scanList.unshift(content);
+					}
+
+					try {
+						
+						let itemCode = content.substr(0, 10);
+						let productDate = content.substr(10, 8);
+						let batch = content.substr(18, 3);
+						let order = content.substr(21, 8);
+
+						let scanResult = {
+							itemCode: itemCode,
+							productDate: productDate,
+							batch: batch,
+							order: order,
+							content: content,
+						 
+							success: true
+						};
+						that.clear();
+						that.$emit("getResult", scanResult);
+					} catch (e) {
+						this.$refs.comMessage.showErrorMessage('解析错误', res => {
+							if (res) {
+								that.getfocus();
+							}
+						})
+					}
+				}, 500);
+			},
+			getfocus() {
+				let that = this;
+				this.$nextTick(r => {
+					that.boxfocus = true;
+				});
+				this.hide()
+			},
+			losefocus() {
+				let that = this;
+				this.$nextTick(r => {
+					that.boxfocus = false;
+				});
+			},
+			clear() {
+				this.cursorIndex = 0;
+				this.scanMsg = ''
+			},
+			iconClick(type) {
+				this.$emit("clearResult", this.scanMsg);
+			},
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+			scanClick() {
+				this.handelScanMsg();
+			},
+			cancelClick() {
+				this.clear();
+				this.getfocus();
+			},
+			showItem(item) {
+				this.$refs.comMessage.showMessage(item, res => {
+					if (res) {
+						// this.$refs.modal.cancelClose();
+					}
+				})
+			},
+
+			scanQRCode() {
+				let that = this;
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: (res) => {
+						that.scanMsg = res.result;
+						that.$emit("getResult", res.result);
+						console.log('扫描二维码成功,结果:' + res.result);
+					},
+					fail: (res) => {
+						that.showItem('扫描出现错误:' + res.result);
+						console.log('扫描出现错误:' + res.result);
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<script module="textarea" lang="renderjs">
+	export default {
+		mounted() {
+			document.querySelector('textarea').setAttribute('inputmode', 'none')
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanFGLabel.vue b/src/mycomponents/scan/winScanFGLabel.vue
new file mode 100644
index 00000000..30ba9746
--- /dev/null
+++ b/src/mycomponents/scan/winScanFGLabel.vue
@@ -0,0 +1,114 @@
+<template>
+	<view>
+		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="" style="font-size: 35rpx;">
+						扫描{{title}}
+					</view>
+
+					<view class="">
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan-fg ref="comscan" :placeholder="title" @getResult="getScanResult"
+							:headerType="headerType" :isShowHistory="isShowHistory"
+							:clearResult="true"></win-com-scan-fg>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
+	</view>
+</template>
+
+<script>
+	import winComScanFg from '@/mycomponents/scan/winComScanFg.vue'
+
+	export default {
+		name: 'winScanFGLabel',
+		components: {
+			winComScanFg,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '成品标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			headerType: {
+				type: String,
+				default: 'HPQ'
+			}
+		},
+		data() {
+			return {
+				show: false,
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 200)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("close", '');
+			},
+
+			scanClick() {
+				this.$refs.comscan.clickScanMsg();
+			},
+
+			cancelClick() {
+				this.$refs.comscan.clearScanValue();
+			},
+
+			getScanResult(result) {
+				if (result.success) {
+					this.$emit("getResult", result);
+				} else {
+					this.showMessage(result.message)
+				}
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message);
+			},
+			change(e) {
+				this.show = e.show
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index e60e9da7..79b15b87 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -821,7 +821,7 @@
 		{
 			"path": "pages/productReceipt/job/fgProductReceiptJob",
 			"style": {
-				"navigationBarTitleText": "装配完工收货任务",
+				"navigationBarTitleText": "装配收货任务",
 				"enablePullDownRefresh": true,
 				"titleNView": {
 					// "autoBackButton": "true",
@@ -847,14 +847,14 @@
 		{
 			"path": "pages/productReceipt/job/fgProductReceiptDetail",
 			"style": {
-				"navigationBarTitleText": "装配完工收货详情",
+				"navigationBarTitleText": "装配收货详情",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/productReceipt/job/semiProductReceiptJob",
 			"style": {
-				"navigationBarTitleText": "预生产完工收货任务",
+				"navigationBarTitleText": "预生产收货任务",
 				"enablePullDownRefresh": true,
 				"titleNView": {
 					// "autoBackButton": "true",
diff --git a/src/pages/productReceipt/coms/comFgCard.vue b/src/pages/productReceipt/coms/comFgCard.vue
new file mode 100644
index 00000000..3f6ce428
--- /dev/null
+++ b/src/pages/productReceipt/coms/comFgCard.vue
@@ -0,0 +1,62 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
+		<view class="uni-flex uni-row space-between" style="align-items: center">
+			<!-- uni-inline-item 暂时拿掉-->
+			<view style="word-break: break-all;">
+				<view>
+					<text class="card_item_code card_content ">零件号</text>
+					<text class="card_content ">{{detail.itemCode}}</text>
+				</view>
+				<view>
+					<text class="card_product_date card_content ">生产日期</text>
+					<text class="card_content ">{{detail.productDate}}</text>
+				</view>
+
+				<view>
+					<text class="card_batch card_content ">批次</text>
+					<text class="card_content ">{{detail.batch}}</text>
+				</view>
+
+				<view>
+					<text class="card_order card_content ">顺序</text>
+					<text class="card_content ">{{detail.order}}</text>
+				</view>
+			</view>
+			<view style="word-break: break-all;">
+				<recommend-qty  :dataContent="detail"
+					:isShowStdPack="false" :isShowStatus="false"></recommend-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+
+	export default {
+		components: {
+			recommendQty,
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/coms/comProductDetailCard.vue b/src/pages/productReceipt/coms/comProductDetailCard.vue
index 0f22e954..b9ca0dc1 100644
--- a/src/pages/productReceipt/coms/comProductDetailCard.vue
+++ b/src/pages/productReceipt/coms/comProductDetailCard.vue
@@ -5,21 +5,20 @@
 				<template v-slot:title>
 					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty>
 				</template>
-				<u-line />
+				<view class="split_line"></view>
 				<view class="" v-for="(item,index) in dataContent.subList">
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions">
-							<recommend :detail="item" :isShowFromLocation="false"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
+							<recommend :detail="item" :isShowFromLocation="false"
+								:isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
-					<u-line color="#D8D8D8"></u-line>
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>
 
-		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
-			 @confirm="confirm">
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
@@ -35,7 +34,7 @@
 	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
 	import productDetailInfoPopup from '@/pages/productReceipt/coms/productDetailInfoPopup.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
-	
+
 	import {
 		getDetailOption,
 		getPurchaseReceiptOption
@@ -63,8 +62,8 @@
 				type: Array,
 				default: null
 			},
-			
-			
+
+
 		},
 		watch: {
 			dataContent: {
@@ -90,7 +89,7 @@
 
 					}
 				},
-				locatonItem:{},
+				locatonItem: {},
 				detailOptions: [],
 				scanOptions: []
 			}
@@ -101,7 +100,8 @@
 				this.detailOptions = getDetailOption();
 			}
 			if (this.scanOptions.length == 0) {
-				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty,this.settingParam.allowModifyLocation)
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
+					.allowModifyLocation)
 			}
 		},
 
@@ -111,7 +111,7 @@
 					this.detail(item)
 				} else if (e.content.text == "编辑") {
 					this.edit(item)
-				}  else if (e.content.text == "库位") {
+				} else if (e.content.text == "库位") {
 					this.showLocation(item)
 				} else if (e.content.text == "移除") {
 					this.remove(item)
@@ -119,15 +119,15 @@
 			},
 			edit(item) {
 				this.editItem = item;
-				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty,item.labelQty);
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty);
 			},
 			showLocation(item) {
-				this.locatonItem =item;
+				this.locatonItem = item;
 				this.$refs.scanLocationCode.openScanPopup();
 			},
 			//扫描源库位
 			getLocation(location, code) {
-				this.locatonItem.toLocationCode =code;
+				this.locatonItem.toLocationCode = code;
 				this.$emit('updateData')
 			},
 
@@ -155,4 +155,4 @@
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/FgProductReceiptDetail.vue b/src/pages/productReceipt/job/FgProductReceiptDetail.vue
index 6759a483..230afd1e 100644
--- a/src/pages/productReceipt/job/FgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/FgProductReceiptDetail.vue
@@ -14,11 +14,15 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+						<com-product-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
 							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
-						</comProductDetailCard>
+						</com-product-detail-card>
+						<view class="card_view" style="margin-left: 20px; border-bottom: 1px solid #e0e0e0;"
+							v-for="(fg, index) in fgList">
+							<com-fg-card :detail='fg'></com-fg-card>
+						</view>
 					</view>
-					<u-line />
+					<view class="split_line"></view>
 				</view>
 			</scroll-view>
 		</view>
@@ -27,8 +31,8 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						 @getLocation='scanLocationCode'
+					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationTypeList="toLocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
@@ -38,7 +42,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'制品标签'" headerType="HMQ"></win-scan-pack>
+		<win-scan-fg-label ref="scanPopup" @getResult='getScanResult' title='制品标签'></win-scan-fg-label>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -75,11 +79,11 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import locationCompare from '@/mycomponents/location/locationCompare.vue'
-	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
+	import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue"
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
-
+	import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue"
 
 	export default {
 		name: 'receipt_detail',
@@ -87,9 +91,10 @@
 			winScanButton,
 			comDetailCard,
 			locationCompare,
-			winScanPack,
+			winScanFgLabel,
 			jobTop,
-			comProductDetailCard
+			comProductDetailCard,
+			comFgCard
 		},
 		data() {
 			return {
@@ -103,9 +108,9 @@
 				detailSource: [], //绑定在页面上的数据源
 				toLocationTypeList: [],
 				managementList: [],
-				jobStatus:"",
-				jobToLocationCode:""
-
+				jobStatus: "",
+				jobToLocationCode: "",
+				fgList: []
 			};
 		},
 		onLoad(option) {
@@ -132,7 +137,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeProductReceiptJob(this.id).then(res => {
 						uni.navigateBack();
@@ -197,36 +202,8 @@
 			},
 
 			getScanResult(result) {
-				let label = result.label;
-				var packingNumber = label.packingNumber;
-				var batch = label.batch;
-				var qty = label.qty;
-				var itemCode = label.itemCode;
-
-				var detail = this.detailSource.find(r => r.itemCode == itemCode);
-				if (detail == undefined) {
-					this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
-				} else {
-					var itemDetail = detail.subList.find(r =>
-						r.packingNumber == packingNumber &&
-						r.batch == batch);
-					if (itemDetail == undefined) {
-						this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
-					} else {
-						if (itemDetail.scaned) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
-						} else {
-							itemDetail.scaned = true;
-							itemDetail.handleQty = Number(result.label.qty);
-							itemDetail.toLocationCode = this.toLocationCode;
-							itemDetail.labelQty = Number(result.label.qty);
-							calcHandleQty(this.detailSource);
-							this.continueScan()
-							this.$forceUpdate()
-						}
-
-					}
-				}
+				let source = that.detailSource;
+				this.fgList.push(result);
 			},
 
 			//继续扫描
@@ -415,4 +392,4 @@
 </script>
 
 <style scoped lang="scss">
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/FgProductReceiptJob.vue b/src/pages/productReceipt/job/FgProductReceiptJob.vue
index c5e524a7..8fd0dd95 100644
--- a/src/pages/productReceipt/job/FgProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/FgProductReceiptJob.vue
@@ -1,287 +1,33 @@
 <template>
 	<view class="">
-		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
-			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
-			:checkedWaitTask="checkedWaitTask">
-		</job-filter>
-		
-		<view v-if="jobList.length>0">
-			<uni-swipe-action ref="swipeAction">
-				<view v-for="(item, index) in jobList" :key="index">
-					<uni-swipe-action-item
-						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
-						@click="swipeClick($event,item)">
-						<com-product-job-card :dataContent="item" @click='openJobDetail(item)'></com-product-job-card>
-					</uni-swipe-action-item>
-				</view>
-			</uni-swipe-action>
-
-			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
-			<job-info-popup ref='jobInfoPopup'></job-info-popup>
-
-			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
-			<comMessage ref="comMessage"></comMessage>
-		</view>
+		<product-receipt-job ref="productreceiptjob" type='fg'></product-receipt-job>
 	</view>
 </template>
 
 <script>
-	import {
-		getProductReceiptJobList,
-		cancleTakeProductReceiptJob
-	} from '@/api/request2.js';
-
-	import {
-		goHome,
-		updateTitle
-	} from '@/common/basic.js';
-
-	import {
-		getDetailOption,
-		getDetailGiveupOption
-	} from '@/common/array.js';
-
-	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import jobFilter from '@/mycomponents/job/jobFilter.vue'
-
-	import comProductJobCard from '@/pages/productReceipt/coms/comProductJobCard.vue'
-	import jobListPopup from '@/pages/productReceipt/coms/jobListPopup.vue'
-	import jobInfoPopup from '@/pages/productReceipt/coms/jobInfoPopup.vue'
+	import productReceiptJob from '@/pages/productReceipt/job/productReceiptJob.vue'
 
 	export default {
-		name: 'receipt',
+		name: 'fgProductReceiptJob',
 		components: {
-			comEmptyView,
-			jobFilter,
-			comProductJobCard,
-			jobListPopup,
-			jobInfoPopup
+			productReceiptJob
 		},
 		data() {
 			return {
-				jobList: [],
-				pageNo: 1,
-				pageSize: 10,
-				totalCount: 0,
-				loadingType: "nomore",
-				checkedToday: false,
-				checkedWaitTask: false,
-				todayTime: "",
-				status: '1,2', //待处理 、进行中
-				detailOptions: [],
-				detailGiveupOptions: [],
-			};
-		},
-
-		onShow() {
-			this.getList("refresh")
-		},
-
-		onReady() {
-			this.detailOptions = getDetailOption();
-			this.detailGiveupOptions = getDetailGiveupOption();
-		},
-		
-		onReachBottom() {
-			//避免多次触发
-			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
-				return;
-			}
-			this.getList("more");
-		},
-		
-		onPullDownRefresh() {
-			this.getList('refresh');
-		},
-
 
-		//后退按钮
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				uni.navigateBack({
-					delta: 1
-				})
-				return false;
-			}
+			};
 		},
 
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			} else if (e.index == 1) {
-				this.$refs.filter.openFilter();
-			}
+		mounted() {
+			this.$refs.productreceiptjob.getList("refresh");
 		},
 
 		methods: {
-			getList(type) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中­....",
-					mask: true
-				});
-				this.loadingType = "loading";
-				if (type === "refresh") {
-					this.pageNo = 1;
-					this.jobList = [];
-				}
-				var filters = []
-				if (this.checkedToday) {
-					filters.push({
-						column: "request_time",
-						action: "betweeen",
-						value: this.todayTime
-					})
-				}
-				
-				filters.push({
-					column: "status",
-					action: "in",
-					value: this.status
-				})
-				
-				var params = {
-					filters: filters,
-					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-				}
-				getProductReceiptJobList(params).then(res => {
-					uni.hideLoading();
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					
-					var list = res.data.list;
-					this.totalCount = res.data.total
-					this.loadingType = "loadmore";
-					if (list == null || list.length == 0) {
-						this.loadingType = "nomore";
-						return;
-					}
-					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
-					this.pageNo++;
-					updateTitle("制品收货(" + this.totalCount + ")");
-
-				}).catch(error => {
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					updateTitle("制品收货");
-					this.loadingType = "";
-					uni.hideLoading();
-					that.showMessage(error)
-				})
-			},
-
-			openJobDetail(item) {
-				uni.navigateTo({
-					url: './productReceiptDetail?id=' + item.id + '&status=' + item.status
-				});
-			},
-
-			showItemList(itemList) {
-				this.$refs.jobListPopup.openPopup(itemList);
-			},
-
-			selectedItem(item) {
-				this.openJobDetail(item);
-			},
-
-			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
-					this.openjobInfoPopup(dataContent);
-				} else if (e.content.text == "放弃") {
-					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
-						res => {
-							if (res) {
-								this.cancleJob(dataContent.id);
-							}
-						});
-				}
-			},
-
-			openjobInfoPopup(item) {
-				this.$refs.jobInfoPopup.openPopup(item)
-			},
-
-			cancleJob(id) {
-				cancleTakeProductReceiptJob(id).then(res => {
-					if(res.data){
-						this.getList("refresh")
-						uni.showToast({
-							title:"放弃任务成功"
-						})
-					}else {
-						this.showMessage("放弃任务失败")
-					}
-				}).catch(error => {
-					this.showMessage(error)
-				})
-			},
-
-			switchChangeToday(state, creationTime) {
-				this.checkedToday = state;
-				this.todayTime = creationTime;
-				this.getList("refresh");
-			},
-
-			switchChangeWait(state, jobStatus) {
-				this.checkedWaitTask = state;
-				this.status = jobStatus;
-				this.getList("refresh");
-			},
-			getScanNumber(code) {
-				this.getDataListByType(code)
-			},
-			getDataListByType(code) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				var filters = []
-				filters.push({
-					column: "status",
-					action: "in",
-					value: '1,2'
-				})
-				filters.push({
-					column: "number",
-					action: "==",
-					value: code
-				})
-			
-				var params = {
-					filters: filters,
-					pageNo: 1,
-					pageSize: 100,
-				}
-				getProductReceiptJobList(params).then(res => {
-					uni.hideLoading();
-					if (res.data.list.length == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
-					} else if (res.data.list.length == 1) {
-						that.openJobDetail(res.data.list[0]);
-					}
-				}).catch(error => {
-					uni.hideLoading();
-					that.showMessage(error);
-				})
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
 
-					}
-				});
-			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/SemiProductReceiptJob.vue b/src/pages/productReceipt/job/SemiProductReceiptJob.vue
index c5e524a7..87dcbb32 100644
--- a/src/pages/productReceipt/job/SemiProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/SemiProductReceiptJob.vue
@@ -1,287 +1,33 @@
 <template>
 	<view class="">
-		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
-			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
-			:checkedWaitTask="checkedWaitTask">
-		</job-filter>
-		
-		<view v-if="jobList.length>0">
-			<uni-swipe-action ref="swipeAction">
-				<view v-for="(item, index) in jobList" :key="index">
-					<uni-swipe-action-item
-						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
-						@click="swipeClick($event,item)">
-						<com-product-job-card :dataContent="item" @click='openJobDetail(item)'></com-product-job-card>
-					</uni-swipe-action-item>
-				</view>
-			</uni-swipe-action>
-
-			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
-			<job-info-popup ref='jobInfoPopup'></job-info-popup>
-
-			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
-			<comMessage ref="comMessage"></comMessage>
-		</view>
+		<product-receipt-job ref="productreceiptjob" type='predict'></product-receipt-job>
 	</view>
 </template>
 
 <script>
-	import {
-		getProductReceiptJobList,
-		cancleTakeProductReceiptJob
-	} from '@/api/request2.js';
-
-	import {
-		goHome,
-		updateTitle
-	} from '@/common/basic.js';
-
-	import {
-		getDetailOption,
-		getDetailGiveupOption
-	} from '@/common/array.js';
-
-	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import jobFilter from '@/mycomponents/job/jobFilter.vue'
-
-	import comProductJobCard from '@/pages/productReceipt/coms/comProductJobCard.vue'
-	import jobListPopup from '@/pages/productReceipt/coms/jobListPopup.vue'
-	import jobInfoPopup from '@/pages/productReceipt/coms/jobInfoPopup.vue'
+	import productReceiptJob from '@/pages/productReceipt/job/productReceiptJob.vue'
 
 	export default {
-		name: 'receipt',
+		name: 'semiProductReceiptJob',
 		components: {
-			comEmptyView,
-			jobFilter,
-			comProductJobCard,
-			jobListPopup,
-			jobInfoPopup
+			productReceiptJob
 		},
 		data() {
 			return {
-				jobList: [],
-				pageNo: 1,
-				pageSize: 10,
-				totalCount: 0,
-				loadingType: "nomore",
-				checkedToday: false,
-				checkedWaitTask: false,
-				todayTime: "",
-				status: '1,2', //待处理 、进行中
-				detailOptions: [],
-				detailGiveupOptions: [],
-			};
-		},
-
-		onShow() {
-			this.getList("refresh")
-		},
-
-		onReady() {
-			this.detailOptions = getDetailOption();
-			this.detailGiveupOptions = getDetailGiveupOption();
-		},
-		
-		onReachBottom() {
-			//避免多次触发
-			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
-				return;
-			}
-			this.getList("more");
-		},
-		
-		onPullDownRefresh() {
-			this.getList('refresh');
-		},
-
 
-		//后退按钮
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				uni.navigateBack({
-					delta: 1
-				})
-				return false;
-			}
+			};
 		},
 
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			} else if (e.index == 1) {
-				this.$refs.filter.openFilter();
-			}
+		mounted() {
+			this.$refs.productreceiptjob.getList("refresh");
 		},
 
 		methods: {
-			getList(type) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中­....",
-					mask: true
-				});
-				this.loadingType = "loading";
-				if (type === "refresh") {
-					this.pageNo = 1;
-					this.jobList = [];
-				}
-				var filters = []
-				if (this.checkedToday) {
-					filters.push({
-						column: "request_time",
-						action: "betweeen",
-						value: this.todayTime
-					})
-				}
-				
-				filters.push({
-					column: "status",
-					action: "in",
-					value: this.status
-				})
-				
-				var params = {
-					filters: filters,
-					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-				}
-				getProductReceiptJobList(params).then(res => {
-					uni.hideLoading();
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					
-					var list = res.data.list;
-					this.totalCount = res.data.total
-					this.loadingType = "loadmore";
-					if (list == null || list.length == 0) {
-						this.loadingType = "nomore";
-						return;
-					}
-					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
-					this.pageNo++;
-					updateTitle("制品收货(" + this.totalCount + ")");
-
-				}).catch(error => {
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					updateTitle("制品收货");
-					this.loadingType = "";
-					uni.hideLoading();
-					that.showMessage(error)
-				})
-			},
-
-			openJobDetail(item) {
-				uni.navigateTo({
-					url: './productReceiptDetail?id=' + item.id + '&status=' + item.status
-				});
-			},
-
-			showItemList(itemList) {
-				this.$refs.jobListPopup.openPopup(itemList);
-			},
-
-			selectedItem(item) {
-				this.openJobDetail(item);
-			},
-
-			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
-					this.openjobInfoPopup(dataContent);
-				} else if (e.content.text == "放弃") {
-					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
-						res => {
-							if (res) {
-								this.cancleJob(dataContent.id);
-							}
-						});
-				}
-			},
-
-			openjobInfoPopup(item) {
-				this.$refs.jobInfoPopup.openPopup(item)
-			},
-
-			cancleJob(id) {
-				cancleTakeProductReceiptJob(id).then(res => {
-					if(res.data){
-						this.getList("refresh")
-						uni.showToast({
-							title:"放弃任务成功"
-						})
-					}else {
-						this.showMessage("放弃任务失败")
-					}
-				}).catch(error => {
-					this.showMessage(error)
-				})
-			},
-
-			switchChangeToday(state, creationTime) {
-				this.checkedToday = state;
-				this.todayTime = creationTime;
-				this.getList("refresh");
-			},
-
-			switchChangeWait(state, jobStatus) {
-				this.checkedWaitTask = state;
-				this.status = jobStatus;
-				this.getList("refresh");
-			},
-			getScanNumber(code) {
-				this.getDataListByType(code)
-			},
-			getDataListByType(code) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				var filters = []
-				filters.push({
-					column: "status",
-					action: "in",
-					value: '1,2'
-				})
-				filters.push({
-					column: "number",
-					action: "==",
-					value: code
-				})
-			
-				var params = {
-					filters: filters,
-					pageNo: 1,
-					pageSize: 100,
-				}
-				getProductReceiptJobList(params).then(res => {
-					uni.hideLoading();
-					if (res.data.list.length == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
-					} else if (res.data.list.length == 1) {
-						that.openJobDetail(res.data.list[0]);
-					}
-				}).catch(error => {
-					uni.hideLoading();
-					that.showMessage(error);
-				})
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
 
-					}
-				});
-			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index c047a1ba..6e83cdda 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -5,12 +5,11 @@
 			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
 			:checkedWaitTask="checkedWaitTask">
 		</job-filter>
-		
+
 		<view v-if="jobList.length>0">
 			<uni-swipe-action ref="swipeAction">
 				<view v-for="(item, index) in jobList" :key="index">
-					<uni-swipe-action-item
-						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
 						@click="swipeClick($event,item)">
 						<com-product-job-card :dataContent="item" @click='openJobDetail(item)'></com-product-job-card>
 					</uni-swipe-action-item>
@@ -73,16 +72,17 @@
 				detailGiveupOptions: [],
 			};
 		},
-
-		onShow() {
-			this.getList("refresh")
+		// 装配收货：type = 'assemble'
+		// 预生产收货：type = 'predict'
+		props: {
+			type: 'assemble',
 		},
 
 		onReady() {
 			this.detailOptions = getDetailOption();
 			this.detailGiveupOptions = getDetailGiveupOption();
 		},
-		
+
 		onReachBottom() {
 			//避免多次触发
 			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
@@ -90,7 +90,7 @@
 			}
 			this.getList("more");
 		},
-		
+
 		onPullDownRefresh() {
 			this.getList('refresh');
 		},
@@ -135,27 +135,33 @@
 						value: this.todayTime
 					})
 				}
-				
+
 				filters.push({
 					column: "status",
 					action: "in",
 					value: this.status
 				})
-				
+
 				var params = {
 					filters: filters,
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
+					type: this.type
 				}
+
 				getProductReceiptJobList(params).then(res => {
 					uni.hideLoading();
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					
+
 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("制品收货(" + this.totalCount + ")");
+					if (this.type == 'predict') {
+						updateTitle("预生产收货任务(" + this.totalCount + ")");
+					} else {
+						updateTitle("装配收货任务(" + this.totalCount + ")");
+					}
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -163,13 +169,17 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-				
+
 
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("制品收货");
+					if (this.type == 'predict') {
+						updateTitle("预生产收货任务(" + this.totalCount + ")");
+					} else {
+						updateTitle("装配收货任务(" + this.totalCount + ")");
+					}
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
@@ -177,9 +187,15 @@
 			},
 
 			openJobDetail(item) {
-				uni.navigateTo({
-					url: './productReceiptDetail?id=' + item.id + '&status=' + item.status
-				});
+				if (this.type == 'predict') {
+					uni.navigateTo({
+						url: './productReceiptDetail?id=' + item.id + '&status=' + item.status
+					});
+				} else {
+					uni.navigateTo({
+						url: './fgProductReceiptDetail?id=' + item.id + '&status=' + item.status
+					});
+				}
 			},
 
 			showItemList(itemList) {
@@ -209,12 +225,12 @@
 
 			cancleJob(id) {
 				cancleTakeProductReceiptJob(id).then(res => {
-					if(res.data){
+					if (res.data) {
 						this.getList("refresh")
 						uni.showToast({
-							title:"放弃任务成功"
+							title: "放弃任务成功"
 						})
-					}else {
+					} else {
 						this.showMessage("放弃任务失败")
 					}
 				}).catch(error => {
@@ -253,7 +269,7 @@
 					action: "==",
 					value: code
 				})
-			
+
 				var params = {
 					filters: filters,
 					pageNo: 1,
@@ -285,4 +301,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
\ No newline at end of file