diff --git a/api/request2.js b/api/request2.js
index 45b1d8b6..366316b1 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -2296,13 +2296,82 @@ export function getProductionReturnRequestDetail(id) {
 }
 
 /**
- * 生产退料申请 提交
- * @param {*} params 
+ * 生产退料申请 处理
+ * @param {*}    id
+ * 
  */
-export function productionReturnRequestSubmit(params) {
+export function productionReturnRequestHandle(id) {
 	return request({
-		url: baseApi + "/wms/purchasereturn-request-main/submit",
+		url: baseApi + "/wms/productionreturn-request-main/handle?id=" + id,
 		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 生产退料申请 提交审批
+ * @param {*}    id
+ * 
+ */
+export function productionReturnRequestSubmitApprove(id) {
+	return request({
+		url: baseApi + "/wms/productionreturn-request-main/submit?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 生产退料申请 审批通过
+ * @param {*}    id
+ * 
+ */
+
+export function productionReturnRequestSubmitApproveAgree(id) {
+	return request({
+		url: baseApi + "/wms/productionreturn-request-main/agree?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 生产退料申请 审批驳回
+ * @param {*}    id
+ * 
+ */
+export function productionReturnRequestSubmitApproveRefused(id) {
+	return request({
+		url: baseApi + "/wms/productionreturn-request-main/refused?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 生产退料申请 关闭
+ * @param {*}    id
+ * 
+ */
+export function productionReturnRequestClose(id) {
+	return request({
+		url: baseApi + "/wms/productionreturn-request-main/close?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
+
+
+
+/**
+ * 生产退料申请 创建
+ * @param {*} params 
+ */
+
+export function productionReturnRequestCreate(params) {
+	return request({
+		url: baseApi + "/wms/productionreturn-request-main/create",
+		method: "post",
 		data: params,
 	});
 }
diff --git a/common/style/new_style.css b/common/style/new_style.css
index 98b69d1f..48a98b6b 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -497,7 +497,7 @@ uni-page-head .uni-page-head__title {
 }
 
 .popup_box .pop_tab .tab_info textarea {
-	height: 280rpx;
+	height: 320rpx;
 }
 
 .popup_box .pop_tab .tab_info .uni-textarea-placeholder {
diff --git a/mycomponents/job/jobPersonInfo.vue b/mycomponents/job/jobPersonInfo.vue
index 7c1be5d6..fa28ee10 100644
--- a/mycomponents/job/jobPersonInfo.vue
+++ b/mycomponents/job/jobPersonInfo.vue
@@ -8,7 +8,7 @@
 				</view>
 				<view class="item">
 					<text class="item_title">承接时间 : </text>
-					<text class="text_wrap">{{dataContent.acceptTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.acceptTime)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">创建人 : </text>
@@ -16,7 +16,7 @@
 				</view>
 				<view class="item">
 					<text class="item_title">创建时间 : </text>
-					<text class="text_wrap">{{dataContent.createTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.createTime)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">完成人 : </text>
@@ -24,7 +24,7 @@
 				</view>
 				<view class="item">
 					<text class="item_title">完成时间 : </text>
-					<text class="text_wrap">{{dataContent.completeTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.completeTime)}} </text>
 				</view>
 			</view>
 		</view>
@@ -32,6 +32,8 @@
 </template>
 
 <script>
+	
+	import {dateFormat} from "@/common/basic.js"
 	export default {
 		components: {},
 		data() {
@@ -48,7 +50,12 @@
 			}
 		},
 
-		methods: {}
+		methods: {
+			dateFormat(value){
+				return dateFormat(value)
+			}
+			
+		}
 	}
 </script>
 
diff --git a/mycomponents/job/jobRequestInfo.vue b/mycomponents/job/jobRequestInfo.vue
index 66d18570..59294f68 100644
--- a/mycomponents/job/jobRequestInfo.vue
+++ b/mycomponents/job/jobRequestInfo.vue
@@ -8,11 +8,11 @@
 				</view>
 				<view class="item">
 					<text class="item_title">申请时间 : </text>
-					<text class="text_wrap">{{dataContent.requestTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.requestTime)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">要求截至时间 : </text>
-					<text class="text_wrap">{{dataContent.requestDueTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.requestDueTime)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">从仓库代码 : </text>
@@ -22,16 +22,34 @@
 					<text class="item_title">到仓库代码 : </text>
 					<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
 				</view>
+				<view class="item">
+					<text class="item_title">出库库存状态范围 : </text>
+					<text class="text_wrap">{{getInventoryStatusDesc(getDirectoryItemArray(dataContent.outInventoryStatuses))}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">入库库存状态范围 : </text>
+					<text class="text_wrap">{{getInventoryStatusDesc(getDirectoryItemArray(dataContent.inInventoryStatuses))}} </text>
+				</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		dateFormat,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusDesc
+	} from '@/common/directory.js';
+	
 	export default {
 		components: {},
 		data() {
 			return {
+				list:["OK"]
 
 			}
 		},
@@ -44,7 +62,19 @@
 			}
 		},
 
-		methods: {}
+		methods: {
+			dateFormat(value){
+				return dateFormat(value)
+			},
+			getInventoryStatusDesc(value){
+				return getInventoryStatusDesc(value)
+			},
+			
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			}
+			
+		}
 	}
 </script>
 
diff --git a/mycomponents/job/jobTop.vue b/mycomponents/job/jobTop.vue
index 56562d7e..7aab393c 100644
--- a/mycomponents/job/jobTop.vue
+++ b/mycomponents/job/jobTop.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="task_top">
-		<view class="uni-flex space-between u-col-center">
+		<view class="uni-flex space-between u-col-center align-center" >
 			<job-number :number="dataContent.number"></job-number>
 			<job-status :jobStatus="dataContent.status"></job-status>
 		</view>
diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue
index 315e97ed..9616a0f8 100644
--- a/mycomponents/scan/winComScan.vue
+++ b/mycomponents/scan/winComScan.vue
@@ -10,10 +10,10 @@
 						@input="handelScanMsg" :cursor="cursorIndex"></textarea>
 				</view>
 
-				<view class="uni-flex uni-row space-between u-col-center">
-					<view class="paizhao" @click="scanQRCode()">
+				<view class="uni-flex uni-row space-between u-col-center" >
+					<!-- <view class="paizhao" @click="scanQRCode()" v-if="true">
 						<image src="/static/icons/icons_camera.svg" alt="" />
-					</view>
+					</view> -->
 
 					<view class="uni-flex">
 						<button class="clean_scan_btn" @click="clearScanValue()">清空</button>
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index e84e4197..e3ec3242 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -247,9 +247,14 @@
 					})
 				} else if (datas.length == 1) {
 					let balance = datas[0];
-					this.packCallBack(balance);
+					if(balance.qty>0){
+						this.packCallBack(balance);
+					}else {
+						this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为['+balance.qty+"],<br>不可以进行操作", res => {
+							this.packGetFocus();
+						})
+					}
 				} else {
-					
 					this.showBalanceSelect(datas);
 				}
 			},
@@ -259,7 +264,13 @@
 			},
 
 			selectBalanceItem(balance) {
-				this.packCallBack(balance);
+				if(balance.qty>0){
+					this.packCallBack(balance);
+				}else {
+					this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为['+balance.qty+"],不可以进行操作", res => {
+						this.packGetFocus();
+					})
+				}
 			},
 
 			packCallBack(item) {
diff --git a/pages.json b/pages.json
index b86ffb87..9b3d427a 100644
--- a/pages.json
+++ b/pages.json
@@ -529,7 +529,34 @@
 		{
 			"path": "pages/productionReturn/request/returnToStoreRequest",
 			"style": {
-				"navigationBarTitleText": "生产退料合格申请",
+				"navigationBarTitleText": "生产合格退料申请",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+				
+						},
+						{
+				
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/productionReturn/request/returnToStoreRequestSubmit",
+			"style": {
+				"navigationBarTitleText": "生产合格退料申请",
 				"enablePullDownRefresh": true,
 				"titleNView": {
 					// "autoBackButton": "true",
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index aae27b25..7b38c44f 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -47,6 +47,7 @@
 
 	import {
 		goHome,
+		navigateBack,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
 
@@ -562,15 +563,6 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
 			editItem(item) {
 				var detail = this.detailSource.find(r => r.itemCode == item.record.itemCode);
 				this.$refs.CountQtyEdit.openEditPopup(item.record,
@@ -579,13 +571,8 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1);
 				})
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				}, 3000)
 			}
 		}
 
diff --git a/pages/count/record/countRecord.vue b/pages/count/record/countRecord.vue
index 29f99d2e..9e6dac39 100644
--- a/pages/count/record/countRecord.vue
+++ b/pages/count/record/countRecord.vue
@@ -47,7 +47,8 @@
 <script>
 	import {
 		goHome,
-		getDataSource
+		getDataSource,
+		navigateBack
 	} from '@/common/basic.js';
 	
 	import {
@@ -497,25 +498,10 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1)
 				})
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				}, 3000)
 			},
 		}
 	}
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index 8affa224..9ddd64d4 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -50,7 +50,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 		getDirectoryItemArray
@@ -478,9 +478,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './returnJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
index 9417f7d4..eb804fbb 100644
--- a/pages/deliver/job/deliverDetail.vue
+++ b/pages/deliver/job/deliverDetail.vue
@@ -57,6 +57,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getRemoveOption,
 		getCurrDateTime,
 		getDirectoryItemArray,
@@ -374,9 +375,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './deliverJob'
-					})
+					navigateBack(1)
 				})
 			},
 
