diff --git a/src/api/request2.js b/src/api/request2.js
index b7306f1e..de9c0af9 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -2055,9 +2055,9 @@ export function productPutawayRecordSubmit(params) {
  * 获取日期任务列表
  * @param {*} 
  */
-export function getPickJobList(params) {
+export function getStockUpJobList(params) {
 	return request({
-		url: baseApi + "/wms/pick-job-main/senior",
+		url: baseApi + "/wms/stockup-main-job/senior",
 		method: "post",
 		data: params,
 	});
@@ -2068,9 +2068,9 @@ export function getPickJobList(params) {
  * @param {*}   id 任务id
  * 
  */
-export function getPickJobDetail(id) {
+export function getStockUpJobDetail(id) {
 	return request({
-		url: baseApi + "/wms/pick-job-main/getPickJobById?id=" + id,
+		url: baseApi + "/wms/stockup-main-job/getStockupMainJobById?id=" + id,
 		method: "get",
 		data: {},
 	});
@@ -2081,9 +2081,9 @@ export function getPickJobDetail(id) {
  * @param {*} id
  * 
  */
-export function takePickJob(id) {
+export function takeStockUpJob(id) {
 	return request({
-		url: baseApi + "/wms/pick-job-main/accept?id=" + id,
+		url: baseApi + "/wms/stockup-main-job/accept?id=" + id,
 		method: "put",
 		data: {},
 	});
@@ -2094,9 +2094,9 @@ export function takePickJob(id) {
  * @param {*} id
  * 
  */
-export function cancleTakePickJob(id) {
+export function cancleTakeStockUpJob(id) {
 	return request({
-		url: baseApi + "/wms/pick-job-main/abandon?id=" + id,
+		url: baseApi + "/wms/stockup-main-job/abandon?id=" + id,
 		method: "put",
 		data: {},
 	});
@@ -2106,9 +2106,9 @@ export function cancleTakePickJob(id) {
  * 直接备货任务 提交
  * @param {*} params 
  */
-export function pickJobsubmit(params) {
+export function stockUpJobsubmit(params) {
 	return request({
-		url: baseApi + "/wms/pick-job-main/execute",
+		url: baseApi + "/wms/stockup-main-job/execute",
 		method: "put",
 		data: params,
 	});
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 976e827a..adb7be78 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -62,10 +62,10 @@
 	} from '@/api/request2.js';
 
 	import {
-		getListLocationTypeDesc,
+		getListLocationAreaTypeDesc,
 		checkDirectoryItemExist,
 		getDirectoryItemArray,
-		getLocationTypeName,
+		getLocationAreaTypeName,
 		getInventoryStatusDesc
 	} from '@/common/directory.js';
 	export default {
@@ -114,7 +114,7 @@
 				fromLocationCode: '',
 				fromLocation: '',
 				fromLocationList: [],
-				fromLocationTypeArray: [],
+				fromLocationAreaTypeList: [],
 				locationOnFocus: false,
 				businessType: {},
 				inventoryStatus: [],
@@ -138,7 +138,7 @@
 				}
 				this.fromInventoryStatuses = this.businessType.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
-				this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')
 				}, 500)
@@ -162,7 +162,7 @@
 				}, 500)
 				this.fromInventoryStatuses = jobContent.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaCodes); //出库库存状态
 			},
 
 			closeScanPopup(content) {
@@ -194,25 +194,22 @@
 					mask: true
 				});
 				getBasicLocationByCode(this.fromLocationCode).then(res => {
+					uni.hideLoading();
 					if (res.data.total > 0) {
 						let result = res.data.list[0];
 						var type = result.type;
 						var available = result.available;
 						if (available == "TRUE") {
-							if (checkDirectoryItemExist(this.fromLocationTypeArray, type)) {
+							if (checkDirectoryItemExist(this.fromLocationAreaTypeList, type)) {
 								this.location = result;
 								// this.packGetFocus();
 								this.checkPackage(scanResult);
 							} else {
-								uni.hideLoading();
-								var hint = getListLocationTypeDesc(this.fromLocationTypeArray);
-								this.showErrorMessage("库位[" + this.fromLocationCode + "]是" +
-									getLocationTypeName(type) + ",<br>需要的库位类型是[" + hint + "]", callback => {
-										this.locationGetFocus();
-									})
+								var hint = getListLocationAreaTypeDesc(this.fromLocationAreaTypeList);
+								this.showErrorMessage("扫描库位[" + this.code + "]是[" +
+									getLocationAreaTypeName(areaType) + "],需要的库区是[" + hint + "]")
 							}
 						} else {
-							uni.hideLoading();
 							this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => {
 								this.locationGetFocus();
 							})
diff --git a/src/pages.json b/src/pages.json
index 90c8c015..8f8474c1 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1116,7 +1116,7 @@
 		},
 		
 		{
-			"path": "pages/pick/job/pickJob",
+			"path": "pages/stockUp/job/stockUpJob",
 			"style": {
 				"navigationBarTitleText": "直接备货任务",
 				"enablePullDownRefresh": true,
@@ -1143,7 +1143,7 @@
 			}
 		},
 		{
-			"path": "pages/pick/job/pickJobDetail",
+			"path": "pages/stockUp/job/stockUpJobDetail",
 			"style": {
 				"navigationBarTitleText": "直接备货任务详情",
 				"enablePullDownRefresh": true
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index 7c3e2bd6..d25a1bd1 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -157,6 +157,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("盘点(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -164,7 +165,6 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("盘点(" + this.totalCount + ")");
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue
index 960f382d..12b9634f 100644
--- a/src/pages/customerReturn/job/returnJob.vue
+++ b/src/pages/customerReturn/job/returnJob.vue
@@ -153,6 +153,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("客户退货(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -160,7 +161,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("客户退货(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue
index d9aff0f0..44a8d4ef 100644
--- a/src/pages/customerReturn/record/returnRecord.vue
+++ b/src/pages/customerReturn/record/returnRecord.vue
@@ -55,7 +55,6 @@
 	} from '@/common/balance.js';
 	import {
 		goHome,
-		updateTitle,
 		getPackingNumberAndBatchByList,
 		deepCopyData
 	} from '@/common/basic.js';
diff --git a/src/pages/customerReturn/request/customerReturnRequest.vue b/src/pages/customerReturn/request/customerReturnRequest.vue
index 0feb080f..e6d5c04b 100644
--- a/src/pages/customerReturn/request/customerReturnRequest.vue
+++ b/src/pages/customerReturn/request/customerReturnRequest.vue
@@ -158,6 +158,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("客户退货申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -168,9 +169,7 @@
 						res.options = options;
 					})
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
-
 					this.pageNo++;
-					updateTitle("客户退货申请(" + this.totalCount + ")");
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/customerReturn/request/customerReturnRequestCreate.vue b/src/pages/customerReturn/request/customerReturnRequestCreate.vue
index 5c92ef4d..b5311965 100644
--- a/src/pages/customerReturn/request/customerReturnRequestCreate.vue
+++ b/src/pages/customerReturn/request/customerReturnRequestCreate.vue
@@ -72,7 +72,6 @@
 	} from '@/common/balance.js';
 	import {
 		goHome,
-		updateTitle,
 		deepCopyData,
 		getPackingNumberAndBatchByList
 	} from '@/common/basic.js';
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index 26c89794..29182aa2 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -61,7 +61,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		navigateBack,
 		getRemoveOption,
 		getCurrDateTime,
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 8d514430..be9e63a7 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -154,6 +154,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("制品发货任务(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -161,7 +162,6 @@
 					}
 					this.jobList = type === "refresh" ? list : this.receiptList.concat(list);
 					this.pageNo++;
-					updateTitle("制品发货任务(" + this.totalCount + ")");
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/deliver/request/deliverRequest.vue b/src/pages/deliver/request/deliverRequest.vue
index d770dfc8..4633935d 100644
--- a/src/pages/deliver/request/deliverRequest.vue
+++ b/src/pages/deliver/request/deliverRequest.vue
@@ -158,6 +158,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("成品发货申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -169,7 +170,7 @@
 					})
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
 					this.pageNo++;
-					updateTitle("成品发货申请(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					updateTitle("成品发货申请");
diff --git a/src/pages/deliver/request/deliverRequestCreate.vue b/src/pages/deliver/request/deliverRequestCreate.vue
index d697fbff..853cc3aa 100644
--- a/src/pages/deliver/request/deliverRequestCreate.vue
+++ b/src/pages/deliver/request/deliverRequestCreate.vue
@@ -35,7 +35,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getRemoveOption,
 		getISODateTime
 	} from '@/common/basic.js';
diff --git a/src/pages/inspect/job/inspectJob.vue b/src/pages/inspect/job/inspectJob.vue
index 2cb2ab9b..fa093d52 100644
--- a/src/pages/inspect/job/inspectJob.vue
+++ b/src/pages/inspect/job/inspectJob.vue
@@ -150,6 +150,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("到货检验(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -157,7 +158,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("到货检验(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/inspect/request/inspectRequest.vue b/src/pages/inspect/request/inspectRequest.vue
index bd7b966a..27e32769 100644
--- a/src/pages/inspect/request/inspectRequest.vue
+++ b/src/pages/inspect/request/inspectRequest.vue
@@ -169,6 +169,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("检验单申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -181,7 +182,7 @@
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
 
 					this.pageNo++;
-					updateTitle("检验单申请(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index a2d0866f..84019b17 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -60,7 +60,6 @@
 	} from '@/common/detail.js';
 	import {
 		goHome,
-		updateTitle,
 		navigateBack,
 		getCurrDateTime,
 		getPackingNumberAndBatchByList,
diff --git a/src/pages/inventoryMove/job/inventoryMoveJob.vue b/src/pages/inventoryMove/job/inventoryMoveJob.vue
index f3f08737..8d7d6a5c 100644
--- a/src/pages/inventoryMove/job/inventoryMoveJob.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveJob.vue
@@ -143,6 +143,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("库存转移(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -150,7 +151,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("库存转移(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/issue-按批次推荐/job/issueJob.vue b/src/pages/issue-按批次推荐/job/issueJob.vue
index 4993edb2..cdb3ca74 100644
--- a/src/pages/issue-按批次推荐/job/issueJob.vue
+++ b/src/pages/issue-按批次推荐/job/issueJob.vue
@@ -164,6 +164,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					this.updateTitle();
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -171,7 +172,6 @@
 					}
 					that.issueList = type === "refresh" ? list : this.issueList.concat(list);
 					that.pageIndex++;
-					this.updateTitle();
 
 				}).catch(error => {
 					this.loadingType = "";
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 262b8162..bfba40ea 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -49,7 +49,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		navigateBack,
 		getRemoveOption,
 		getCurrDateTime,
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 2f9cf8e7..e7784bed 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -149,6 +149,7 @@
 					}
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("发料任务(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -156,7 +157,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("发料任务(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue
index 364db871..478b634c 100644
--- a/src/pages/issue/record/issueRecord.vue
+++ b/src/pages/issue/record/issueRecord.vue
@@ -56,7 +56,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getRemoveOption,
 		getISODateTime,
 		getCurrDateTime,
diff --git a/src/pages/issue/request/issueRequest.vue b/src/pages/issue/request/issueRequest.vue
index 5f3d8e43..e40dfb40 100644
--- a/src/pages/issue/request/issueRequest.vue
+++ b/src/pages/issue/request/issueRequest.vue
@@ -175,6 +175,7 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
+					updateTitle("发料申请");
 					this.loadingType = "";
 					that.showMessage(error.errMsg)
 				})
diff --git a/src/pages/pick/job/pickJobDetail.vue b/src/pages/pick/job/pickJobDetail.vue
deleted file mode 100644
index 25a9aea6..00000000
--- a/src/pages/pick/job/pickJobDetail.vue
+++ /dev/null
@@ -1,418 +0,0 @@
-<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" :locationAreaTypeList='toLocationAreaTypeList'>
-						</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'
-						:locationAreaTypeList="toLocationAreaTypeList"></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 {
-		getPickJobDetail,
-		takePickJob,
-		cancleTakePickJob,
-		pickJobsubmit
-	} 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: [], //绑定在页面上的数据源
-				toLocationAreaTypeList: [],
-				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") {
-					//取消承接任务	
-					cancleTakePickJob(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) {
-					takePickJob(this.id).then(res => {
-						callback();
-					}).catch(error => {
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getPickJobDetail(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.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
-							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));
-						pickJobsubmit(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/completeReceiveJob.vue b/src/pages/productReceipt/job/completeReceiveJob.vue
index 02409e35..f5a4bad9 100644
--- a/src/pages/productReceipt/job/completeReceiveJob.vue
+++ b/src/pages/productReceipt/job/completeReceiveJob.vue
@@ -1,8 +1,288 @@
 <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
+				
+					updateTitle("完工收货任务(装配)(" + this.totalCount + ")");
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+
+				}).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>
-</style>
\ No newline at end of file
+<style scoped lang="scss">
+
+</style>
diff --git a/src/pages/productReceipt/job/completeReceiveJobDetail.vue b/src/pages/productReceipt/job/completeReceiveJobDetail.vue
index 02409e35..1b3fb8fa 100644
--- a/src/pages/productReceipt/job/completeReceiveJobDetail.vue
+++ b/src/pages/productReceipt/job/completeReceiveJobDetail.vue
@@ -1,8 +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" :locationAreaTypeList='toLocationAreaTypeList'>
+						</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'
+						:locationAreaTypeList="toLocationAreaTypeList"></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: [], //绑定在页面上的数据源
+				toLocationAreaTypeList: [],
+				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.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
+							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>
-</style>
\ No newline at end of file
+<style scoped lang="scss">
+</style>
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index c5e524a7..c047a1ba 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -155,6 +155,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("制品收货(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -162,7 +163,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("制品收货(" + this.totalCount + ")");
+				
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index f231f6af..6a28d995 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -60,7 +60,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		navigateBack,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
@@ -183,7 +182,6 @@
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.subList)
-							// updateTitle(this.jobContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index f5ed5c5f..d0265058 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -156,6 +156,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("生产收料(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -163,7 +164,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("生产收料(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/productionReturn/coms/comReturnCommonRequest.vue b/src/pages/productionReturn/coms/comReturnCommonRequest.vue
index f22e12d1..0a88f667 100644
--- a/src/pages/productionReturn/coms/comReturnCommonRequest.vue
+++ b/src/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -183,6 +183,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle(this.title + "(" + this.totalCount + ")")
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -195,7 +196,7 @@
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
 
 					this.pageNo++;
-					updateTitle(this.title + "(" + this.totalCount + ")")
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue
index 9e79f81f..b9ed5645 100644
--- a/src/pages/productionReturn/job/returnJob.vue
+++ b/src/pages/productionReturn/job/returnJob.vue
@@ -156,6 +156,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("生产退料(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -163,12 +164,13 @@
 					}
 					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)
diff --git a/src/pages/productionReturn/request/returnToHoldRequest.vue b/src/pages/productionReturn/request/returnToHoldRequest.vue
index 47463dac..05d247b9 100644
--- a/src/pages/productionReturn/request/returnToHoldRequest.vue
+++ b/src/pages/productionReturn/request/returnToHoldRequest.vue
@@ -10,7 +10,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	export default {
diff --git a/src/pages/productionReturn/request/returnToStoreRequest.vue b/src/pages/productionReturn/request/returnToStoreRequest.vue
index 2bcde74f..834e6d80 100644
--- a/src/pages/productionReturn/request/returnToStoreRequest.vue
+++ b/src/pages/productionReturn/request/returnToStoreRequest.vue
@@ -10,7 +10,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	export default {
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 99cc4624..4b31684e 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -65,7 +65,6 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
-		updateTitle,
 		compareAsc,
 		navigateBack
 	} from '@/common/basic.js';
@@ -207,7 +206,6 @@
 						} else {
 							that.showMessage('列表数据为0');
 						}
-						// updateTitle("采购收货-" + that.jobContent.number);
 					}
 				}).catch(error => {
 					uni.hideLoading()
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 0c720e25..01c9337a 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -151,6 +151,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("采购收货(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -158,7 +159,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("采购收货(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue
index 3e0fec94..64341730 100644
--- a/src/pages/purchaseReturn/job/returnJob.vue
+++ b/src/pages/purchaseReturn/job/returnJob.vue
@@ -153,6 +153,7 @@
 					}
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("采购退货(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -160,7 +161,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("采购退货(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/purchaseReturn/request/returnRequest.vue b/src/pages/purchaseReturn/request/returnRequest.vue
index 710dc473..04057066 100644
--- a/src/pages/purchaseReturn/request/returnRequest.vue
+++ b/src/pages/purchaseReturn/request/returnRequest.vue
@@ -157,6 +157,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("采购退货申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -168,7 +169,7 @@
 					})
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
 					this.pageNo++;
-					updateTitle("采购退货申请(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					uni.hideLoading();
diff --git a/src/pages/purchaseReturn/request/returnRequestCreate.vue b/src/pages/purchaseReturn/request/returnRequestCreate.vue
index cea6503c..09e369f8 100644
--- a/src/pages/purchaseReturn/request/returnRequestCreate.vue
+++ b/src/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -44,7 +44,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		navigateBack,
 		deepCopyData,
 		getCurrDateOneMonthsTimes
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 6a3069ff..14d8f9e2 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -155,6 +155,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("采购上架(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -162,7 +163,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("采购上架(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 015deabf..13bb04fc 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -57,7 +57,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatchByList,
 		deepCopyData
@@ -123,7 +122,7 @@
 			};
 		},
 		onLoad(option) {
-			this.clear();
+			this.clearData();
 			var typeCode = "PurchasePutaway"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
@@ -443,7 +442,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.clear();
+					this.clearData();
 				})
 			},
 
@@ -457,7 +456,7 @@
 				}
 			},
 
-			clear() {
+			clearData() {
 				this.fromLocationInfo = {};
 				this.fromLocationCode = '';
 				this.fromWarehouseCode = '';
diff --git a/src/pages/putaway/request/putawayRequest.vue b/src/pages/putaway/request/putawayRequest.vue
index af160389..9406c847 100644
--- a/src/pages/putaway/request/putawayRequest.vue
+++ b/src/pages/putaway/request/putawayRequest.vue
@@ -156,6 +156,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("采购上架申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -168,7 +169,7 @@
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
 
 					this.pageNo++;
-					updateTitle("采购上架申请(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/putaway/request/putawayRequestCreate.vue b/src/pages/putaway/request/putawayRequestCreate.vue
index 0d3b1789..bf8774a9 100644
--- a/src/pages/putaway/request/putawayRequestCreate.vue
+++ b/src/pages/putaway/request/putawayRequestCreate.vue
@@ -58,7 +58,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		deepCopyData,
 		getPackingNumberAndBatchByList
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index 3a65959b..cf33ab4c 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -51,7 +51,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		navigateBack,
 		getRemoveOption,
 		getCurrDateTime,
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index b5084a2c..90eebc7e 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -155,6 +155,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("补料(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -162,7 +163,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("补料(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue
index 8d8404de..80c68b2a 100644
--- a/src/pages/repleinsh/record/repleinshRecord.vue
+++ b/src/pages/repleinsh/record/repleinshRecord.vue
@@ -55,7 +55,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
diff --git a/src/pages/repleinsh/request/repleinshRequest.vue b/src/pages/repleinsh/request/repleinshRequest.vue
index 37de925d..7294fa45 100644
--- a/src/pages/repleinsh/request/repleinshRequest.vue
+++ b/src/pages/repleinsh/request/repleinshRequest.vue
@@ -137,6 +137,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("采购上架申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -149,7 +150,7 @@
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 
 					this.pageNo++;
-					updateTitle("采购上架申请(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue
index 76485468..cde67343 100644
--- a/src/pages/scrap/job/scrapJob.vue
+++ b/src/pages/scrap/job/scrapJob.vue
@@ -150,6 +150,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("报废出库(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -157,7 +158,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("报废出库(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue
index b5879d33..0c35c693 100644
--- a/src/pages/scrap/record/scrapRecord.vue
+++ b/src/pages/scrap/record/scrapRecord.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="page-wraper">
 		<view class="">
-			<com-blank-view @goScan='getLocation' v-if="fromLocationCode==''"></com-blank-view>
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
-		<view class="page-wraper" v-if="fromLocationCode!=''">
+		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="uni-flex uni-row u-col-center" style="width: 100%;" v-if="detailSource.length>0">
 				<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;">
 					报废原因 :
@@ -183,9 +183,6 @@
 				this.$forceUpdate();
 			},
 
-			updateData() {
-				this.calcHandleQty();
-			},
 			removeItem(index, item) {
 				this.detailSource.splice(index, 1)
 			},
@@ -290,14 +287,6 @@
 				return this.dataContent;
 				
 			},
-			
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
 
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);
diff --git a/src/pages/scrap/request/scrapRequestCreate.vue b/src/pages/scrap/request/scrapRequestCreate.vue
index ba0b8eb7..f7c38479 100644
--- a/src/pages/scrap/request/scrapRequestCreate.vue
+++ b/src/pages/scrap/request/scrapRequestCreate.vue
@@ -56,7 +56,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateOneMonthsTimes,
 		navigateBack
 	} from '@/common/basic.js';
diff --git a/src/pages/scrap/request/scrapRrequest.vue b/src/pages/scrap/request/scrapRrequest.vue
index 25a10dea..07338342 100644
--- a/src/pages/scrap/request/scrapRrequest.vue
+++ b/src/pages/scrap/request/scrapRrequest.vue
@@ -156,6 +156,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("报废出库申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -167,7 +168,7 @@
 					})
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
 					this.pageNo++;
-					updateTitle("报废出库申请(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue
new file mode 100644
index 00000000..eecd97d4
--- /dev/null
+++ b/src/pages/stockUp/coms/comScanStockUpPack.vue
@@ -0,0 +1,531 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title uni-flex space-between">
+						<view class="" style="font-size: 35rpx;">
+							扫描箱码
+						</view>
+					
+						<view class="">
+							<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+								@click="closeScanPopup()"></image>
+						</view>
+					</view>
+					
+					<!-- <view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view>
+					<u-line class='line_color'></u-line> -->
+
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						margin-top: 8rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								:headerType="headerType" :isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<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&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发货历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				label: {},
+				fromInventoryStatuses: "",
+				packageInfo: {}
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+					"-" + this.jobContent.subList[0].workStationCode
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.toLocation = that.dataContent[0];
+					that.toLocationCode = that.dataContent[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+
+			showBalanceSelect(items, packageInfo) {
+				this.packageInfo = packageInfo;
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode);
+				if (location != undefined) {
+					location.Items.forEach(item => {
+						item.Locations.forEach(f => {
+							list.push(f.fromLocationCode)
+						})
+					})
+					this.fromLocationCode = list[0];
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				if (location == undefined) {
+					this.fromLocationCode = ''
+					this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+				}
+			},
+			onScan(result) {
+				try {
+					let that = this;
+
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.label = result.label;
+										this.showBalanceSelect(balanceRes.data.list, packageInfo);
+									}
+								} else {
+									this.showErrorMessage(balanceRes.message.message);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance, this.packageInfo);
+			},
+
+
+			afterGetBalance(label, balance, packageInfo) {
+				try {
+					let that = this;
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					if (fromLocation != undefined) {
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
+						if (batch != undefined) {
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends.length > 0) {
+									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+									if (recommend != undefined) {
+										that.addRecord(batch, label, balance, packageInfo)
+									} else {
+										//允许修改箱码
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+											that.addRecord(batch, label, balance, packageInfo);
+										} else {
+											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+												res => {
+													that.getfocus();
+												}
+											)
+										}
+									}
+								} else {
+									that.addRecord(batch, label, balance, packageInfo)
+								}
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						} else {
+							if (this.jobContent.AllowModifyBatch == null) {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发货明细,是否要继续发货?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance);
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance) {
+				let batch = {
+					batch: data.lot,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: []
+				}
+				let record = this.creatRecord(data, balance);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance, packageInfo) {
+				balance.packQty = packageInfo.packQty
+				balance.packUnit = packageInfo.packUnit
+				let record = {
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					batch: label.batch,
+					qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty = calc.add(handleQty,res.qty)
+				})
+				batch.handleQty = handleQty;
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				let record = this.creatRecord(label, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				this.calcBatchHandleQty(batch);
+				this.getfocus();
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/src/pages/stockUp/coms/comStockUpDetailCard.vue b/src/pages/stockUp/coms/comStockUpDetailCard.vue
new file mode 100644
index 00000000..78531c49
--- /dev/null
+++ b/src/pages/stockUp/coms/comStockUpDetailCard.vue
@@ -0,0 +1,170 @@
+<template>
+	<view>
+		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
+			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
+
+		<view v-for="(item,index) in dataContent.Items">
+			<uni-collapse ref="collapse">
+				<uni-collapse-item :open="true">
+					<template v-slot:title>
+						<!-- 物品 -->
+						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+					</template>
+					<u-line />
+					<view v-for="(loacation,index) in item.Locations" :key="index">
+						<view>
+							<view class="uni-flex uni-row space-between">
+								<!-- 推荐库位 -->
+								<location :locationCode="loacation.fromLocationCode">
+								</location>
+							</view>
+							<view v-for="(batch,index) in loacation.Batchs" :key="index">
+								<recommend-balance style='margin-left: 20px;' :detail="batch"
+									:isShowLocation="false" :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
+								</recommend-balance>
+								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
+									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
+										实际
+									</view>
+									<view class="uni-flex uni-column" style="width: 100%;">
+										<view v-for="(record,index) in batch.Records" :key="index">
+											<uni-swipe-action ref="swipeAction">
+												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
+													:right-options="scanOptions">
+													<handle-balance :detail="record" :isShowLocation="false"
+														:isShowBatch="batch.packingNumber!=null">
+													</handle-balance>
+												</uni-swipe-action-item>
+											</uni-swipe-action>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
+	</view>
+	<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+	<comMessage ref="message"></comMessage>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+
+	import {
+		getDetailOption,
+		getEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['updateData'],
+		components: {
+			itemQty,
+			recommend,
+			recommendBalance,
+			handleBalance,
+			recommendQtyEdit,
+			requiredLocation,
+			balanceQtyEdit,
+			location,
+			detailInfoPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: null
+			},
+			settingParam: {
+				type: Object,
+				default: null
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {},
+				batchItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getEditRemoveOption();
+		},
+
+		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+			},
+
+			swipeClick(e, batch, record, index) {
+				if (e.content.text == "编辑") {
+					this.edit(batch, record)
+				} else if (e.content.text == "移除") {
+					this.remove(batch, record, index)
+				}
+			},
+
+			edit(batch, item) {
+				let that = this;
+				that.editItem = item;
+				that.batchItem = batch;
+				item.balance.balanceQty=item.balance.qty;
+				that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(batch, record, index) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							batch.Records.splice(index, 1);
+							this.resizeCollapse();
+							this.$emit('updateData', record)
+						}
+					});
+			},
+			confirm(val) {
+				this.editItem.qty = val;
+				this.$emit('updateData', this.editItem)
+				// let qty = 0;
+				// this.batchItem.Records.forEach(r => {
+				// 	qty += Number(r.qty);
+				// })
+				// this.batchItem.handleQty = qty;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/pages/stockUp/coms/comStockUpJobCard.vue b/src/pages/stockUp/coms/comStockUpJobCard.vue
new file mode 100644
index 00000000..6daab45f
--- /dev/null
+++ b/src/pages/stockUp/coms/comStockUpJobCard.vue
@@ -0,0 +1,50 @@
+<template>
+ 	<job-com-main-card :dataContent="dataContent">
+ 		<view class="task_item">
+ 			<view class="task_text">
+ 				<view class="">
+ 					申请单号 : {{dataContent.requestNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					发货计划单号 : {{dataContent.deliverPlanNumber}}
+ 				</view>
+ 			</view>
+
+ 			<view class="task_text">
+ 				<view class="">
+ 					客户代码 : {{dataContent.customerCode}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</job-com-main-card>
+ </template>
+
+ <script>
+ 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+ 	export default {
+ 		components: {
+ 			jobComMainCard,
+ 		},
+ 		data() {
+ 			return {};
+ 		},
+
+ 		props: {
+ 			dataContent: {
+ 				type: Object,
+ 				default: {}
+ 			},
+ 		},
+
+ 		methods: {
+
+ 		}
+ 	}
+ </script>
+
+ <style lang="scss">
+
+ </style>
diff --git a/src/pages/stockUp/coms/jobInfoPopup.vue b/src/pages/stockUp/coms/jobInfoPopup.vue
new file mode 100644
index 00000000..831b56ea
--- /dev/null
+++ b/src/pages/stockUp/coms/jobInfoPopup.vue
@@ -0,0 +1,76 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<job-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">发货计划单号 : </text>
+							<text class="text_wrap">{{dataContent.DeliverPlanNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">客户发货单号 : </text>
+							<text class="text_wrap">{{dataContent.CustomerDeliverNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">客户代码 : </text>
+							<text class="text_wrap">{{dataContent.CustomerCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">客户月台代码 : </text>
+							<text class="text_wrap">{{dataContent.CustomerDockCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">承运商 : </text>
+							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">运输方式 : </text>
+							<text class="text_wrap">{{dataContent.transferMode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">车牌号 : </text>
+							<text class="text_wrap">{{dataContent.vehiclePlateNumber}} </text>
+						</view>
+					</view>
+				</view>
+				<u-line></u-line>
+			</job-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	export default {
+		components: {
+			jobCommonInfo,
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.$refs.popup.open('bottom')
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/pages/stockUp/coms/jobListPopup.vue b/src/pages/stockUp/coms/jobListPopup.vue
new file mode 100644
index 00000000..f58edcf5
--- /dev/null
+++ b/src/pages/stockUp/coms/jobListPopup.vue
@@ -0,0 +1,47 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view v-for="(item, index) in receiptList" :key="index">
+				<com-deliver-job-card :dataContent="item" @click='selectItem(item)'></com-deliver-job-card>
+				<u-line></u-line>
+			</view>
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	import comDeliverJobCard from '@/pages/deliver/coms/comDeliverJobCard.vue'
+	
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+			comDeliverJobCard
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				receiptList: []
+			}
+		},
+		methods: {
+			openPopup(items) {
+				this.receiptList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue b/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue
new file mode 100644
index 00000000..046c093d
--- /dev/null
+++ b/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">标包数量 : </text>
+							<text class="text_wrap">{{dataContent.packQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">标包单位 : </text>
+							<text class="text_wrap">{{getPackUnitInfo(dataContent.packUnit)}} </text>
+						</view>
+
+					</view>
+				</view>
+				<u-line></u-line>
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">项目代码 : </text>
+							<text class="text_wrap">{{dataContent.projectCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">到货日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.arriveDate)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">生产日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.produceDate)}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">过期日期 : </text>
+							<text class="text_wrap">{{dateFormat(dataContent.expireDate)}} </text>
+						</view>
+					</view>
+				</view>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {getPackUnitInfo} from "@/common/directory.js"
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getPackUnitInfo(value){
+				return getPackUnitInfo(value).label
+			},
+			dateFormat(value){
+				return dateFormat(value)
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/pages/pick/job/pickJob.vue b/src/pages/stockUp/job/stockUpJob.vue
similarity index 83%
rename from src/pages/pick/job/pickJob.vue
rename to src/pages/stockUp/job/stockUpJob.vue
index feee0dd3..1915108f 100644
--- a/src/pages/pick/job/pickJob.vue
+++ b/src/pages/stockUp/job/stockUpJob.vue
@@ -5,13 +5,13 @@
 			@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>
+						<comStockUpJobCard :dataContent="item" @click='openJobDetail(item)'></comStockUpJobCard>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
@@ -20,15 +20,17 @@
 			<job-info-popup ref='jobInfoPopup'></job-info-popup>
 
 			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
-			<comMessage ref="comMessage"></comMessage>
+
 		</view>
+		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
 
 <script>
+
 	import {
-		getPickJobList,
-		cancleTakePickJob
+		getStockUpJobList,
+		cancleTakeStockUpJob
 	} from '@/api/request2.js';
 
 	import {
@@ -43,17 +45,17 @@
 
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
 	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comStockUpJobCard from '@/pages/stockUp/coms/comStockUpJobCard.vue'
+	import jobListPopup from '@/pages/stockUp/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/stockUp/coms/jobInfoPopup.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',
+		name: 'Deliver',
 		components: {
 			comEmptyView,
 			jobFilter,
-			comProductJobCard,
+			comStockUpJobCard,
 			jobListPopup,
 			jobInfoPopup
 		},
@@ -74,14 +76,13 @@
 		},
 
 		onShow() {
-			this.getList("refresh")
+			this.getList('refresh');
 		},
 
 		onReady() {
 			this.detailOptions = getDetailOption();
 			this.detailGiveupOptions = getDetailGiveupOption();
 		},
-
 		onReachBottom() {
 			//避免多次触发
 			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
@@ -94,7 +95,6 @@
 			this.getList('refresh');
 		},
 
-
 		//后退按钮
 		onBackPress(options) {
 			if (options.from === 'navigateBack') {
@@ -134,19 +134,19 @@
 						value: this.todayTime
 					})
 				}
-
+				
 				filters.push({
 					column: "status",
 					action: "in",
 					value: this.status
 				})
-
+				
 				var params = {
 					filters: filters,
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
 				}
-				getPickJobList(params).then(res => {
+				getStockUpJobList(params).then(res => {
 					uni.hideLoading();
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
@@ -154,20 +154,20 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("直接备货任务(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
 						return;
 					}
-					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.jobList = type === "refresh" ? list : this.receiptList.concat(list);
 					this.pageNo++;
-					updateTitle("制品收货(" + this.totalCount + ")");
 
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("制品收货");
+					updateTitle("直接备货任务");
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
@@ -176,7 +176,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './pickJobDetail?id=' + item.id + '&status=' + item.status
+					url: './stockUpJobDetail?id=' + item.id + '&status=' + item.status
 				});
 			},
 
@@ -206,13 +206,13 @@
 			},
 
 			cancleJob(id) {
-				cancleTakePickJob(id).then(res => {
-					if (res.data) {
+				cancleTakeStockUpJob(id).then(res => {
+					if(res.data){
 						this.getList("refresh")
 						uni.showToast({
-							title: "放弃任务成功"
+							title:"放弃任务成功"
 						})
-					} else {
+					}else {
 						this.showMessage("放弃任务失败")
 					}
 				}).catch(error => {
@@ -251,13 +251,13 @@
 					action: "==",
 					value: code
 				})
-
+			
 				var params = {
 					filters: filters,
 					pageNo: 1,
 					pageSize: 100,
 				}
-				getPickJobList(params).then(res => {
+				getStockUpJobList(params).then(res => {
 					uni.hideLoading();
 					if (res.data.list.length == 0) {
 						that.showMessage('未查找到' + '【' + code + '】的收货任务');
@@ -276,11 +276,11 @@
 
 					}
 				});
-			},
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
new file mode 100644
index 00000000..6c5cd4e2
--- /dev/null
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -0,0 +1,461 @@
+<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 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" :key="index">
+					<comStockUpDetailCard ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
+					</comStockUpDetailCard>
+				</view>
+			</scroll-view>
+		</view>
+
+		<div class="btn_bottom">
+			<view class="" style="display: flex;flex-direction: row;">
+				<view class="">
+					<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+				</view>
+			</view>
+		</div>
+		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+		<comScanStockUpPack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</comScanStockUpPack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getStockUpJobDetail,
+		getBasicLocationByCode,
+		takeStockUpJob,
+		cancleTakeStockUpJob,
+		stockUpJobsubmit
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateTime,
+		getDirectoryItemArray,
+		getPackingNumberAndBatch,
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comStockUpDetailCard from '@/pages/stockUp/coms/comStockUpDetailCard.vue'
+	import comScanStockUpPack from '@/pages/stockUp/coms/comScanStockUpPack.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			jobDetailPopup,
+			winScanButton,
+			comStockUpDetailCard,
+			comScanStockUpPack,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				status: "",
+				toLocationCode: "",
+				jobStatus:""
+			};
+		},
+
+		props: {
+
+		},
+
+		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") {
+					//取消承接任务	
+					cancleTakeStockUpJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeStockUpJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getStockUpJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status;
+							
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.resizeCollapse();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			closeScan() {
+				this.resizeCollapse();
+			},
+
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+
+
+
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						itemCodes.push(item.itemCode)
+					})
+				})
+
+				//使用在途库，不查询管理模式
+				if (locationCode == null) {
+					this.submitJob();
+				} else {
+					//获取管理模式，封装参数
+					getManagementPrecisions(itemCodes, locationCode, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							this.submitJob();
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+					});
+				}
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+
+				stockUpJobsubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成发货记录" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+								if (batch.Records.length > 0) {
+									batch.Records.forEach(r => {
+										let record = {};
+										record.handleQty = r.qty;
+										record.toContainerNumber = r
+											.ContainerNumber;
+										record.toInventoryStatus = r
+											.inventoryStatus;
+										record.toLocationCode = subItem
+											.toLocationCode;
+										record.supplierCode = r.supplierCode;
+
+										//使用在途库不改变管理模式
+										if (this.toLocationCode ==null) {
+											record.toPackingNumber = r
+												.packingNumber;
+											record.toBatch = r.batch;
+										} else {
+											var info = getPackingNumberAndBatch(
+												this.managementList, r
+												.itemCode,
+												r.packingNumber, r
+												.batch);
+											record.toPackingNumber = info
+												.packingNumber;
+											record.toBatch = info.batch;
+										}
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
+						})
+					})
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			cancel() {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+					if (res) {
+						that.clearInfo();
+					}
+				});
+			},
+
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
+
+						})
+					}
+
+				})
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty, res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty, handleQty)
+						}
+					})
+				}
+				// item.handleQty=itemHandleQty;
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.uni-numbox__value {
+		width: 40px;
+	}
+
+	button[disabled] {
+		background-color: #3C9CFF;
+		color: #fff;
+		opacity: 0.7;
+	}
+
+
+	// /deep/ .input-value {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item__title-text {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 0px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 1px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+</style>
diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
index 16313ac0..333ec1e5 100644
--- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
@@ -142,6 +142,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("供应商发货记录(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -149,7 +150,7 @@
 					}
 					this.recordList = type === "refresh" ? list : this.recordList.concat(list);
 					this.pageNo++;
-					updateTitle("供应商发货记录(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue
index 674c191b..cb4660b7 100644
--- a/src/pages/transfer/job/issueJob.vue
+++ b/src/pages/transfer/job/issueJob.vue
@@ -156,6 +156,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("调拨出库任务(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -163,7 +164,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("调拨出库任务(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue
index 87c65a88..9e4d7d6f 100644
--- a/src/pages/transfer/job/receiptJob.vue
+++ b/src/pages/transfer/job/receiptJob.vue
@@ -155,6 +155,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("调拨入库任务(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -162,7 +163,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("调拨入库任务(" + this.totalCount + ")");
+					
 				}).catch(error => {
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue
index c5ef37ff..8655c4d8 100644
--- a/src/pages/unPlanned/job/issueJob.vue
+++ b/src/pages/unPlanned/job/issueJob.vue
@@ -158,6 +158,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("计划外出库(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -165,7 +166,6 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("计划外出库(" + this.totalCount + ")");
 					
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue
index 9a9b713d..dafe8b88 100644
--- a/src/pages/unPlanned/job/receiptJob.vue
+++ b/src/pages/unPlanned/job/receiptJob.vue
@@ -145,6 +145,7 @@
 					}
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("计划外入库(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -152,7 +153,7 @@
 					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
-					updateTitle("计划外入库(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue
index de9faeb0..5b963c07 100644
--- a/src/pages/unPlanned/record/issueRecord.vue
+++ b/src/pages/unPlanned/record/issueRecord.vue
@@ -69,7 +69,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		deepCopyData
 	} from '@/common/basic.js';
 
diff --git a/src/pages/unPlanned/record/receiptRecord.vue b/src/pages/unPlanned/record/receiptRecord.vue
index b306fc69..cc6e8f6e 100644
--- a/src/pages/unPlanned/record/receiptRecord.vue
+++ b/src/pages/unPlanned/record/receiptRecord.vue
@@ -72,7 +72,6 @@
 	} from 'decimal.js'; //引入
 	import {
 		goHome,
-		updateTitle,
 		deepCopyData,
 		getPackingNumberAndBatchByList
 	} from '@/common/basic.js';
diff --git a/src/pages/unPlanned/request/issueRequest.vue b/src/pages/unPlanned/request/issueRequest.vue
index 03357c79..4e04af98 100644
--- a/src/pages/unPlanned/request/issueRequest.vue
+++ b/src/pages/unPlanned/request/issueRequest.vue
@@ -159,6 +159,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("计划外出库申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -171,7 +172,7 @@
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
 
 					this.pageNo++;
-					updateTitle("计划外出库申请(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/unPlanned/request/issueRequestCreate.vue b/src/pages/unPlanned/request/issueRequestCreate.vue
index af297c18..b85ed4f2 100644
--- a/src/pages/unPlanned/request/issueRequestCreate.vue
+++ b/src/pages/unPlanned/request/issueRequestCreate.vue
@@ -75,7 +75,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		deepCopyData,
 		getCurrDateTimes,
 		getCurrDateOneMonthsTimes,
diff --git a/src/pages/unPlanned/request/receiptRequest.vue b/src/pages/unPlanned/request/receiptRequest.vue
index 5cdfb5ff..27f73e0e 100644
--- a/src/pages/unPlanned/request/receiptRequest.vue
+++ b/src/pages/unPlanned/request/receiptRequest.vue
@@ -157,6 +157,7 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					updateTitle("计划外入库申请(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@@ -168,7 +169,7 @@
 					})
 					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
 					this.pageNo++;
-					updateTitle("计划外入库申请(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {
diff --git a/src/pages/unPlanned/request/receiptRequestCreate.vue b/src/pages/unPlanned/request/receiptRequestCreate.vue
index 5fbcc64a..0a3aaba4 100644
--- a/src/pages/unPlanned/request/receiptRequestCreate.vue
+++ b/src/pages/unPlanned/request/receiptRequestCreate.vue
@@ -56,7 +56,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getRemoveOption,
 		getISODateTime,
 		navigateBack,
diff --git a/src/static/config.js b/src/static/config.js
index e9b53adc..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.128:12080/admin-api"
+let request_url = "http://dev.ccwin-in.com:25300/api/admin-api"
+// let request_url = "http://192.168.0.113:12080/admin-api"
 
 let isDevelopment = true