diff --git a/src/api/request2.js b/src/api/request2.js
index 596c15a5..c4fc0cd5 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4221,6 +4221,15 @@ export function getRepleinshJobList(params) {
 		data: params,
 	});
 }
+export function getRepleinshTimeJobList(params) {
+	return request({
+		url: baseApi + "/wms/repleinsh-request-main/senior",
+		method: "post",
+		data: params,
+	});
+}
+
+
 
 /**
  * 补料任务 获取任务明细
@@ -4236,6 +4245,21 @@ export function getRepleinshJobDetail(id) {
 	});
 }
 
+
+/**
+ * 补料任务 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+
+export function getRepleinshTimeJobDetail(id) {
+	return request({
+		url: baseApi + "/wms/repleinsh-request-detail/getForPDA?id=" + id,
+		method: "get",
+		data: {},
+	});
+}
+
 /**
  * 补料 任务承接
  * @param {*} id
@@ -4287,6 +4311,14 @@ export function repleinshJobSubmit(params) {
 	});
 }
 
+export function repleinshTimeJobSubmit(params) {
+	return request({
+		url: baseApi + "/wms/repleinsh-request-main/executeRequest  ",
+		method: "put",
+		data: params,
+	});
+}
+
 /**
  * 补料申请 提交
  * @param {*} params 
diff --git a/src/mycomponents/job/jobComMainCardTime.vue b/src/mycomponents/job/jobComMainCardTime.vue
new file mode 100644
index 00000000..89cc49c4
--- /dev/null
+++ b/src/mycomponents/job/jobComMainCardTime.vue
@@ -0,0 +1,45 @@
+<template>
+	<view>
+		<view class="task_card">
+			<job-top-date :dataContent="dataContent"></job-top-date>
+			<!-- <view class="split_line"></view> -->
+			<slot></slot>
+			<view class="split_line"></view>
+			<job-bottom :dataContent="dataContent"></job-bottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import jobTopDate from '@/mycomponents/job/jobTopDate.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+
+	export default {
+		components: {
+			jobTopDate,
+			jobBottom,
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPlanNumber: {
+				type: Boolean,
+				default: false
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/job/jobComMainDetailCardTime.vue b/src/mycomponents/job/jobComMainDetailCardTime.vue
new file mode 100644
index 00000000..4fe76bae
--- /dev/null
+++ b/src/mycomponents/job/jobComMainDetailCardTime.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="task_item" style="background: none;">
+		<view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;" >
+			<view class="uni-flex uni-row space-between uni-inline-item" style="  margin-left: 10px;">
+				<view style="flex: 1;">
+					<item :dataContent="dataContent" :isSpecial='isSpecial'></item>
+				</view>
+			</view>
+			<div class="u-p-l-10">
+				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
+				</to-location>
+				<job-repleinsh-time-qty :dataContent="dataContent"></job-repleinsh-time-qty>
+				
+			</div>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import toLocation from '@/mycomponents/balance/toLocation.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import intoDeliNo from '@/mycomponents/balance/intoDeliNo.vue'
+	import goodsShelves from '@/mycomponents/balance/goodsShelves.vue'
+	import productionline from '@/mycomponents/balance/productionline.vue'
+	import shift from '@/mycomponents/balance/shift.vue'
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import level from '@/mycomponents/balance/level.vue'
+	import item from '@/mycomponents/item/item.vue'
+	import jobRepleinshTimeQty from '@/mycomponents/job/jobRepleinshTimeQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			toLocation,
+			batch,
+			intoDeliNo,
+			jobRepleinshTimeQty,
+			item,
+			itemCompareQty,
+			level,
+			goodsShelves,
+			productionline,
+			shift
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowContainer: {
+				type: Boolean,
+				default: true
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatchDeliNo: {
+				type: Boolean,
+				default: false
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowDeliverType: {
+				type: Boolean,
+				default: false
+			},
+			isShowPackCount: {
+				type: Boolean,
+				default: false
+			},
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
+			isShowGoodsShelves:{
+				type:Boolean,
+				default:false
+			},
+			isShowProductionline:{
+				type:Boolean,
+				default:false
+			},
+			isShowShift:{
+				type:Boolean,
+				default:false
+			},
+			isSpecial: {
+				type: Boolean,
+				default: false
+			},
+		},
+
+
+		
+	}
+</script>
+
diff --git a/src/mycomponents/job/jobRepleinshTimeQty.vue b/src/mycomponents/job/jobRepleinshTimeQty.vue
new file mode 100644
index 00000000..aec229f8
--- /dev/null
+++ b/src/mycomponents/job/jobRepleinshTimeQty.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="u-flex u-row-between card_itemName" style="margin: 20rpx auto;">
+		<view class="uni-flex uni-column align-start" style="flex: 1;">
+			<text style="padding-left: 8rpx;">补料数量</text>
+			<text class="uom_blue">{{dataContent.unexecutedQty+dataContent.qty}}{{getUomInfo(dataContent.uom)}}</text>
+		</view>
+		<view style="padding-left: 8rpx;padding-right: 8rpx;" >|</view>
+		<view class="uni-flex uni-column align-start" style="flex: 1;">
+			
+			<view class="uni-flex uni-column align-start">
+				<text style="padding-left: 8rpx;">已补料数量</text>
+				<text class="uom_green">{{dataContent.qty}}{{getUomInfo(dataContent.uom)}}</text>
+			</view>
+			
+		</view>
+		<view style="padding-left: 8rpx;padding-right: 8rpx;" >|</view>
+		<view class="uni-flex uni-column align-start" style="flex: 1;">
+			<text style="padding-left: 8rpx;">未料数量</text>
+			<text class="uom_yellow">{{dataContent.unexecutedQty}}{{getUomInfo(dataContent.uom)}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+			getUomInfo
+		} from '@/common/directory.js';
+	export default {
+		data() {
+			return {};
+		},
+	
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+		methods: {
+			getUomInfo(uom) {
+				let item = getUomInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.label
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss">
+
+.uom_blue {
+	color: #0689da;
+	padding: 5px;
+	font-size: 35rpx;
+}
+.uom_yellow {
+	color: #F1A532;
+	padding: 5px;
+	font-size: 35rpx;
+}
+.uom_green {
+	color: #329362;
+	padding: 5px;
+	font-size: 35rpx;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/job/jobTopDate.vue b/src/mycomponents/job/jobTopDate.vue
new file mode 100644
index 00000000..79ac4eb4
--- /dev/null
+++ b/src/mycomponents/job/jobTopDate.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="task_top">
+		<view class="uni-flex space-between u-col-center align-center" style="margin-bottom: 10rpx;">
+			<view class="task_number left">
+				<text> {{mDate}} </text>
+				<view class="time"> {{dataContent.deliNo}} </view>
+			</view>
+			<view class="task_number">
+				<text> {{mTime}} </text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import jobNumber from '@/mycomponents/job/jobNumber.vue'
+	import jobPlanNumber from '@/mycomponents/job/jobPlanNumber.vue'
+	import jobStatus from '@/mycomponents/job/jobStatus.vue'
+	import {
+		dateFormat,
+		
+	} from '@/common/basic.js';
+	export default {
+		components: {
+			jobNumber,
+			jobPlanNumber,
+			jobStatus
+		},
+		data() {
+			return {
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPlanNumber: {
+				type: Boolean,
+				default: false
+			},
+		},
+		computed: {
+			mDate() {
+				console.log('this.dataContent.day',this.dataContent.day)
+				if(!this.dataContent.day){
+					return ''
+				}
+				let date = dateFormat(this.dataContent.day)
+				let dateArr = date.split(' ')[0].split('-')
+				return `${dateArr[1]}-${dateArr[2]}`
+			},
+			mTime() {
+				console.log('this.dataContent.day',this.dataContent.day)
+				if(!this.dataContent.day){
+					return ''
+				}
+				let date = dateFormat(this.dataContent.day)
+				let dateArr = date.split(' ')[1].split(':')
+				return `${dateArr[0]}:${dateArr[1]}`
+			}
+		},
+		methods: {
+			openDetail(item) {
+				this.$emit("openDetail", this.dataContent);
+			},
+			formatDate(val) {
+				let date = dateFormat(val)
+				date.split(' ')
+				
+				return dateFormat(val)
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.left{
+		display: flex;
+		
+		.time{
+			margin-left: 10rpx;
+			text-align: center;
+			background-color: #DA8910;
+			min-width: 40rpx;
+			height: 40rpx;
+			border-radius: 50%;
+			color: white;
+		}
+	}
+	
+</style>
diff --git a/src/pages.json b/src/pages.json
index 2fbae562..21e3ca41 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -963,6 +963,34 @@
 				}
 			}
 		},
+		{
+			"path": "pages/repleinsh/job/repleinshTimeJob",
+			"style": {
+				"navigationBarTitleText": "按便次补料",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+		
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
 		{
 			"path": "pages/repleinsh/job/repleinshDetail",
 			"style": {
@@ -972,6 +1000,15 @@
 					"autoBackButton": "true"
 				}
 			}
+		},{
+			"path": "pages/repleinsh/job/repleinshTimeDetail",
+			"style": {
+				"navigationBarTitleText": "按便次补料详情",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					"autoBackButton": "true"
+				}
+			}
 		},{
 			"path": "pages/repleinsh/job/repleinshDetailBatch",
 			"style": {
diff --git a/src/pages/repleinsh/coms/comRepleinshTimeJobCard.vue b/src/pages/repleinsh/coms/comRepleinshTimeJobCard.vue
new file mode 100644
index 00000000..9f23aeb3
--- /dev/null
+++ b/src/pages/repleinsh/coms/comRepleinshTimeJobCard.vue
@@ -0,0 +1,42 @@
+<template>
+	<job-com-main-card-time :dataContent="dataContent">
+		<jobComMainDetailCardTime  :dataContent="dataContent"></jobComMainDetailCardTime>
+		<view class='split_line' v-show="dataContent.acceptUserName"></view>
+		<jobAccept :dataContent="dataContent" v-show="dataContent.acceptUserName"></jobAccept>
+	</job-com-main-card-time>
+</template>
+
+<script>
+	import jobTopDate from '@/mycomponents/job/jobTopDate.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+	import jobComMainCardTime from '@/mycomponents/job/jobComMainCardTime.vue'
+	import jobComMainDetailCardTime from '@/mycomponents/job/jobComMainDetailCardTime.vue'
+	import jobAccept from '@/mycomponents/job/jobAccept.vue'
+	export default {
+		components: {
+			jobTopDate,
+			jobBottom,
+			jobComMainCardTime,
+			jobComMainDetailCardTime,
+			jobAccept
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/src/pages/repleinsh/coms/comRepleishDetailCardTime.vue b/src/pages/repleinsh/coms/comRepleishDetailCardTime.vue
new file mode 100644
index 00000000..31d76626
--- /dev/null
+++ b/src/pages/repleinsh/coms/comRepleishDetailCardTime.vue
@@ -0,0 +1,90 @@
+<template>
+	<view class="" style="margin-left: 10px;">
+		<view class="uni-flex uni-row space-between uni-inline-item">
+			<!-- 物料 -->
+			<view style="flex: 1;">
+				<view style="margin-top: 5px;">
+					<view class="uni-flex u-col-center space-between ">
+						<view >
+							<view class="card_itemCode" :class="openPopup(dataContent)">
+								{{dataContent.itemCode}}
+							</view>
+							<view class="card_itemName" style="word-break:break-all;overflow:hidden;white-space:normal;display: flex;align-items: center;" :class="isSpecial ? 'special':''">
+								<view style="max-width:280rpx;overflow: hidden;white-space: nowrap;">{{dataContent.itemName}}</view>
+								<view style="padding-left: 8rpx;padding-right: 8rpx;" v-if="dataContent.itemCode && dataContent.itemDesc1">|</view>
+								<view style="max-width: 200rpx;overflow: hidden;white-space: nowrap;" v-if="dataContent.itemCode && dataContent.itemDesc1">{{dataContent.itemDesc1}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 数量 -->
+			<view style="" >
+				<view class="text_packQty uni-flex justify-end"  style="margin-top: 5rpx; margin-right: 20rpx;" >
+					<view class="uom_blue uni-flex align-center" >
+						<view class="uom_yellow" style="word-break:break-word;">{{dataContent.recordList.reduce((prev, item) => prev + Number(item['handleQty']),0)}}</view>
+						<view class="">/</view>
+						<view class="uom_blue">{{dataContent.unexecutedQty}}{{' '+getUomInfo(dataContent.uom)}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 补料数量 -->
+		<job-repleinsh-time-qty :dataContent="dataContent"></job-repleinsh-time-qty>
+		
+	</view>
+</template>
+
+<script>
+	import jobRepleinshTimeQty from '@/mycomponents/job/jobRepleinshTimeQty.vue'
+	import {
+		getUomInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {
+			jobRepleinshTimeQty
+
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isSpecial: {
+				type: Boolean,
+				default: false
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+			getUomInfo(uom) {
+				let item = getUomInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.label
+				}
+			},
+			openPopup(val) {
+
+				// console.log(JSON.stringify(val));
+			},
+		},
+	}
+</script>
+
+<style>
+	.special{
+		color: blue!important;
+		font-size: 40rpx;
+		font-weight: bold;
+	}
+</style>
diff --git a/src/pages/repleinsh/coms/comScanReplishPackTime.vue b/src/pages/repleinsh/coms/comScanReplishPackTime.vue
new file mode 100644
index 00000000..9310142f
--- /dev/null
+++ b/src/pages/repleinsh/coms/comScanReplishPackTime.vue
@@ -0,0 +1,806 @@
+<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;
+						margin-top: 8rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view> -->
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								headerType="HPQ,HMQ" :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" :isShowFromLocation="false"
+																:isShowStatus='true' :isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+	import {
+		getWorkShopLineStation,
+		getBalanceByFilter,
+		getBalanceByParams,
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		uniqueArray
+	} from '@/common/basic.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+	import {
+		getDirectoryItemArray
+	} from '../../../common/directory.js';
+
+
+	import {
+		getLabelInfo
+	} from '@/common/label.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			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: {},
+				positionList: [],
+				defaultValueList: [],
+				label: {},
+				fromInventoryStatuses: "",
+				packageInfo: {},
+				toLocationAreaTypeList: []
+
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus();
+				}, 500)
+			},
+
+			openScanPopupForJobSimulate(content, jobcontent, scanMessage) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				getLabelInfo(scanMessage, this.headerType, callback => {
+					if (callback.success) {
+						this.onScan(callback);
+					} else {
+						this.showErrorMessage(callback.message)
+					}
+
+				})
+			},
+
+			closeScanPopup() {
+				this.losefocus()
+				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.toLocationAreaTypeList = getDirectoryItemArray(this.jobContent.toAreaTypes)
+					// 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)
+			// 			})
+			// 		})
+			// 		//去掉重复库位
+			// 		list = uniqueArray(list);
+			// 		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 + '】不存在', res => {
+						this.getfocus();
+					})
+				}
+			},
+
+			onScan(result) {
+				if (!result.package) {
+					this.showErrorMessage('扫描数据错误[' + result.label.code + "]",
+						res => {
+							this.getfocus();
+						}
+					)
+					return;
+				}
+				if (this.toLocation && result.package.packUnit) {
+					let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode);
+					if (!item) {
+						this.showErrorMessage('扫描物料代码不属于该任务',
+							res => {
+								this.getfocus();
+							});
+						return
+					}
+					if (result.package.packUnit !== item.packUnit) {
+						this.$refs.comMessage.showQuestionMessage(
+							`扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料？`, res => {
+								if (res) {
+									this.getToLocationBalance(result)
+								}
+							});
+					} else {
+						this.getToLocationBalance(result)
+					}
+				}else{
+					this.getToLocationBalance(result)
+				}
+			},
+
+			//查询到目标库位的库存余额
+			getToLocationBalance(result) {
+				uni.showLoading({
+					title: '查询中',
+					mask: true
+				})
+				var filters = []
+				if (result.package.parentNumber) {
+					var packingNumber = result.package.parentNumber + "," + result.package.number;
+					filters.push({
+						column: "packingNumber",
+						action: "in",
+						value: packingNumber
+					})
+				} else {
+					filters.push({
+						column: "packingNumber",
+						action: "==",
+						value: result.package.number
+					})
+				}
+
+				filters.push({
+					column: "itemCode",
+					action: "==",
+					value: result.package.itemCode
+				})
+				filters.push({
+					column: "batch",
+					action: "==",
+					value: result.package.batch
+				})
+
+				filters.push({
+					column: "areaType",
+					action: "in",
+					value: this.toLocationAreaTypeList.join(',')
+				})
+
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getBalanceByFilter(params).then(res => {
+					uni.hideLoading()
+					if (res.data.list.length > 0) {
+						this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额",
+							res => {
+								this.getfocus();
+							});
+					} else {
+						this.queryBalance(result);
+					}
+					// callback(res.data)
+				}).catch(err => {
+					uni.hideLoading()
+					this.showErrorMessage(err.message,
+						res => {
+							this.getfocus();
+						});
+				})
+			},
+
+			queryBalance(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 {
+
+						var params = {
+							itemCode: result.package.itemCode,
+							batch: result.label.batch,
+							packingNumber: result.label.packingNumber,
+							parentPackingNumber: result.package.parentNumber,
+							inventoryStatus: this.jobContent.outInventoryStatuses.split(','),
+							areaType: this.jobContent.fromAreaTypes.split(','),
+							bussinessCode: this.jobContent.businessType
+						}
+						uni.showLoading({
+							title: '查询中',
+							mask: true
+						})
+						getBalanceByParams(params).then(res => {
+							if (res.data.length == 0) {
+								var status = getInventoryStatusDesc(params.inventoryStatus)
+								var areaType = getListLocationAreaTypeDesc(params.areaType)
+								var hint =
+									"按物料号 [" + params.itemCode + "] \n" +
+									"包装号 [" + params.packingNumber + "] \n" +
+									"批次 [" + params.batch + "] \n" +
+									"状态 [" + status + "] \n" +
+									"库区 [" + areaType + "] \n" +
+									"未查找到库存余额"
+								this.showErrorMessage(hint,
+									res => {
+										this.getfocus();
+									})
+							} else if (res.data.length == 1) {
+								result.balance = res.data[0]
+
+								if (result.label.packingNumber != result.balance.packingNumber) {
+									result.balance.qty = Number(result.label.qty)
+								} else {
+									result.balance.qty = Number(result.balance.qty)
+								}
+								this.afterGetBalance(result.label, result.balance, result.package);
+							} else {
+								//多条记录
+								this.$refs.balanceSelect.openPopup(res.data);
+							}
+							uni.hideLoading()
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error,
+								res => {
+									this.getfocus();
+								})
+						})
+					}
+				} catch (e) {
+					uni.hideLoading();
+					this.showErrorMessage(e.stack,
+						res => {
+							this.getfocus();
+						})
+
+				}
+			},
+
+			selectBalanceItem(balance) {
+				this.afterGetBalance(balance, balance, this.packageInfo);
+			},
+
+			afterGetBalance(label, balance, packageInfo) {
+				try {
+					let that = this;
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+
+					that.fromLocationCode = balance.locationCode;
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					//如果库存余额中的库位与任务推荐的不一致
+					if (fromLocation) {
+						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 != undefined && 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 == "TRUE") {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,批次【' + lot +
+									'】不是推荐批次,是否要继续发料?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance, packageInfo);
+											if (fromLocation.Batchs.length > 0) {
+												batch.detail = fromLocation.Batchs[0].detail;
+											}
+											fromLocation.Batchs.unshift(batch);
+											this.getfocus();
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发料明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+
+						if (this.jobContent.allowModifyLocation == "TRUE") {
+							this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
+								"】与推荐的库位不一致,是否要继续发料?", res => {
+									if (res) {
+										let locaion = that.createLocationInfo(label, balance, packageInfo);
+										item.Locations.push(locaion);
+										this.getfocus();
+										that.$emit("afterScan");
+									}
+								})
+
+						} else {
+							this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
+								"】与推荐的库位不一致,不允许继续发料?")
+						}
+
+
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack,
+						res => {
+							this.getfocus();
+						}
+					)
+				}
+			},
+
+			//增加实际扫描的明细
+			createLocationInfo(label, balance, packageInfo) {
+				let location = {
+					fromLocationCode: balance.locationCode,
+					qty: balance.qty,
+					uom: balance.uom,
+					handleQty: 0,
+					isNewAdd: true,
+					Batchs: []
+				}
+				let batch = this.createBatchInfo(label, balance, packageInfo);
+				batch.detail = balance;
+				batch.detail.fromLocationCode = balance.locationCode;
+				location.Batchs.push(batch);
+				return location;
+			},
+
+			createBatchInfo(label, balance, packageInfo) {
+				let batch = {
+					batch: label.batch,
+					qty: 0,
+					uom: label.uom,
+					handleQty: Number(balance.qty),
+					Records: []
+				}
+				let record = {}
+				if (balance != null) {
+					record = this.creatRecordByBalance(balance, packageInfo);
+					batch.handleQty = Number(label.qty)
+				} else {
+					record = this.creatRecordByLabel(label, packageInfo);
+					batch.handleQty = Number(balance.qty)
+				}
+
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecordByLabel(label, packageInfo) {
+				let record = {
+					scaned: true,
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					parentPackingNumber: packageInfo.parentNumber,
+					batch: label.batch,
+					qty: Number(label.qty),
+					// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+					uom: label.uom,
+					inventoryStatus: "OK",
+					balance: null,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode,
+					packUnit: packageInfo.packUnit,
+					packQty: packageInfo.packQty,
+				}
+				return record;
+			},
+
+			creatRecordByBalance(balance, packageInfo) {
+				balance.packQty = packageInfo.packQty
+				balance.packUnit = packageInfo.packUnit
+				let record = {
+					scaned: true,
+					itemCode: balance.itemCode,
+					packingNumber: packageInfo.number,
+					parentPackingNumber: packageInfo.parentNumber,
+					batch: packageInfo.batch,
+					qty: Number(balance.qty),
+					// 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: balance.supplierCode
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty = calc.add(handleQty, res.qty)
+				})
+				batch.handleQty = handleQty;
+
+				this.dataContent.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						var itemCodeHandleQty = 0;
+						item.Locations.forEach(batch => {
+							batch.Batchs.forEach(batchHandleQty => {
+								itemCodeHandleQty = calc.add(itemCodeHandleQty,
+									batchHandleQty.handleQty)
+							})
+						})
+						item.handleQty = itemCodeHandleQty;
+					})
+
+				})
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				let record = {};
+				if (balance == null) {
+					record = this.creatRecordByLabel(label, packageInfo);
+				} else {
+					record = this.creatRecordByBalance(balance, packageInfo);
+				}
+
+				if (packageInfo.parentNumber) {
+					var checkData = batch.Records.find(r => {
+						if (r.packingNumber == packageInfo.parentNumber &&
+							r.batch == packageInfo.batch) {
+							return r;
+						}
+					})
+					if (checkData) {
+						//提示已经扫描
+						this.showErrorMessage("箱码[" + packageInfo.number + "]批次[" + packageInfo.batch +
+							"]的父包装已经扫描")
+					} else {
+						batch.Records.push(record);
+						this.issueRecord.unshift(record)
+						this.calcBatchHandleQty(batch);
+						this.getfocus();
+					}
+				} else {
+					//扫描的是父包装
+					var checkData = batch.Records.find(r => {
+						if (r.parentPackingNumber == packageInfo.number &&
+							r.batch == packageInfo.batch) {
+							return r;
+						}
+					})
+					if (checkData) {
+						//是否移除
+						this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentPackingNumber + "]" + "批次[" +
+							packageInfo
+							.batch + "]是父包装，是否移除子包装", res => {
+								if (res) {
+									batch.Records = []
+									batch.Records.push(record);
+									this.issueRecord.unshift(record)
+									this.calcBatchHandleQty(batch);
+									this.getfocus();
+								}
+							})
+						console.log("扫描的是父包装，是否移除子包装")
+					} else {
+						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
+											.packingNumber == null || b.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', record);
+						}
+					});
+			},
+
+			packGetFocus() {
+				if (this.$refs.comscan) {
+					this.$refs.comscan.getfocus();
+				}
+
+			},
+			packLoseFocus() {
+				if (this.$refs.comscan) {
+					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>
\ No newline at end of file
diff --git a/src/pages/repleinsh/job/repleinshTimeDetail.vue b/src/pages/repleinsh/job/repleinshTimeDetail.vue
new file mode 100644
index 00000000..ea85e476
--- /dev/null
+++ b/src/pages/repleinsh/job/repleinshTimeDetail.vue
@@ -0,0 +1,652 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header-view uni-flex space-between u-col-center">
+				<view class="task_number left uni-flex">
+					<text> {{mDate}} </text>
+					<view class="time"> {{jobContent.deliNo}} </view>
+				</view>
+				<view class="task_number">
+					<text> {{mTime}} </text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<com-repleish-detail-card-time :dataContent="jobContent" ></com-repleish-detail-card-time>
+				<uni-swipe-action ref="swipeAction" style="margin-top: 10px;"
+					    v-for="(item,index) in jobContent.recordList">
+					<uni-swipe-action-item
+						:right-options="item.scaned? [{
+		text: '移除',
+		style: {
+			backgroundColor: '#F56C6C'
+		}
+	}]:[]"   @click="itemCoceClick($event,item,index)">
+						<view :class="item.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
+							<view class="uni-flex uni-row space-between" style="align-items: center">
+								<!-- uni-inline-item 暂时拿掉-->
+								<view style="word-break: break-all;">
+									<pack :isShowPackingNumberProps="true"  :packingCode="item.fromPackingNumber"></pack>
+									<batch :batch="item.fromBatch"></batch>
+									<location title="来源库位" :locationCode="item.fromLocationCode"></location>
+							<!-- <recommend :isShowPackingNumberProps="true"  :isShowPack="true" :detail="item" :isShowLocation="false" :isShowFromLocation="true"  :isShowToLocation="false"></recommend> -->
+								</view>
+								
+								<compare-qty style="margin-right: 20rpx;" :dataContent="item" :handleQty="Number(item.handleQty)" :isShowRecommendQty="false" :isShowStatus="false">
+								</compare-qty>
+							</view>
+						</view>
+					</uni-swipe-action-item>
+				</uni-swipe-action>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="clickSubmit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+		<win-com-scan-balance ref="scanPopup" @getBalance='getPackScanResult'
+			:verifyCategory='false'
+			:isCheckLocationBalance="false"
+			:bussinessCode="jobContent.businessType">
+		</win-com-scan-balance>
+		<!-- <com-scan-replish-pack-time ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</com-scan-replish-pack-time> -->
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		takeRepleinshJob,
+		cancleTakeRepleinshJob,
+		getRepleinshTimeJobDetail,
+		repleinshTimeJobSubmit
+	} from '@/api/request2.js';
+	import pack from '@/mycomponents/balance/pack.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	import {
+		goHome,
+		showConfirmMsg,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateTime,
+		getDirectoryItemArray,
+		getPackingNumberAndBatch,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+	import {
+		dateFormat,
+
+	} from '@/common/basic.js';
+	import item from '@/mycomponents/item/item.vue'
+	
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comRepleishDetailCardTime from '@/pages/repleinsh/coms/comRepleishDetailCardTime.vue'
+	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+	export default {
+		name: 'issueDetail',
+		components: {
+			compareQty,
+			item,
+			jobDetailPopup,
+			winScanButton,
+			comRepleishDetailCardTime,
+			winComScanBalance,
+			requiredLocation,
+			jobTop,
+			pack,
+			batch,
+			location,
+			recommend,
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				toLocationCode: '',
+				toLocationAreaTypeList: [],
+				jobStatus: "",
+				scanMessage: "",
+				businessType:{}
+			};
+		},
+
+		props: {
+
+		},
+
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title + '详情'
+			})
+			this.id = option.id;
+			this.scanMessage = option.scanMessage
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from === 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeRepleinshJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		watch: {
+			locationTypes(newVal) {
+				let value = newVal;
+			},
+		},
+		mounted: function() {
+
+		},
+		computed: {
+			mDate() {
+				if (!this.jobContent.day) {
+					return ''
+				}
+				let date = dateFormat(this.jobContent.day)
+				let dateArr = date.split(' ')[0].split('-')
+				return `${dateArr[1]}-${dateArr[2]}`
+			},
+			mTime() {
+				console.log('this.jobContent.day', this.jobContent.day)
+				if (!this.jobContent.day) {
+					return ''
+				}
+				let date = dateFormat(this.jobContent.day)
+				let dateArr = date.split(' ')[1].split(':')
+				return `${dateArr[0]}:${dateArr[1]}`
+			}
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeRepleinshJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+			getBusinessType(){
+				getBusinessType(this.jobContent.businessType, res => {
+					if (res.success) {
+						this.businessType = res.businessType;
+						// this.fromInventoryStatuses = getDirectoryItemArray(res.fromInventoryStatuses);
+						// this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
+						// this.showFromLocationPopup();
+					} else {
+						this.showErrorMessage(res.message)
+					}
+				});
+			},
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getRepleinshTimeJobDetail(that.id).then(async res => {
+					console.log('详情', res)
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						that.jobContent = res.data;
+						this.jobContent.recordList = [];
+						that.toLocationCode = res.data.toLocationCode
+						that.jobStatus = res.data.status
+						that.getBusinessType()
+						// that.detailSource =await  getDataSource(that.detailSource, [res.data])
+						// if (res.data.subList.length > 0) {
+						// 	that.jobContent = res.data;
+						// 	that.jobStatus = res.data.status
+						// 	that.subList = res.data.subList;
+						// 	that.toLocationCode = that.subList[0].toLocationCode
+
+						// 	that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
+						// 	that.detailSource =await  getDataSource(that.detailSource, that.subList)
+						// 	if (that.scanMessage) {
+						// 		this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this
+						// 			.jobContent, that.scanMessage);
+						// 	}
+
+						// 	let timer = setTimeout(r => {
+						// 		that.resizeCollapse();
+						// 		if (timer) {
+						// 			timer = null
+						// 			clearTimeout(timer)
+						// 		}
+						// 	}, 1000)
+						// } else {
+						// 	that.showMessage('列表数据为0');
+						// }
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			closeScan() {
+				this.resizeCollapse();
+			},
+
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+
+			clickSubmit() {
+			// 未料数量unexecutedQty
+			// 已补料数量qty
+				let requestQty = this.jobContent.unexecutedQty+this.jobContent.qty
+				if(this.jobContent.qty>=requestQty){
+					// 已完成
+				}else{
+					//部分完成
+					let handleQty = this.jobContent.recordList.reduce((prev, item) => prev + Number(item['handleQty']),0)
+					if(handleQty>requestQty){
+						showConfirmMsg("拆包信息还没提交，是否要重新扫描?",res=>{
+							if(res){
+								//防止重复点击
+								this.$throttle(this.submitJob, 2000, this)()
+							}
+						})
+					}else{
+						//防止重复点击
+						this.$throttle(this.submitJob, 2000, this)()
+					}
+				}
+				
+			},
+
+
+			submit() {
+				var scanCount = this.getScanCount(this.subList);
+
+				// //允许部分提交
+				// if (this.jobContent.allowPartialComplete == "TRUE") {
+				// 	// 如果扫描数是0，提示扫描数为0，是否提交，点击确定提交，取消提示消失
+				// 	if (scanCount == 0) {
+				// 		this.$refs.comMessage.showQuestionMessage("扫描数为0,是否提交?", res => {
+				// 			if (res) {
+				// 				this.setSubmitParamsAndSubmit();
+				// 			}
+				// 		})
+				// 	} else {
+				// 		this.setSubmitParamsAndSubmit();
+				// 	}
+				// } else {
+				//不允许部分提交，扫描数必须等于任务数量才可以提交
+				if (scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+				} else {
+					this.setSubmitParamsAndSubmit();
+				}
+				// }
+			},
+
+			setSubmitParamsAndSubmit() {
+				//目前任务只到一个库位
+				this.submitJob();
+				//使用在途库，不查询管理模式
+				// if (this.jobContent.useOnTheWayLocation == 'TRUE') {
+				// 	this.submitJob();
+				// } else {
+				// 	//获取管理模式，封装参数
+				// 	getManagementPrecisions(itemCodes, locationCode, res => {
+				// 		if (res.success) {
+				// 			this.managementList = res.list;
+				// 			this.submitJob();
+				// 		} else {
+				// 			uni.hideLoading();
+				// 			this.showErrorMessage(res.message);
+				// 		}
+				// 	});
+				// }
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				
+				if (!this.jobContent.recordList || this.jobContent.recordList.length == 0) {
+					uni.hideLoading()
+					this.showErrorMessage("请扫描您需要提交的按便次补料任务")
+					return
+				}
+				repleinshTimeJobSubmit(this.jobContent).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功\n" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setParams() {
+				var commitSubList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+
+								if (subItem != undefined) {
+									if (batch.Records.length > 0) {
+										subItem.recordList = [];
+										batch.Records.forEach(r => {
+											let record = {};
+											record.handleQty = r.qty;
+											record.fromBatch = r.batch;
+											record.fromContainerNumber = r
+												.containerNumber;
+
+											record.toContainerNumber = r
+												.containerNumber;
+											record.toInventoryStatus = r
+												.inventoryStatus;
+											record.toLocationCode = this
+												.toLocationCode;
+											record.supplierCode = r.supplierCode;
+
+											record.fromParentPackingNumber = r
+												.parentPackingNumber;
+
+											record.fromPackingNumber = r
+												.packingNumber;
+											record.toPackingNumber = r
+												.packingNumber;
+											record.toPackUnit = r.packUnit;
+											record.toBatch = r.batch;
+											subItem.recordList.push(record);
+										})
+										commitSubList.push(deepCopyData(subItem));
+									}
+								}
+							})
+						})
+					})
+				})
+
+				this.jobContent.subList = commitSubList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			cancel() {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+					if (res) {
+						that.clearInfo();
+					}
+				});
+			},
+
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
+
+						})
+					}
+
+				})
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty, res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty, handleQty)
+							this.$refs.comScanIssuePack.calcBatchHandleQty(batch)
+						}
+					})
+				}
+
+				// item.handleQty=itemHandleQty;
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			itemCoceClick(e, item, index) {
+				if (e.content.text == "移除") {
+					this.jobContent.recordList.splice(index, 1);
+				}
+			},
+			getPackScanResult(result) {
+				console.log('扫描结果',result)
+				this.jobContent.recordList.push({
+					scaned:true,
+					uom:this.jobContent.uom,
+					handleQty:result.package.qty,// 提交数量
+					toPackingNumber:'',// 到包装号
+					toContainerNumber:'',//  到器具号
+					toBatch:'',//  到批次
+					toLocationCode:this.jobContent.toLocationCode,//  到库位代码
+					toInventoryStatus:this.jobContent.inventoryStatus,//  库存状态
+					supplierCode:result.package.supplierCode,//  供应商
+					fromPackingNumber:result.label.packingNumber,//  从包装号
+					fromContainerNumber:'',// 从器具号
+					fromBatch:result.package.batch,//  从批次
+					fromParentPackingNumber:result.package.parentNumber,// 从父包装
+					fromLocationCode:result.balance.locationCode,//   从库位代码
+					
+				})
+				
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				// this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+				console.log('打开',this.businessType)
+				this.$refs.scanPopup.openScanPopup(this.businessType);
+				this.scanPopupGetFocus();
+			},
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+			scanLocationCode(location, code) {
+				this.toLocationCode = code
+			},
+			getScanCount(subList) {
+				var scanCount = 0;
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								if (batch.Records.length > 0) {
+									scanCount = calc.add(scanCount, batch.Records.length)
+								}
+							})
+						})
+					})
+				})
+				return scanCount;
+			}
+
+
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.page-header .header-view {
+		display: flex;
+		flex-direction: row;
+		background-color: #fff;
+		font-size: 35rpx;
+		padding: 10rpx 20rpx;
+		border-radius: 4px;
+	}
+
+	.left {
+		display: flex;
+
+		.time {
+			margin-left: 10rpx;
+			text-align: center;
+			background-color: #DA8910;
+			min-width: 40rpx;
+			height: 40rpx;
+			border-radius: 50%;
+			color: white;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/repleinsh/job/repleinshTimeJob.vue b/src/pages/repleinsh/job/repleinshTimeJob.vue
new file mode 100644
index 00000000..a4d235dc
--- /dev/null
+++ b/src/pages/repleinsh/job/repleinshTimeJob.vue
@@ -0,0 +1,562 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		
+		<job-filter :isShowFromLocationCode="false" :isShowFromAreaCode="false" :isShowToAreaCode="false" :isShowStatus="false"
+			:isShowProductionLineCode="false" 
+			ref="filter" otherTitle="" :isShowItemCode="false"
+			@onQuery="getListByFilter" :isShowQurery='true'>
+		</job-filter>
+		
+	<!-- 	<job-filter :isShowFromLocationCode="true" 
+			ref="filter" otherTitle="" :isShowItemCode="true"
+			@onQuery="getListByFilter" :isShowQurery='true'>
+		</job-filter> -->
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item
+						:right-options="item.status=='2'?detailGiveupOptions:item.status=='1'?detailCloseOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-repleinsh-time-job-card :dataContent="item"
+							@click='openJobDetail(item)'></com-repleinsh-time-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<repleinsh-info-popup ref='jobInfoPopup'></repleinsh-info-popup>
+			<repleinsh-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></repleinsh-job-list-popup>
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+
+		</view>
+		<!-- <win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> -->
+		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
+		</winComScanBalance>
+		<!-- <winScanPackJob ref="scanPopup" @getResult='getScanResult' ></winScanPackJob> -->
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getRepleinshJobList,
+		getRepleinshTimeJobList,
+		cancleTakeRepleinshJob,
+		closeTakeRepleinshJob,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType
+	} from '@/common/record.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption,
+		getDetailCloseOption
+	} from '@/common/array.js';
+	
+	import {
+		planRefreshTime,
+		repleinshJobFilter
+	} from '@/common/config.js';
+	
+		import {
+			getManagementPrecisions
+		} from '@/common/balance.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comRepleinshJobCard from '@/pages/repleinsh/coms/comRepleinshJobCard.vue'
+	import comRepleinshTimeJobCard from '@/pages/repleinsh/coms/comRepleinshTimeJobCard.vue'
+	import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
+	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
+
+	export default {
+		name: 'repleinsh',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comRepleinshJobCard,
+			comRepleinshTimeJobCard,
+			repleinshInfoPopup,
+			winScanPackJob,
+			winScanButton,
+			winComScanBalance
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+				detailCloseOptions: [],
+				title: '',
+				scanMessage: "",
+				businessTypeCode: "Repleinment",
+				businessType: null,
+				scanBalance: {},
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				productionLineCode: "",
+				productionlineList: [],
+				fromLocationCode:'',
+				filterItemCode:'',
+				timer:null
+			};
+		},
+		onLoad(option) {
+			this.title = option.title
+			this.getBusinessTypeFunc()
+		},
+
+		
+		onShow() {
+			this.getList('refresh')
+		},
+		
+		onHide() {
+			// this.stopRefresh();
+		},
+		onUnload(){
+			// this.stopRefresh();
+		},
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+			this.detailCloseOptions = getDetailCloseOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilterParams(uni.getStorageSync(repleinshJobFilter));
+			}
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList('more')
+			
+		},
+		onPullDownRefresh() {
+			this.getList('refresh')
+			
+		},
+
+		methods: {
+			timerRefresh() {
+				this.getList('refresh')
+				this.stopRefresh();
+				var that = this;
+				this.timer = setInterval(function() {
+					that.getList('refresh')
+					console.log('补料刷新');
+				}, planRefreshTime)
+			},
+			stopRefresh() {
+				if (this.timer) {
+					clearInterval(this.timer);
+					this.timer = null;
+				}
+			},
+			getBusinessTypeFunc() {
+				getBusinessType(this.businessTypeCode, res => {
+					if (res.success) {
+						this.businessType = res.businessType;
+						this.fromInventoryStatuses = res.fromInventoryStatuses.split(',');
+						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
+						// this.openScanPopup();
+					} else {
+						this.showErrorMessage(res.message)
+					}
+				});
+			},
+			setQueryParam(){
+				var filterParams = []
+				var queryParams=uni.getStorageSync(repleinshJobFilter)
+				
+				//只看当天
+				if (queryParams.creationTime ) {
+					filterParams.push({
+						column: "create_time",
+						action: "between",
+						value: queryParams.creationTime
+					})
+				}
+				//只看待处理
+				// if (queryParams.status) {
+				// 	filterParams.push({
+				// 		column: "status",
+				// 		action: "in",
+				// 		value: queryParams.status
+				// 	})
+				// }else {
+				// 	filterParams.push({
+				// 		column: "status",
+				// 		action: "in",
+				// 		value: "1,2"
+				// 	})
+				// }
+				
+					// 来源库位
+				if (queryParams.fromLocationCode) {
+					filterParams.push({
+						column: "fromLocationCode",
+						action: "==",
+						value: queryParams.fromLocationCode
+					})
+				}
+				//物料代码
+				if (queryParams.itemCode) {
+					filterParams.push({
+						column: "itemCode",
+						action: "like",
+						value: queryParams.itemCode
+					})
+				}
+				
+				//来源库区
+				if (queryParams.fromAreaCode) {
+					filterParams.push({
+						column: "fromAreaCode",
+						action: "==",
+						value: queryParams.fromAreaCode
+					})
+				}
+				//到库区
+				if (queryParams.toAreaCode) {
+					filterParams.push({
+						column: "toAreaCode",
+						action: "==",
+						value: queryParams.toAreaCode
+					})
+				}
+				return filterParams;
+				
+			},
+
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+				
+				var queryFiltersParams =this.setQueryParam()
+				var params = {
+					filters: queryFiltersParams,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getRepleinshTimeJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					updateTitle(this.title + "(" + this.totalCount + ")");
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle(this.title);
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			getListByFilter(params) {
+				uni.setStorageSync(repleinshJobFilter,params)
+				this.getList('refresh')
+			},
+
+
+			openJobDetail(item, scanMessage = '') {
+				this.getJobInfoByNumber(item.number,scanMessage, item)
+				
+			},
+			
+			getJobInfoByNumber(number,scanMessage, item){
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				// filters.push({
+				// 	column: "status",
+				// 	action: "in",
+				// 	value: '1,2'
+				// })
+				filters.push({
+					column: "number",
+					action: "==",
+					value: number
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: this.pageSize,
+				}
+				getRepleinshTimeJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + number + '】的发料任务');
+					} else  {
+						var result =res.data.list[0];
+						if(result.acceptUserId&&result.acceptUserId!=this.$store.state.user.id){
+							this.$refs.comMessage.showErrorMessage("任务号["+result.number+"]已经被["+result.acceptUserName+"]承接,无法执行", res => {
+								if (res) {
+									if (this.$refs.scanPopup) {
+										this.$refs.scanPopup.getfocus()
+									}
+									this.getList('refresh')
+								}
+							});
+							
+							return;
+						}
+						// getManagementPrecisions([item.itemCode], item.fromLocationCode, ret => {
+							// if (ret.success) {
+								// this.managementList = ret.list;
+								// this.managementType = this.managementList.some(cur => cur.ManagementPrecision == 'BY_BATCH') ?
+								// 	'BY_BATCH' : ''
+								// 	alert(this.managementType)
+								// if (this.managementType == 'BY_BATCH') {
+								// 	uni.navigateTo({
+								// 		url: './repleinshDetailBatch?id=' + result.masterId + '&status=' + result.status +
+								// 			'&scanMessage=' +
+								// 			scanMessage + '&title=' + this.title
+								// 	});
+								// } else {
+									uni.navigateTo({
+										url: './repleinshTimeDetail?id=' + result.id + '&status=' + result.status + '&scanMessage=' +
+											scanMessage + '&title=' + this.title
+									});
+								// }
+							// }
+						// })
+						this.scanMessage = ""
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.masterId);
+							}
+						});
+				} else if (e.content.text == "关闭") {
+					this.$refs.comMessage.showQuestionMessage("确定要关闭当前任务?",
+						res => {
+							if (res) {
+								this.closeJob(dataContent.masterId);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeRepleinshJob(id).then(res => {
+					if (res.data) {
+						this.getList('refresh')
+						uni.showToast({
+							title: "放弃任务成功"
+						})
+					} else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			closeJob(id) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				closeTakeRepleinshJob(id).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.getList('refresh')
+						uni.showToast({
+							title: "关闭任务成功"
+						})
+					} else {
+						this.showMessage("关闭任务失败")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			openScanPopup() {
+				if (this.businessType == null) {
+					this.getBusinessTypeFunc()
+				} else {
+					this.$refs.scanPopup.openScanPopup(this.businessType);
+				}
+			},
+			selectItem(item) {
+				this.$refs.scanPopup.closeScanPopup();
+				this.openJobDetail(item, this.scanMessage);
+			},
+			getScanResult(result) {
+				let balance = result.balance;
+				if (balance != null) {
+					this.scanMessage = ""
+					if (!result.label.batch) {
+						this.showMessage("批次为空")
+						return;
+					}
+					if (!result.label.itemCode) {
+						this.showMessage("物料号为空")
+						return;
+					}
+					try {
+						var filters = [
+							// {
+							// 	column: "status",
+							// 	action: "in",
+							// 	value: '1,2'
+							// },
+							{
+								column: "batch",
+								action: "==",
+								value: result.label.batch
+							},
+							{
+								column: "itemCode",
+								action: "==",
+								value: result.label.itemCode
+							},
+							{
+								column: "fromLocationCode",
+								action: "==",
+								value: balance.locationCode
+							}
+						]
+						getRepleinshTimeJobList({
+							filters: filters,
+							pageNo: 1,
+							pageSize: 1000,
+							sort: 'createTime',
+							by: 'asc'
+						}).then(res => {
+							this.scanMessage = result.scanMessage
+							let resultList = res.data.list;
+							if (resultList.length > 0) {
+								resultList.forEach(item => {
+									item.title = item.number;
+									item.selected = false
+								})
+								let list = []
+								resultList.forEach(item => {
+									if (!list.find(subItem => subItem.title == item.title)) {
+										list.push(item)
+									}
+								})
+								if (list.length > 0) {
+									this.selectItem(list[0])
+								}
+							} else {
+								this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch +
+									"]物料号[" + result.label.itemCode + "]未查找到任务\n" + "扫描[" + result
+									.scanMessage + "]")			
+							}
+						}).catch(error => {
+							this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
+						})
+
+					} catch (e) {
+						this.showMessage(e.message)
+					}
+				}
+				// else
+				// {
+				// 	this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
+				// }
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file