@@ -384,9 +383,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
 
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index 79cba6a4..3f4bae60 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -3,7 +3,7 @@
 		<view style="margin: 5px;">
 			<job-top :dataContent="jobContent"></job-top>
 			<view>
-				<view class="card_content"> 检验类型 : {{jobContent.asnNumber}}</view>
+				<view class="card_content"> 检验类型 : {{getInspectType(jobContent.inspectType)}}</view>
 			</view>
 		</view>
 		<view class="page-main">
@@ -50,7 +50,8 @@
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName,
-		getDirectoryItemArray
+		getDirectoryItemArray,
+		getInspectType
 	} from '@/common/directory.js';
 
 	import {
@@ -439,7 +440,7 @@
 							detail.sampleQty = detail.qty;
 							detail.failedQty = detail.failedQty;
 							detail.crackQty = detail.crackQty;
-							detail.notPassedQty = detail.notPassedQty;
+							detail.notPassedQty = Number(detail.receiveQty)-Number(detail.crackQty);
 							// detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
 							detail.inspectUser = this.$store.state.user.id
 
@@ -455,18 +456,12 @@
 									detail.toInventoryStatus = "NOK"
 								}
 							}
-							// detail.singlePrice = detail.balance.singlePrice;
-							// detail.amount = detail.balance.singlePrice * detail.handleQty;
-
-							// detail.arriveDate = detail.balance.arriveDate;
-							// detail.produceDate = detail.balance.produceDate;
-							// detail.expireDate = detail.balance.expireDate;
 
 						} else {
 							detail.sampleQty = detail.qty;
 							detail.failedQty = 0;
 							detail.crackQty = 0;
-							detail.notPassedQty = 0;
+							detail.notPassedQty =  Number(detail.receiveQty)-Number(detail.crackQty);;
 							detail.goodQty = detail.qty;
 							detail.inspectUser = this.$store.state.user.id
 							detail.toInventoryStatus = "OK"
@@ -482,18 +477,12 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					// let canNavBack = getCurrentPages()
-					// if( canNavBack && canNavBack.length>1) {  
-					//     uni.navigateBack({
-					// 	delta:2
-					// }) 
-					// } else {  
-					//     history.back();  
-					// }
 					navigateBack(2);
 				})
-
 			},
+			getInspectType(value){
+				return getInspectType(value)
+			}
 
 
 		}
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
index 3946deaa..7cb69a90 100644
--- a/pages/inspect/job/inspectResult.vue
+++ b/pages/inspect/job/inspectResult.vue
@@ -366,7 +366,7 @@
 						this.jobContent.subList.forEach(res => {
 							res.handleQty = res.qty
 							res.failedQty = 0;
-							res.notPassedQty = 0;
+							res.notPassedQty = res.failedQty;
 							res.crackQty = 0;
 							res.goodQty = res.qty;
 							res.failedReason = "";
@@ -405,7 +405,7 @@
 						this.jobContent.subList.forEach(res => {
 							res.handleQty = res.qty
 							res.failedQty = res.qty;
-							res.notPassedQty = res.qty;
+							res.notPassedQty = res.failedQty;
 							res.crackQty = 0;
 							res.goodQty = 0;
 							res.failedReason = "";
@@ -432,7 +432,7 @@
 						this.jobContent.subList.forEach(res => {
 							res.handleQty = res.qty
 							res.failedQty = 0;
-							res.notPassedQty = 0;
+							res.notPassedQty = res.failedQty;
 							res.crackQty = 0;
 							res.goodQty = res.qty;
 							res.failedReason = "";
diff --git a/pages/inventoryMove/job/inventoryMoveDetail.vue b/pages/inventoryMove/job/inventoryMoveDetail.vue
index 52498132..b1a24cbf 100644
--- a/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -50,6 +50,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName
@@ -414,22 +415,9 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './inventoryMoveJob'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './inventoryMoveJob'
-					})
+					navigateBack(1)
 				})
 			},
 
diff --git a/pages/issue-按批次推荐/job/issueDetail.vue b/pages/issue-按批次推荐/job/issueDetail.vue
index 64951b0a..5d5578af 100644
--- a/pages/issue-按批次推荐/job/issueDetail.vue
+++ b/pages/issue-按批次推荐/job/issueDetail.vue
@@ -628,10 +628,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);
 			},
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index 70f20728..1b2bc367 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -157,6 +157,8 @@
 			this.scanOptions = getDetailEditRemoveOption();
 		},
 		methods: {
+			
+			
 			openScanPopup(content, jobcontent) {
 				this.issueRecord = [];
 				this.dataContent = content;
@@ -178,7 +180,7 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses =this.jobContent.outInventoryStatuses
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index 5bdd2585..e60ac841 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -1,9 +1,13 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-main">
-			<!-- 	<view class="" style="padding: 15rpx;font-size: 35rpx; ">
-				车间代码 : {{jobContent.workShopCode}}
-			</view> -->
+			<view style="margin: 5px;">
+				<job-top :dataContent="jobContent"></job-top>
+				<view class="card_content">
+					申请单号 : {{jobContent.requestNumber}}
+				</view>
+				<u-line />
+			</view>
 
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
@@ -40,6 +44,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getRemoveOption,
 		getISODateTime,
 		getCurrDateTime,
@@ -61,6 +66,7 @@
 	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 
 	export default {
 		name: 'issueDetail',
@@ -70,7 +76,8 @@
 			comIssueDetailCard,
 			comIssueRequestInfo,
 			comScanIssuePack,
-			comMessage
+			comMessage,
+			jobTop
 		},
 		data() {
 			return {
@@ -393,9 +400,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './issueJob'
-					})
+					navigateBack(1)
 				})
 			},
 
