diff --git a/src/pages.json b/src/pages.json
index 1c46f45b..2f1c55ee 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -785,7 +785,6 @@
 							"fontSize": "58rpx", //按钮上文字的大小
 							"text": "\ue696",
 							"fontSrc": "/static/ali_icon/iconfont.ttf"
-
 						},
 						{
 
@@ -799,19 +798,84 @@
 			}
 		},
 		{
-			"path": "pages/productReceipt/record/productReceiptRecord",
+			"path": "pages/productReceipt/job/productReceiptDetail",
 			"style": {
-				"navigationBarTitleText": "制品收货记录",
+				"navigationBarTitleText": "制品收货详情",
 				"enablePullDownRefresh": false
-
+			}
+		},	
+		{
+			"path": "pages/productReceipt/job/fgProductReceiptJob",
+			"style": {
+				"navigationBarTitleText": "装配完工收货任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
 			}
 		},
 		{
-			"path": "pages/productReceipt/job/productReceiptDetail",
+			"path": "pages/productReceipt/job/fgProductReceiptDetail",
 			"style": {
-				"navigationBarTitleText": "制品收货详情",
+				"navigationBarTitleText": "装配完工收货详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/productReceipt/job/semiProductReceiptJob",
+			"style": {
+				"navigationBarTitleText": "预生产完工收货任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productReceipt/job/semiProductReceiptDetail",
+			"style": {
+				"navigationBarTitleText": "预生产完工收货详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		
+		{
+			"path": "pages/productReceipt/record/productReceiptRecord",
+			"style": {
+				"navigationBarTitleText": "制品收货记录",
 				"enablePullDownRefresh": false
-
 			}
 		},
 		{
diff --git a/src/pages/productReceipt/job/FgProductReceiptDetail.vue b/src/pages/productReceipt/job/FgProductReceiptDetail.vue
new file mode 100644
index 00000000..6759a483
--- /dev/null
+++ b/src/pages/productReceipt/job/FgProductReceiptDetail.vue
@@ -0,0 +1,418 @@
+<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"></u-line>
+		</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="">
+						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</comProductDetailCard>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<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'
+						:locationTypeList="toLocationTypeList"></locationCompare>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'制品标签'" headerType="HMQ"></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getProductReceiptJobDetail,
+		takeProductReceiptJob,
+		cancleTakeProductReceiptJob,
+		productReceiptJobsubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
+
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			comDetailCard,
+			locationCompare,
+			winScanPack,
+			jobTop,
+			comProductDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				toLocationCode: '',
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationTypeList: [],
+				managementList: [],
+				jobStatus:"",
+				jobToLocationCode:""
+
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeProductReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductReceiptJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductReceiptJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
+							that.jobToLocationCode = that.subList[0].toLocationCode
+							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			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()
+						}
+
+					}
+				}
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
+							.length +
+							"]");
+					}
+				}
+
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams();
+						console.log("提交参数", JSON.stringify(params));
+						productReceiptJobsubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data, )
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toInventoryStatus = detail.inventoryStatus
+							detail.toLocationCode = this.toLocationCode
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/pages/productReceipt/job/FgProductReceiptJob.vue b/src/pages/productReceipt/job/FgProductReceiptJob.vue
new file mode 100644
index 00000000..c5e524a7
--- /dev/null
+++ b/src/pages/productReceipt/job/FgProductReceiptJob.vue
@@ -0,0 +1,287 @@
+<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>
+	</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'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comProductJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		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();
+			}
+		},
+
+		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>
diff --git a/src/pages/productReceipt/job/SemiProductReceiptDetail.vue b/src/pages/productReceipt/job/SemiProductReceiptDetail.vue
new file mode 100644
index 00000000..6759a483
--- /dev/null
+++ b/src/pages/productReceipt/job/SemiProductReceiptDetail.vue
@@ -0,0 +1,418 @@
+<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"></u-line>
+		</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="">
+						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</comProductDetailCard>
+					</view>
+					<u-line />
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<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'
+						:locationTypeList="toLocationTypeList"></locationCompare>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'制品标签'" headerType="HMQ"></win-scan-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getProductReceiptJobDetail,
+		takeProductReceiptJob,
+		cancleTakeProductReceiptJob,
+		productReceiptJobsubmit
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
+
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			comDetailCard,
+			locationCompare,
+			winScanPack,
+			jobTop,
+			comProductDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				toLocationCode: '',
+				isShowPackingCode: true,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationTypeList: [],
+				managementList: [],
+				jobStatus:"",
+				jobToLocationCode:""
+
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus=="2") {
+					//取消承接任务	
+					cancleTakeProductReceiptJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeProductReceiptJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getProductReceiptJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
+							that.jobToLocationCode = that.subList[0].toLocationCode
+							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			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()
+						}
+
+					}
+				}
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+			},
+
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
+							.length +
+							"]");
+					}
+				}
+
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams();
+						console.log("提交参数", JSON.stringify(params));
+						productReceiptJobsubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data, )
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toInventoryStatus = detail.inventoryStatus
+							detail.toLocationCode = this.toLocationCode
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus();
+						}
+					});
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/pages/productReceipt/job/SemiProductReceiptJob.vue b/src/pages/productReceipt/job/SemiProductReceiptJob.vue
new file mode 100644
index 00000000..c5e524a7
--- /dev/null
+++ b/src/pages/productReceipt/job/SemiProductReceiptJob.vue
@@ -0,0 +1,287 @@
+<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>
+	</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'
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comProductJobCard,
+			jobListPopup,
+			jobInfoPopup
+		},
+		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();
+			}
+		},
+
+		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>
diff --git a/src/static/config.js b/src/static/config.js
index 3f42814d..a6ee2092 100644
--- a/src/static/config.js
+++ b/src/static/config.js
@@ -1,5 +1,5 @@
 let request_url = "http://dev.ccwin-in.com:25300/api/admin-api"
-// let request_url = "http://192.168.0.211:12080/admin-api"
+// let request_url = "http://192.168.0.113:12080/admin-api"
 
 let isDevelopment = true