diff --git a/api/httpRequest3.js b/api/httpRequest3.js
index d51a546d..aeec1a3e 100644
--- a/api/httpRequest3.js
+++ b/api/httpRequest3.js
@@ -27,27 +27,27 @@ function service(options = {}) {
 							if(res.data.code==0){
 								resolve(res.data);
 							}else {
-								reject( res.data.msg)
+								reject("系统:"+res.data.msg)
 							}
 							
 						}else {
-							reject( res.data.msg)
+							reject("系统:"+ res.data.msg)
 						}
 						
 					} else {
-						reject(res.data.msg)
+						reject("系统:"+res.data.msg)
 					}
 				};
 				options.fail = (error) => {
 					var message = error.errMsg
 					if (message === 'Network Error') {
-					  message = '后端接口连接异常'
+					  message = '接口连接异常'
 					} else if (message.includes('timeout')) {
-					  message = '系统接口请求超时'
+					  message = '接口请求超时'
 					} else if (message.includes('Request failed with status code')) {
-					  message = '系统接口' + message.substr(message.length - 3) + '异常'
+					  message = '接口' + message.substr(message.length - 3) + '异常'
 					}
-					reject(message);
+					reject("系统:"+message);
 				};
 				uni.request(options);
 			});
diff --git a/pages/productionReturn/coms/comReturnDetailCard.vue b/pages/productionReturn/coms/comReturnDetailCard.vue
new file mode 100644
index 00000000..1aff431e
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnDetailCard.vue
@@ -0,0 +1,148 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="false"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line color="#D8D8D8"></u-line>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam"
+			 @confirm="confirm">
+		</recommend-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<returnDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></returnDetailInfoPopup>
+		<com-message ref="message"></com-message>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import returnDetailInfoPopup from '@/pages/productionReturn/coms/returnDetailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemCompareQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			returnDetailInfoPopup,
+			comMessage,
+			winScanLocation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			locationTypeList: {
+				type: Object,
+				default: {}
+			},
+			
+			
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				locatonItem:{},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty,this.settingParam.allowModifyLocation)
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				}  else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty,item.labelQty);
+			},
+			showLocation(item) {
+				this.locatonItem =item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode =code;
+				this.$emit('updateData')
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.handleQty = null
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/coms/returnDetailInfoPopup.vue b/pages/productionReturn/coms/returnDetailInfoPopup.vue
new file mode 100644
index 00000000..d01fcc04
--- /dev/null
+++ b/pages/productionReturn/coms/returnDetailInfoPopup.vue
@@ -0,0 +1,68 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent="dataContent" @onClose="closePopup">
+				<view class="">
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">标包数量 : </text>
+							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">标包单位 : </text>
+							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.stdPackUnit)}} </text>
+						</view>
+
+					</view>
+				</view>
+				<u-line></u-line>
+			</detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {getStdPackUnitInfo} from "@/common/directory.js"
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.$refs.popup.open('bottom')
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			getStdPackUnitInfo(value){
+				return getStdPackUnitInfo(value).label
+			},
+			dateFormat(value){
+				return dateFormat(value)
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index ac488a07..42a8aa97 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -7,17 +7,37 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
 
+			<view class="cen_card" style="margin-top: 10rpx;">
+				<view class="cell_box uni-flex uni-row" style="margin-top: 10rpx;">
+					<view class="cell_info">
+						<view class="text_lightblue">车间</view>
+						<view>{{jobContent.workshopCode}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">生产线</view>
+						<view>{{titleInfo.productionLineCode}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">工位</view>
+						<view>{{ titleInfo.workStationCode }}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">原材料库</view>
+						<view>{{ titleInfo.toLocationCode}}</view>
+					</view>
+				</view>
+			</view>
+			<u-line color="#D8D8D8" style="margin-bottom: 0rpx;margin-top: 10rpx;"></u-line>
+		</view>
+		<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
-							:locationTypeList='tolocationTypeList'>
-						</com-detail-card>
+						<comReturnDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+						</comReturnDetailCard>
 					</view>
 					<u-line />
 				</view>
@@ -29,8 +49,8 @@
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
 					<requiredLocation title="目标库位" :locationCode="toLocationCode"
-						:isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode'
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						:locationTypeList="toLocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -78,7 +98,7 @@
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import comReturnDetailCard from "@/pages/productionReturn/coms/comReturnDetailCard.vue"
 	import detailInfoPopup from '@/pages/productionReturn/coms/detailInfoPopup.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
@@ -91,7 +111,7 @@
 			requiredLocation,
 			// winScanPackAndLocation,
 			winScanPack,
-			comDetailCard,
+			comReturnDetailCard,
 			detailInfoPopup,
 			comMessage,
 			jobTop
@@ -109,9 +129,10 @@
 				detailSource: [], //绑定在页面上的数据源
 				fromLocationCode: '',
 				toLocationCode: '',
-				tolocationTypeList: [],
+				toLocationTypeList: [],
 				toLocationInfo: {},
-				businessTypeInfo: {}
+				businessTypeInfo: {},
+				titleInfo: ""
 			};
 		},
 		onLoad(option) {
@@ -192,6 +213,7 @@
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
+							that.titleInfo = that.subList[0];
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -278,11 +300,12 @@
 							} else {
 								itemDetail.scaned = true;
 								itemDetail.handleQty = Number(result.package.qty)
+								itemDetail.inventoryStatus = "OK"
 								itemDetail.stdPackQty = result.package.stdPackQty
 								itemDetail.stdPackUnit = result.package.stdPackUnit
 								this.calcHandleQty();
-								
-								
+
+
 								//合格退料时不能查库存余额,因为生产退料时新生成的批次是000000  --nxt  
 								// let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								// let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index 08437cf9..a4a1f3ed 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -57,7 +57,7 @@
 		getDirectoryItemArray,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
-
+	
 	import {
 		getDataSource
 	} from '@/pages/issue/js/issue.js';
@@ -198,6 +198,7 @@
 
 
 			submit() {
+				
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index 43ae3769..a8a18ab0 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -87,7 +87,6 @@
 		data() {
 			return {
 				id: '',
-				receiptJob: {},
 				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
@@ -231,6 +230,7 @@
 								itemDetail.scaned = true;
 								itemDetail.handleQty = Number(result.label.qty);
 								itemDetail.toLocationCode = this.toLocationCode;
+								itemDetail.stdPackQty = result.package.stdPackQty
 								itemDetail.labelQty = Number(result.label.qty);
 								calcHandleQty(this.detailSource);
 								this.continueScan()
diff --git a/static/config.json b/static/config.json
index f1ce854b..7426682e 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.180:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.180:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",