@@ -403,10 +408,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},
diff --git a/pages/issue/job/issueReceiptJob.vue b/pages/issue/job/issueReceiptJob.vue
index 6c4887e5..cf23b6a8 100644
--- a/pages/issue/job/issueReceiptJob.vue
+++ b/pages/issue/job/issueReceiptJob.vue
@@ -33,7 +33,7 @@
 
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
 	} from '@/common/basic.js';
 
 	import {
diff --git a/pages/productDismantle/job/productDismantleDetail.vue b/pages/productDismantle/job/productDismantleDetail.vue
index 5641a2c4..7ef66caf 100644
--- a/pages/productDismantle/job/productDismantleDetail.vue
+++ b/pages/productDismantle/job/productDismantleDetail.vue
@@ -14,7 +14,7 @@
 			</scroll-view>
 		</view>
 
-		
+
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
@@ -54,6 +54,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 	} from '@/common/basic.js';
@@ -369,7 +370,7 @@
 					}
 				});
 			},
-			
+
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
@@ -483,14 +484,9 @@
 			},
 
 			showCommitSuccessMessage(hint) {
-				setTimeout(() => {
-					this.$refs.comMessage.showSuccessMessage(hint, res => {
-
-					})
-					uni.navigateTo({
-						url: './putawayJob'
-					})
-				}, 3000)
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
 			},
 		}
 	}
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
index 538b27bb..7b7fa0cc 100644
--- a/pages/productPutaway/job/productPutawayDetail.vue
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -53,6 +53,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 	} from '@/common/basic.js';
@@ -469,9 +470,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './putawayJob'
-					})
+					navigateBack(1);
 				})
 			},
 		}
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 8bb89015..1ea8efa7 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -14,8 +14,6 @@
 			</scroll-view>
 		</view>
 
-		
-
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
@@ -50,6 +48,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
 	
@@ -403,9 +402,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './productReceiptJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
index 1c3d6593..d6e03ab7 100644
--- a/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -14,7 +14,7 @@
 			</scroll-view>
 		</view>
 
-		
+
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
@@ -53,6 +53,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName
@@ -234,7 +235,7 @@
 
 			getScanResult(result) {
 				try {
-					var supplierCode =result.package.supplierCode
+					var supplierCode = result.package.supplierCode
 					var packingNumber = result.balance.packingNumber;
 					var batch = result.balance.batch;
 					var qty = result.balance.qty;
@@ -266,14 +267,14 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.supplierCode =supplierCode
+												itemDetail.supplierCode = supplierCode
 												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
 													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
 												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty =result.package.stdPackQty
-												itemDetail.balance.stdPackUnit =result.package.stdPackUnit
+												itemDetail.balance.stdPackQty = result.package.stdPackQty
+												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 												this.calcHandleQty();
 											} else {
 												this.scanPopupGetFocus();
@@ -320,7 +321,7 @@
 				if (!this.checkLocation()) {
 					return
 				}
-			
+
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.submitJob();
@@ -341,19 +342,19 @@
 					}
 				}
 			},
-			
+
 			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) {
@@ -362,7 +363,7 @@
 				});
 			},
 
-			 submitJob() {
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -371,13 +372,13 @@
 				this.detailSource.forEach(item => {
 					itemCodes.push(item.itemCode)
 				})
-				
-				getManagementPrecisions(itemCodes,this.toLocationCode, res => {
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
 						var params = this.setParams()
-						console.log("提交参数",JSON.stringify(params));
-												
+						console.log("提交参数", JSON.stringify(params));
+
 						productionReceiptJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
@@ -395,27 +396,27 @@
 					}
 				});
 			},
-			
+
 			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.toLocationCode =this.toLocationCode;
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = "";
+							detail.toLocationCode = this.toLocationCode;
 
 							subList.push(detail)
 						}
 					})
 				})
 				this.jobContent.subList = subList
-				this.jobContent.creator =creator;
+				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
 
@@ -463,7 +464,7 @@
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},
-			
+
 			scanLocationCode(location, code) {
 				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
@@ -476,14 +477,9 @@
 			},
 
 			showCommitSuccessMessage(hint) {
-				setTimeout(() => {
-					this.$refs.comMessage.showSuccessMessage(hint, res => {
-
-					})
-					uni.navigateTo({
-						url: './putawayJob'
-					})
-				}, 3000)
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
 			},
 		}
 	}
diff --git a/pages/productionReturn/coms/comReturn.vue b/pages/productionReturn/coms/comReturn.vue
index 19399fdb..0d0852f9 100644
--- a/pages/productionReturn/coms/comReturn.vue
+++ b/pages/productionReturn/coms/comReturn.vue
@@ -434,16 +434,6 @@
 
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			/**
 			 * BlobUrl转blob数据  
 			 * @param {Object} url blob URL
diff --git a/pages/productionReturn/coms/comReturnCommonRequest.vue b/pages/productionReturn/coms/comReturnCommonRequest.vue
new file mode 100644
index 00000000..cf580725
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -0,0 +1,407 @@
+<template>
+	<view>
+		<com-empty-view v-if="requestList.length==0"></com-empty-view>
+		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
+			:checkedWaitTask="checkedWaitTask">
+		</request-filter>
+		<view v-if="requestList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in requestList" :key="index">
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
+						<com-return-request-card :dataContent="item" @click='openRequestDetail(item)'>
+						</com-return-request-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+			<uni-load-more :status="loadingType" />
+			<request-info-popup ref='requestInfoPopup'></request-info-popup>
+		</view>
+		<requestButton @goScan='openScanDetailPopup'></requestButton>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import requestFilter from '@/mycomponents/request/requestFilter.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import comReturnRequestCard from '@/pages/productionReturn/coms/comReturnRequestCard.vue'
+	import requestInfoPopup from '@/pages/productionReturn/coms/requestInfoPopup.vue'
+	import requestButton from '@/mycomponents/button/requestButton.vue'
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+	import {
+		getProductionReturnRequestList,
+		productionReturnRequestHandle,
+		productionReturnRequestSubmitApprove,
+		productionReturnRequestSubmitApproveAgree,
+		productionReturnRequestSubmitApproveRefused,
+		productionReturnRequestClose
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailAndApproveOption,
+		getDetailAndApprovePassAndApproveNoOption,
+		getDetailAndHandleOption,
+		getDetailAndCloseOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			requestFilter,
+			requiredLocation,
+			comMessage,
+			comReturnRequestCard,
+			requestInfoPopup,
+			requestButton,
+		},
+		data() {
+			return {
+				requestList: [],
+				pageNo: 1,
+				pageSize: 10,
+				status: "",
+				totalCount: 0,
+				checkedWaitTask: false,
+				detailOptions: [],
+				detailAndApproveOptions: [],
+				detailAndApprovePassAndApproveNoOption: [],
+				detailAndHandleOption: [],
+				detailAndCloseOption: [],
+				showOptions: [],
+				loadingType: "nomore",
+				title:"",
+				fromType:""
+
+			};
+		},
+		
+		props: {
+			businessType: {
+				type: String,
+				default: ''
+			},
+		},	
+		
+		
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.detailAndApproveOptions = getDetailAndApproveOption()
+			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
+				this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndCloseOption = getDetailAndCloseOption()
+			this.updateTitle();
+			this.getList('refresh');
+			
+		},
+		
+		methods: {
+			updateTitle() {
+				if (this.businessType == 'ReturnToStore') {
+					this.title = "生产合格退料申请"
+					this.fromType ="ReturnToStore"
+				} else if (this.businessType == 'ReturnToHold') {
+					this.title = "生产隔离退料申请"
+					this.fromType ="ReturnToHold"
+				}
+				updateTitle(this.title)
+			},
+			
+			onShow(){
+				this.getList('refresh');
+			},
+			onReachBottom() {
+				//避免多次触发
+				if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+					return;
+				}
+				this.getList("more");
+			},
+			
+			onPullDownRefresh() {
+				this.getList('refresh');
+			},
+
+			openRequestInfoPopup(item) {
+				this.$refs.requestInfoPopup.openPopup(item)
+			},
+			openRequestDetail(item) {
+				uni.navigateTo({
+					url: './requestDetail?id=' + item.id
+				});
+			},
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.requestList = [];
+				}
+				var filters = []
+				if (this.checkedWaitTask) {
+					filters.push({
+						column: "status",
+						action: "==",
+						value: this.status
+					})
+				}
+				filters.push({
+					column: "business_type",
+					action: "==",
+					value: this.businessType
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+				getProductionReturnRequestList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					list.forEach(res => {
+						var options = this.updateOptions(res.status);
+						res.options = options;
+					})
+					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
+
+					this.pageNo++;
+					updateTitle(this.title+"("+this.totalCount + ")")
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle(this.title)
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+
+			updateOptions(status) {
+				if (status == "1") {
+					this.showOptions = this.detailAndApproveOptions;
+				} else if (status == "2") {
+					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
+				} else if (status == "3") {
+					this.showOptions = this.detailAndHandleOption;
+				} else if (status == "4") {
+					this.showOptions = this.detailAndCloseOption;
+				} else {
+					this.showOptions = this.detailOptions;
+				}
+				return this.showOptions
+			},
+
+			openScanDetailPopup() {
+				uni.navigateTo({
+					url: "./returnToStoreRequestSubmit?fromType=" + this.fromType
+				})
+			},
+			openFilter(){
+				this.$refs.filter.openFilter();
+			},
+			
+			swipeClick(e, dataContent) {
+				var text = clearTirmAndWrap(e.content.text)
+				if (e.content.text == "详情") {
+					this.openRequestInfoPopup(dataContent);
+				} else if (e.content.text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+						this.productionReturnRequestHandle(dataContent.id)
+					})
+				} else if (e.content.text == "审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+						this.productionReturnRequestSubmitApprove(dataContent.id)
+					})
+				} else if (e.content.text == "审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+						this.productionReturnRequestSubmitApproveAgree(dataContent.id)
+					})
+				} else if (e.content.text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+						this.productionReturnRequestSubmitApproveRefused(dataContent.id)
+					})
+				} else if (e.content.text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+						this.productionReturnRequestClose(dataContent.id)
+					})
+				}
+			},
+			
+			showQuestionMessage(hint,callBack){
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
+			
+			
+			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: "number",
+					action: "==",
+					value: code
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getProductionReturnRequestList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openRequestDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			productionReturnRequestSubmitApprove(id) {
+				productionReturnRequestSubmitApprove(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			
+			},
+			productionReturnRequestClose(id) {
+				productionReturnRequestClose(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productionReturnRequestSubmitApproveAgree(id) {
+				productionReturnRequestSubmitApproveAgree(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productionReturnRequestSubmitApproveRefused(id) {
+				productionReturnRequestSubmitApproveRefused(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productionReturnRequestHandle(id) {
+				productionReturnRequestHandle(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "申请处理成功"
+						})
+					} else {
+						this.showMessage("申请处理失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/comReturnRequestCreator.vue b/pages/productionReturn/coms/comReturnRequestCreator.vue
new file mode 100644
index 00000000..aeaaf9fd
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestCreator.vue
@@ -0,0 +1,102 @@
+<template>
+	<view class="">
+		<uni-collapse ref="collapse">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<view class="" style="font-size: 32rpx;">
+						<view class="" >
+							车间 : {{dataContent.workShopName}} ({{dataContent.workshopCode}})
+						</view>
+						<view class="" >
+							类型 : {{getType(dataContent.businessType)}} 
+						</view>
+						<view class="">
+							总数量 : {{dataContent.totalQty}} 
+						</view>
+					</view>
+					
+				</template>
+				<u-line />
+				<uni-swipe-action ref="swipeAction">
+					<view v-for="(item, index) in dataContent.subList" :key="index">
+						<uni-swipe-action-item>
+							<view class="" style="font-size: 32rpx;margin: 10rpx;">
+								<view class="">
+									生产线 : {{item.productionLineName}}({{item.productionLineCode}})
+								</view>
+								<view class="">
+									工位 : {{item.workStationName}} ({{item.workStationCode}})
+								</view>
+								<view class="">
+									物品代码 : {{item.itemCode}}
+								</view>
+								<view class="">
+									物品名称 : {{item.itemName}}
+								</view>
+								
+								<view class="uni-flex uni-row uni-center">
+									<view class="">
+										数量 : {{item.qty}} 单位 : 
+									</view>
+									<view class="">
+										<uom :uom="item.uom"></uom>
+									</view>
+									
+								</view>
+
+							</view>
+						</uni-swipe-action-item>
+						<u-line />
+					</view>
+				</uni-swipe-action>
+
+			</uni-collapse-item>
+		</uni-collapse>
+
+
+	</view>
+</template>
+
+<script>
+	import uom from '@/mycomponents/qty/uom.vue'
+	export default {
+		components: {
+			uom
+		},
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+		methods: {
+			update(){
+				this.$nextTick(r => {
+					this.$refs.collapse.resize()
+				});
+			},
+			getType(value){
+				var type =""
+				if(value=="ReturnToStore"){
+					type ="合格退料"
+				}else if (value=='ReturnToHold'){
+					type ="隔离退料"
+				}
+				return type;
+			}
+
+
+
+
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/comReturnRequestPopup.vue b/pages/productionReturn/coms/comReturnRequestPopup.vue
new file mode 100644
index 00000000..b5f64d18
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -0,0 +1,372 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" :maskClick="false">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeRequestPopup()"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; ">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text>位置 : </text>
+								<view class="uni-flex u-col-center uni-row" @click="showSelect">
+									<view class="" style="margin-left: 20rpx;">
+										{{positionInfo}}
+									</view>
+									<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+										@confirm="confirmSelect"></u-select>
+								</view>
+
+							</view>
+							<u-line />
+
+
+							<view class="title padding" style="display: flex;">
+								<text style=" flex-shrink: 0;">箱码：</text>
+								<view class="" style="width: 100% ;">
+									{{itemCode}}
+								</view>
+								<view class="">
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="itemCodeClick">
+									</image>
+								</view>
+
+							</view>
+
+							<u-line />
+
+							<view class="uni-flex uni-row  padding title u-col-center">
+								<text>数量 : </text>
+								<view class="uni-flex uni-row uni-center"
+									style="align-items: center;margin-left: 20rpx;">
+									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
+										:focus="numberFocus" @blur='numberFocus = false'>
+									</uni-number-box>
+									<uom :uom="uom"></uom>
+
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		</win-scan-item>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicLocationByCode,
+		getBasicItemByCode,
+		getProductionlineItem,
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeName,
+		getListLocationTypeDesc,
+		checkDirectoryItemExist
+	} from '@/common/directory.js';
+	import uom from '@/mycomponents/qty/uom.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+
+
+	export default {
+		components: {
+			uom,
+			balanceStatus,
+			comMessage,
+			winScanItem
+		},
+		data() {
+			return {
+				// itemCode: 'CE115F11161AG',
+				workshopCode: "", //车间
+				workShopName: "",
+				productionLineCode: "", //生产线
+				productionLineName: "",
+				workStationCode: "", //工位
+				workStationName: "",
+				itemCode: '请扫描物料信息',
+				itemName: "",
+				qty: 0,
+				rawLocationCode: "",
+				fgLocationCode: "",
+				itemCodeFocus: false,
+				requestInfo: null,
+				itemCodeList: [],
+				isCheckItemCode: false,
+				counQty: 0,
+				editPosition: true,
+				numberFocus: false,
+				uom: "",
+				positionInfo: "请选择位置",
+				show: false,
+				isModifiedPosition: true,
+				positionList: [],
+				list: [{
+						value: 1,
+						label: '车间1',
+						children: [{
+								value: 2,
+								label: '生产线1',
+								children: [{
+										value: 3,
+										label: '工位1'
+									},
+									{
+										value: 4,
+										label: '工位2'
+									}
+								]
+							},
+							{
+								value: 5,
+								label: '生产线2',
+								children: [{
+										value: 6,
+										label: '工位1'
+									},
+									{
+										value: 7,
+										label: '工位2'
+									}
+								]
+							}
+						]
+					},
+					{
+						value: 8,
+						label: '车间2',
+						children: [{
+								value: 9,
+								label: '生产线1',
+								children: [{
+										value: 10,
+										label: '工位1'
+									},
+									{
+										value: 10,
+										label: '工位2'
+									}
+								]
+							}, {
+								value: 9,
+								label: '生产线2',
+								children: [{
+										value: 10,
+										label: '工位1'
+									},
+									{
+										value: 10,
+										label: '工位2'
+									}
+								]
+							},
+
+
+						]
+					}
+				]
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: '需求信息'
+			},
+		},
+		methods: {
+			openRequestPopup(editPosition) {
+				if (this.positionList.length == 0) {
+					getWorkShopLineStation().then(res => {
+						this.positionList = res.data
+					}).catch(error => {
+
+					})
+				}
+
+				this.editPosition = editPosition;
+				if (this.isModifiedPosition) {
+					this.isModifiedPosition = false
+				} else {
+					this.itemCode = "";
+					this.uom = ""
+					this.qty = 0
+					this.itemCodeGetFocus();
+				}
+
+				this.$refs.popup.open('bottom')
+			},
+			closeRequestPopup() {
+				this.$refs.popup.close()
+			},
+			locationConfirm() {
+				//查询库位信息
+				this.checkLocatioCode();
+			},
+			itemCodeClick() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			itemCodeGetFocus() {
+				this.itemCodeFocus = true;
+			},
+			itemCodeLoseFocus() {
+				this.itemCodeFocus = false;
+			},
+			selectedItem(item) {
+				this.itemCode = item.itemCode;
+				this.checkItemCode();
+			},
+
+			confirm() {
+				if (this.itemCode == "" || !this.isCheckItemCode) {
+					this.showErrorMessage("请输入物料", "itemCode")
+					return
+				}
+				if (this.qty == 0) {
+					this.showErrorMessage("数量必须大于0")
+					return
+				}
+
+				if (this.rawLocationCode == '') {
+					this.showErrorMessage(this.workStationName + "的原材料库位为空")
+					return
+				}
+				this.callback('add');
+			},
+
+			checkItemCode(itemCode) {
+				//校验物料
+				getBasicItemByCode(itemCode).then(res => {
+					uni.hideLoading();
+					this.$refs.scanPopup.closeScanPopup();
+					if (res.data != null && res.data.list.length > 0) {
+						this.itemCode = res.data.list[0].code;
+						this.itemName = res.data.list[0].name
+						this.isCheckItemCode = true;
+						this.numberFocus = true
+						this.uom = res.data.list[0].uom
+					} else {
+						this.showErrorMessage('未查找到物料【' + this.itemCode + '】', "itemCode");
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error, "itemCode");
+				})
+			},
+
+
+			callback(action) {
+				let item = {
+					positionInfo: this.positionInfo,
+					workshopCode: this.workshopCode, //车间
+					workShopName: this.workShopName,
+					productionLineCode: this.productionLineCode, //生产线
+					productionLineName: this.productionLineName,
+					workStationCode: this.workStationCode, //工位
+					workStationName: this.workStationName,
+					rawLocationCode: this.rawLocationCode,
+					fgLocationCode: this.fgLocationCode,
+					itemCode: this.itemCode,
+					itemName: this.itemName,
+					uom: this.uom,
+					qty: this.qty
+				};
+				this.closeRequestPopup();
+				this.$emit("confirm", action, item);
+			},
+
+			showErrorMessage(message, type) {
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (type == "itemCode") {
+							this.itemCodeGetFocus();
+						} else {
+							this.numberFocus = true;
+						}
+					})
+					if (type == "itemCode") {
+						this.itemCode = ""
+						this.isCheckItemCode = false;
+					}
+				})
+			},
+			change(value) {
+				this.qty = value;
+			},
+			cancel(e) {
+				this.closeRequestPopup();
+			},
+			showSelect() {
+				if (this.editPosition) {
+					this.show = true
+				}
+
+			},
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} else {
+					this.showErrorMessage("车间-生产线基础信息维护错误")
+				}
+			},
+
+			getScanCode(code) {
+				if (code == "") {
+					this.showErrorMessage('物料号不能为空')
+					return;
+				}
+				this.itemCode = "";
+				this.checkItemCode(code)
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/pages/productionReturn/coms/comScanReturnPack.vue b/pages/productionReturn/coms/comScanReturnPack.vue
new file mode 100644
index 00000000..1b2bc367
--- /dev/null
+++ b/pages/productionReturn/coms/comScanReturnPack.vue
@@ -0,0 +1,508 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title">
+						扫描箱码
+						<text class="fr" @click="closeScanPopup()">关闭</text>
+					</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"
+								: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>
+		<com-message ref="comMessage"></com-message>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	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 {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			comMessage,
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+
+		},
+		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: [],
+				fromInventoryStatuses :"",
+			}
+		},
+		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
+				this.$refs.popup.open('bottom');
+			},
+
+			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) {
+				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.showBalanceSelect(balanceRes.data.list);
+								}
+							} else {
+								this.showErrorMessage(balanceRes.message.message);
+							}
+							uni.hideLoading();
+						});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance);
+			},
+
+			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.stdPackQty = packageInfo.stdPackQty
+				balance.stdPackUnit = packageInfo.stdPackUnit
+				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 += Number(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/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index 915013ad..23fe99d2 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -45,7 +45,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
 	import {
@@ -462,9 +462,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './returnJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/productionReturn/request/returnToHoldRequest.vue b/pages/productionReturn/request/returnToHoldRequest.vue
index b763866e..47463dac 100644
--- a/pages/productionReturn/request/returnToHoldRequest.vue
+++ b/pages/productionReturn/request/returnToHoldRequest.vue
@@ -1,279 +1,55 @@
 <template>
-	<view>
-		<com-empty-view v-if="requestList.length==0"></com-empty-view>
-		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
-			:checkedWaitTask="checkedWaitTask">
-		</request-filter>
-		<view v-if="requestList.length>0">
-			<uni-swipe-action ref="swipeAction">
-				<view v-for="(item, index) in requestList" :key="index">
-					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
-						<com-return-request-card :dataContent="item" @click='openRequestDetail(item)'>
-						</com-return-request-card>
-					</uni-swipe-action-item>
-				</view>
-			</uni-swipe-action>
-			<uni-load-more :status="loadingType" />
-			<request-info-popup ref='requestInfoPopup'></request-info-popup>
-		</view>
-		<requestButton @goScan='openScanDetailPopup'></requestButton>
+	<view class="">
+		<comReturnCommonRequest ref="request" businessType="ReturnToHold"></comReturnCommonRequest>
 	</view>
-	<comMessage ref="comMessage"></comMessage>
+		
 </template>
 
 <script>
-	import requestFilter from '@/mycomponents/request/requestFilter.vue'
-	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import comMessage from '@/mycomponents/common/comMessage.vue'
-	import comReturnRequestCard from '@/pages/productionReturn/coms/comReturnRequestCard.vue'
-	import requestInfoPopup from '@/pages/productionReturn/coms/requestInfoPopup.vue'
-	import requestButton from '@/mycomponents/button/requestButton.vue'
+	import comReturnCommonRequest from '@/pages/productionReturn/coms/comReturnCommonRequest.vue'
 
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
-	import {
-		getProductionReturnRequestList,
-	} from '@/api/request2.js';
 	import {
 		goHome,
 		updateTitle
 	} from '@/common/basic.js';
 
-	import {
-		getDetailOption,
-		getDetailAndApproveOption,
-		getDetailAndApprovePassAndApproveNoOption,
-		getDetailAndHandleOption,
-		getDetailAndCloseOption
-	} from '@/common/array.js';
-
 	export default {
 		components: {
-			comEmptyView,
-			requestFilter,
-			requiredLocation,
-			comMessage,
-			comReturnRequestCard,
-			requestInfoPopup,
-			requestButton,
+			comReturnCommonRequest,
 		},
 		data() {
 			return {
 				requestList: [],
-				pageNo: 1,
-				pageSize: 10,
-				status: "",
-				totalCount: 0,
-				checkedWaitTask: false,
-				detailOptions: [],
-				detailAndApproveOptions: [],
-				detailAndApprovePassAndApproveNoOption: [],
-				detailAndHandleOption: [],
-				detailAndCloseOption: [],
-				showOptions: [],
-				fromType: "requestType",
-				loadingType: "nomore",
-				businessCode: "ReturnToHold"
 
 			};
 		},
-		onReady() {
-			this.detailOptions = getDetailOption();
-			this.detailAndApproveOptions = getDetailAndApproveOption()
-			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
-				this.detailAndHandleOption = getDetailAndHandleOption()
-			this.detailAndCloseOption = getDetailAndCloseOption()
-
-		},
-		onReachBottom() {
-			//避免多次触发
-			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
-				return;
-			}
-			this.getList("more");
-		},
-
-		onPullDownRefresh() {
-			this.getList('refresh');
-		},
-		onShow() {
-			this.getList('refresh');
-		},
+		
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
 			} else if (e.index == 1) {
-				this.$refs.filter.openFilter();
+				this.$refs.request.openFilter();
 			}
 		},
 
 
-		mounted() {
-
+		onShow() {
+			if(this.$refs.request!=undefined){
+				this.$refs.request.onShow()
+			}
+			
 		},
+		onPullDownRefresh() {
+			this.$refs.request.onPullDownRefresh()
+		},
+		onReachBottom() {
+			this.$refs.request.onReachBottom()
+		},
+		
 		methods: {
-			requestConfirm(action, item) {},
-
-			openRequestInfoPopup(item) {
-				this.$refs.requestInfoPopup.openPopup(item)
-			},
-			openRequestDetail(item) {
-				uni.navigateTo({
-					url: './requestDetail?id=' + item.id
-				});
-			},
-			getList(type) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中­....",
-					mask: true
-				});
-				this.loadingType = "loading";
-				if (type === "refresh") {
-					this.pageNo = 1;
-					this.requestList = [];
-				}
-				var filters = []
-				if (this.checkedWaitTask) {
-					filters.push({
-						column: "status",
-						action: "==",
-						value: this.status
-					})
-				}
-				filters.push({
-					column: "business_type",
-					action: "==",
-					value: this.businessCode
-				})
-				var params = {
-					filters: filters,
-					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-				}
-				getProductionReturnRequestList(params).then(res => {
-					uni.hideLoading();
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-
-					var list = res.data.list;
-					this.totalCount = res.data.total
-					this.loadingType = "loadmore";
-					if (list == null || list.length == 0) {
-						this.loadingType = "nomore";
-						return;
-					}
-					list.forEach(res => {
-						var options = this.updateOptions(res.status);
-						res.options = options;
-					})
-					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
-
-					this.pageNo++;
-					updateTitle("生产隔离退料申请(" + this.totalCount + ")");
-
-				}).catch(error => {
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					updateTitle("生产隔离退料申请");
-					this.loadingType = "";
-					uni.hideLoading();
-					that.showMessage(error)
-				})
-			},
-
-
-			updateOptions(status) {
-				if (status == "1") {
-					this.showOptions = this.detailAndApproveOptions;
-				} else if (status == "2") {
-					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
-				} else if (status == "3") {
-					this.showOptions = this.detailAndHandleOption;
-				} else if (status == "4") {
-					this.showOptions = this.detailAndCloseOption;
-				} else {
-					this.showOptions = this.detailOptions;
-				}
-				return this.showOptions
-			},
-
-			openScanDetailPopup() {
-				uni.navigateTo({
-					url: "../record/returnToHold?fromType=" + this.fromType
-				})
-			},
-
-
-			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
-					console.log("详情", dataContent.id)
-					this.openRequestInfoPopup(dataContent);
-				} else if (e.content.text == "处理") {
-					console.log("处理")
-				} else if (e.content.text == "审批") {
-					console.log("审批")
-				} else if (e.content.text == "审批通过") {
-					console.log("审批通过")
-				} else if (e.content.text == "审批驳回") {
-					console.log("审批驳回")
-				} else if (e.content.text == "关闭") {
-					console.log("关闭")
-				}
-			},
-			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: "number",
-					action: "==",
-					value: code
-				})
-
-				var params = {
-					filters: filters,
-					pageNo: 1,
-					pageSize: 100,
-				}
-				getProductionReturnRequestList(params).then(res => {
-					uni.hideLoading();
-					if (res.data.list.length == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
-					} else if (res.data.list.length == 1) {
-						that.openRequestDetail(res.data.list[0]);
-					}
-				}).catch(error => {
-					uni.hideLoading();
-					that.showMessage(error);
-				})
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {
 
-					}
-				});
-			},
+			
 
 		}
 	}
diff --git a/pages/productionReturn/request/returnToStoreRequest.vue b/pages/productionReturn/request/returnToStoreRequest.vue
index cfd869bf..2bcde74f 100644
--- a/pages/productionReturn/request/returnToStoreRequest.vue
+++ b/pages/productionReturn/request/returnToStoreRequest.vue
@@ -1,279 +1,55 @@
 <template>
-	<view>
-		<com-empty-view v-if="requestList.length==0"></com-empty-view>
-		<request-filter ref="filter" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
-			:checkedWaitTask="checkedWaitTask">
-		</request-filter>
-		<view v-if="requestList.length>0">
-			<uni-swipe-action ref="swipeAction">
-				<view v-for="(item, index) in requestList" :key="index">
-					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event,item)">
-						<com-return-request-card :dataContent="item" @click='openRequestDetail(item)'>
-						</com-return-request-card>
-					</uni-swipe-action-item>
-				</view>
-			</uni-swipe-action>
-			<uni-load-more :status="loadingType" />
-			<request-info-popup ref='requestInfoPopup'></request-info-popup>
-		</view>
-		<requestButton @goScan='openScanDetailPopup'></requestButton>
+	<view class="">
+		<comReturnCommonRequest ref="request" businessType="ReturnToStore"></comReturnCommonRequest>
 	</view>
-	<comMessage ref="comMessage"></comMessage>
+		
 </template>
 
 <script>
-	import requestFilter from '@/mycomponents/request/requestFilter.vue'
-	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import comMessage from '@/mycomponents/common/comMessage.vue'
-	import comReturnRequestCard from '@/pages/productionReturn/coms/comReturnRequestCard.vue'
-	import requestInfoPopup from '@/pages/productionReturn/coms/requestInfoPopup.vue'
-	import requestButton from '@/mycomponents/button/requestButton.vue'
+	import comReturnCommonRequest from '@/pages/productionReturn/coms/comReturnCommonRequest.vue'
 
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
-	import {
-		getProductionReturnRequestList,
-	} from '@/api/request2.js';
 	import {
 		goHome,
 		updateTitle
 	} from '@/common/basic.js';
 
-	import {
-		getDetailOption,
-		getDetailAndApproveOption,
-		getDetailAndApprovePassAndApproveNoOption,
-		getDetailAndHandleOption,
-		getDetailAndCloseOption
-	} from '@/common/array.js';
-
 	export default {
 		components: {
-			comEmptyView,
-			requestFilter,
-			requiredLocation,
-			comMessage,
-			comReturnRequestCard,
-			requestInfoPopup,
-			requestButton,
+			comReturnCommonRequest,
 		},
 		data() {
 			return {
 				requestList: [],
-				pageNo: 1,
-				pageSize: 10,
-				status: "",
-				totalCount: 0,
-				checkedWaitTask: false,
-				detailOptions: [],
-				detailAndApproveOptions: [],
-				detailAndApprovePassAndApproveNoOption: [],
-				detailAndHandleOption: [],
-				detailAndCloseOption: [],
-				showOptions: [],
-				fromType: "requestType",
-				loadingType: "nomore",
-				businessCode: "ReturnToStore"
 
 			};
 		},
-		onReady() {
-			this.detailOptions = getDetailOption();
-			this.detailAndApproveOptions = getDetailAndApproveOption()
-			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
-				this.detailAndHandleOption = getDetailAndHandleOption()
-			this.detailAndCloseOption = getDetailAndCloseOption()
-
-		},
-		onReachBottom() {
-			//避免多次触发
-			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
-				return;
-			}
-			this.getList("more");
-		},
-
-		onPullDownRefresh() {
-			this.getList('refresh');
-		},
-		onShow() {
-			this.getList('refresh');
-		},
+		
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
 			} else if (e.index == 1) {
-				this.$refs.filter.openFilter();
+				this.$refs.request.openFilter();
 			}
 		},
 
 
-		mounted() {
-
+		onShow() {
+			if(this.$refs.request!=undefined){
+				this.$refs.request.onShow()
+			}
+			
 		},
+		onPullDownRefresh() {
+			this.$refs.request.onPullDownRefresh()
+		},
+		onReachBottom() {
+			this.$refs.request.onReachBottom()
+		},
+		
 		methods: {
 
-			openRequestInfoPopup(item) {
-				this.$refs.requestInfoPopup.openPopup(item)
-			},
-			openRequestDetail(item) {
-				uni.navigateTo({
-					url: './requestDetail?id=' + item.id
-				});
-			},
-			getList(type) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中­....",
-					mask: true
-				});
-				this.loadingType = "loading";
-				if (type === "refresh") {
-					this.pageNo = 1;
-					this.requestList = [];
-				}
-				var filters = []
-				if (this.checkedWaitTask) {
-					filters.push({
-						column: "status",
-						action: "==",
-						value: this.status
-					})
-				}
-				filters.push({
-					column: "business_type",
-					action: "==",
-					value: this.businessCode
-				})
-
-				var params = {
-					filters: filters,
-					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-				}
-				getProductionReturnRequestList(params).then(res => {
-					uni.hideLoading();
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-
-					var list = res.data.list;
-					this.totalCount = res.data.total
-					this.loadingType = "loadmore";
-					if (list == null || list.length == 0) {
-						this.loadingType = "nomore";
-						return;
-					}
-					list.forEach(res => {
-						var options = this.updateOptions(res.status);
-						res.options = options;
-					})
-					this.requestList = type === "refresh" ? list : this.requestList.concat(list);
-
-					this.pageNo++;
-					updateTitle("生产合格退料申请(" + this.totalCount + ")");
-
-				}).catch(error => {
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					updateTitle("生产合格退料申请");
-					this.loadingType = "";
-					uni.hideLoading();
-					that.showMessage(error)
-				})
-			},
-
-
-			updateOptions(status) {
-				if (status == "1") {
-					this.showOptions = this.detailAndApproveOptions;
-				} else if (status == "2") {
-					this.showOptions = this.detailAndApprovePassAndApproveNoOption;
-				} else if (status == "3") {
-					this.showOptions = this.detailAndHandleOption;
-				} else if (status == "4") {
-					this.showOptions = this.detailAndCloseOption;
-				} else {
-					this.showOptions = this.detailOptions;
-				}
-				return this.showOptions
-			},
-
-			openScanDetailPopup() {
-				uni.navigateTo({
-					url: "../record/returnToStore?fromType=" + this.fromType
-				})
-			},
-
-
-			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
-					console.log("详情", dataContent.id)
-					this.openRequestInfoPopup(dataContent);
-				} else if (e.content.text == "处理") {
-					console.log("处理")
-				} else if (e.content.text == "审批") {
-					console.log("审批")
-				} else if (e.content.text == "审批通过") {
-					console.log("审批通过")
-				} else if (e.content.text == "审批驳回") {
-					console.log("审批驳回")
-				} else if (e.content.text == "关闭") {
-					console.log("关闭")
-				}
-			},
-			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: "number",
-					action: "==",
-					value: code
-				})
-
-				var params = {
-					filters: filters,
-					pageNo: 1,
-					pageSize: 100,
-				}
-				getProductionReturnRequestList(params).then(res => {
-					uni.hideLoading();
-					if (res.data.list.length == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
-					} else if (res.data.list.length == 1) {
-						that.openRequestDetail(res.data.list[0]);
-					}
-				}).catch(error => {
-					uni.hideLoading();
-					that.showMessage(error);
-				})
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
+			
 
 		}
 	}
diff --git a/pages/productionReturn/request/returnToStoreRequestSubmit.vue b/pages/productionReturn/request/returnToStoreRequestSubmit.vue
new file mode 100644
index 00000000..5ab26580
--- /dev/null
+++ b/pages/productionReturn/request/returnToStoreRequestSubmit.vue
@@ -0,0 +1,200 @@
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.subList.length==0'>
+			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<comReturnRequestCreator ref="issueRequest" :dataContent="detailSource">
+				</comReturnRequestCreator>
+				<button class="btn_add" @click="goScan(false)">+去添加</button>
+			</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>
+
+			<comScanReturnPack ref="comScanIssuePack">
+			</comScanReturnPack>
+			<comMessage ref="comMessage"></comMessage>
+		</view>
+	</view>
+	<comReturnRequestPopup ref="comIssueRequestPopup" @confirm='requestConfirm'></comReturnRequestPopup>
+</template>
+
+<script>
+	import {
+		productionReturnRequestCreate,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		navigateBack,
+		getRemoveOption,
+	} from '@/common/basic.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comReturnRequestPopup from '@/pages/productionReturn/coms/comReturnRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comScanReturnPack from '@/pages/productionReturn/coms/comScanReturnPack.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import comReturnRequestCreator from '@/pages/productionReturn/coms/comReturnRequestCreator.vue'
+
+	export default {
+		name: '',
+		components: {
+			comBlankView,
+			comReturnRequestPopup,
+			jobDetailPopup,
+			comScanReturnPack,
+			comMessage,
+			comReturnRequestCreator
+		},
+		data() {
+			return {
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: {
+					subList: []
+				}, //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				requestList: [], //需求信息
+				fromType: '',
+				title: ""
+
+			}
+		},
+		
+		mounted() {
+			this.goScan(true)
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+			if (this.fromType == 'ReturnToStore') {
+				this.title = "生产合格退料申请"
+			} else if (this.fromType == 'ReturnToHold') {
+				this.title = "生产隔离退料申请"
+			}
+			updateTitle(this.title)
+
+		},
+		methods: {
+			goScan(editPosition) {
+				this.$refs.comIssueRequestPopup.openRequestPopup(editPosition);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+
+				if (this.detailSource.subList.length == 0) {
+					this.detailSource = {
+						workshopCode: item.workshopCode,
+						businessType:this.fromType,
+						status: "1",
+						totalQty: 0,
+						subList: []
+					}
+					var subItem = {
+						productionLineCode: item.productionLineCode,
+						workStationCode: item.workStationCode,
+						itemCode: item.itemCode,
+						itemName: item.itemName,
+						inventoryStatus:"OK",
+						batch:"000000",
+						packingNumber:"",
+						fromLocationCode:item.rawLocationCode,
+						qty: item.qty,
+						uom: item.uom
+					}
+					this.detailSource.subList.push(subItem)
+				} else {
+					var result = this.detailSource.subList.filter(res => {
+						if (res.itemCode == item.itemCode) {
+							return res
+						}
+					})
+
+					//没有添加数据
+					if (result.length == 0) {
+						var subItem = {
+							productionLineCode: item.productionLineCode,
+							workStationCode: item.workStationCode,
+							itemCode: item.itemCode,
+							itemName: item.itemName,
+							qty: item.qty,
+							uom: item.uom
+						}
+
+						this.detailSource.subList.push(subItem)
+
+					} else {
+						//有了更新数据
+						result[0].qty += item.qty
+
+					}
+				}
+				this.caclcQty();
+				if (this.$refs.issueRequest != undefined) {
+					this.$refs.issueRequest.update()
+				}
+			},
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty += res.qty
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+			setParams() {
+				if(this.fromType=="ReturnToStore"){
+					this.detailSource.isOK = true
+				}else if(this.fromType=="ReturnToHold"){
+					this.detailSource.isOK = false
+				}else {
+					this.detailSource.isOK = false
+				}
+				return this.detailSource
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				productionReturnRequestCreate(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)
+				})
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index fbe9d4fa..2c06f310 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -249,8 +249,7 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+												itemDetail.handleQty = Number(result.balance.qty) ;
 												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
@@ -264,8 +263,7 @@
 										});
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = result.balance.qty;
diff --git a/pages/putaway/coms/comPutawayJobCard.vue b/pages/putaway/coms/comPutawayJobCard.vue
index 6da43026..4f19c5d3 100644
--- a/pages/putaway/coms/comPutawayJobCard.vue
+++ b/pages/putaway/coms/comPutawayJobCard.vue
@@ -12,19 +12,10 @@
 			<view class="task_item">
 				<view class="task_text">
 					<view class="">
-						客户名称 : {{dataContent.customerName}}
+						客户代码 : {{dataContent.supplierCode}}
 					</view>
 				</view>
 			</view>
-
-			<view class="task_item">
-				<view class="task_text">
-					<view class="">
-						物品代码 : {{dataContent.itemCode}}
-					</view>
-				</view>
-			</view>
-
 		</view>
 	</job-com-main-card>
 </template>
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 567c648f..225a0933 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -1,5 +1,12 @@
 <template>
 	<view class="page-wraper">
+		<view style="margin: 5px;">
+			<job-top :dataContent="jobContent"></job-top>
+			<view class="card_content">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<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">
@@ -15,7 +22,6 @@
 		</view>
 
 
-
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
@@ -74,7 +80,9 @@
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import putawayDetailInfoPopup from '@/pages/putaway/coms/putawayDetailInfoPopup.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
-
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	
+	
 	export default {
 		components: {
 			winScanButton,
@@ -82,7 +90,8 @@
 			requiredLocation,
 			comDetailCard,
 			putawayDetailInfoPopup,
-			comMessage
+			comMessage,
+			jobTop
 		},
 		data() {
 			return {
@@ -267,7 +276,7 @@
 					var locationCode = result.balance.locationCode;
 					var inventoryStatus = result.balance.inventoryStatus;
 					var detail = this.detailSource.find(r => r.itemCode == itemCode);
-
+					
 					if (detail == undefined) {
 						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
 					} else {
@@ -288,8 +297,7 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+												itemDetail.handleQty = Number(result.balance.qty) ;
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
 												itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -301,8 +309,7 @@
 										});
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number(
-										result.balance.qty) : Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty) ;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = result.balance.qty;
 									itemDetail.balance.stdPackQty = result.package.stdPackQty
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index 48e32a23..6cd8882c 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -41,6 +41,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getRemoveOption,
 		getCurrDateTime,
 		getDirectoryItemArray,
@@ -370,9 +371,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './repleinshJob'
-					})
+					navigateBack(1)
 				})
 			},
 
@@ -380,10 +379,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},
diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue
index a8b5c49c..d48ea17c 100644
--- a/pages/scrap/job/scrapJobDetail.vue
+++ b/pages/scrap/job/scrapJobDetail.vue
@@ -39,7 +39,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getDirectoryItemArray,
 		getInventoryStatusName,
@@ -378,21 +378,9 @@
 				this.$refs.scanPopup.losefocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './scrapJob'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './scrapJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue
index ff37bd16..d18cd3c8 100644
--- a/pages/transfer/job/issueDetail.vue
+++ b/pages/transfer/job/issueDetail.vue
@@ -48,7 +48,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 		getDirectoryItemArray
@@ -504,21 +504,9 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './issueJob'
-					})
+					navigateBack(1)
 				})
 			},
 
diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue
index 43414045..69bb6c42 100644
--- a/pages/transfer/job/receiptDetail.vue
+++ b/pages/transfer/job/receiptDetail.vue
@@ -45,7 +45,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 		getDirectoryItemArray
@@ -480,21 +480,9 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
+					navigateBack(1)
 				})
 			},
 
diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue
index 34898383..5d681b23 100644
--- a/pages/transfer/job/transferDetail.vue
+++ b/pages/transfer/job/transferDetail.vue
@@ -42,6 +42,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName
 	} from '@/common/basic.js';
@@ -523,16 +524,6 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			/**
 			 * BlobUrl转blob数据  
 			 * @param {Object} url blob URL
@@ -553,13 +544,8 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1)
 				})
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				}, 3000)
 			},
 
 		}
diff --git a/pages/unPlanned/job/issueJobDetail.vue b/pages/unPlanned/job/issueJobDetail.vue
index db933ccd..72c9d06a 100644
--- a/pages/unPlanned/job/issueJobDetail.vue
+++ b/pages/unPlanned/job/issueJobDetail.vue
@@ -44,7 +44,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getDirectoryItemArray,
 		getInventoryStatusName,
@@ -380,21 +380,9 @@
 
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './issueJob'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './issueJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index f6773f8f..be821db4 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -46,7 +46,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getDirectoryItemArray
 	} from '@/common/basic.js';
@@ -379,25 +379,10 @@
 				this.$refs.scanPopup.losefocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1)
 				})
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				}, 3000)
 			},
 		}
 	}
diff --git a/static/config.json b/static/config.json
index 1c570702..471c6bba 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.230:12080/admin-api",
+			"value": "http://192.168.0.178:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",