diff --git a/common/style/layout.css b/common/style/layout.css
index 8cb3ed1..c8e6e41 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -89,15 +89,19 @@ uni-button{
 	white-space: nowrap;
 	background: center / 100% 100% url(./static/images/button.png) no-repeat;
 }
+.confirm-button_cancle {
+	background: center / 100% 100% url(./static/images/button_cancle.png) no-repeat;
+}
 .confirm-button_disabled {
 	background: center / 100% 100% url(./static/images/button_disabled.png) no-repeat;
 }
 .table-title_wraper {
 	width: calc(100% - 60rpx);
 	margin: 0 auto;
-	font-size: 32rpx;
+	font-size: 36rpx;
 	color: #fff;
 	line-height: 70rpx;
+	font-family: 'YouSheBiaoTiHei';
 	padding: 30rpx 0 0 30rpx;
 	background: center / 100% 100% url(./static/images/bg-task-r1.png) no-repeat;
 }
@@ -401,4 +405,54 @@ uni-button{
 }
 .bgr{
 	border-color: #ff6a00;
-}
\ No newline at end of file
+}
+.modal{
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0,0,0,0.8);
+	z-index: 2010;
+}
+.pop-wraper {
+	position: fixed;
+	bottom: 10%;
+	left: 10%;
+	width: 80%;
+	height: 80%;
+	padding: 1% 2%;
+	background: center / 100% 100% url(./static/images/pop_bg.png) no-repeat;
+	z-index: 2017;
+	transition: all .3s;
+}
+.pop-title {
+	font-size: 36rpx;
+	color: #fff;
+	font-family: 'YouSheBiaoTiHei';
+	line-height: 70rpx;
+}
+.pop-grid-wraper {
+	width: calc(100% - 60rpx);
+	height: calc(100% - 250rpx);
+	margin: 40rpx auto;
+	overflow-y: scroll;
+}
+.zd-pop-th-wraper {
+	background-color: #031328
+}
+.zd-pop-td {
+	background-color: RGBA(23, 123, 172, 0.4);
+	border-bottom: 2rpx solid #177BAC;
+	height: 100rpx;
+	font-size: 30rpx;
+}
+.pop-input {
+	width: 100%;
+	height: 70rpx;
+	line-height: 70rpx;
+	font-size: 28rpx;
+	color: #fff;
+	border: 2rpx solid #21D0F2;
+	border-radius: 24rpx
+}
diff --git a/common/style/reset.css b/common/style/reset.css
index 1ba665f..d8e2094 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -57,6 +57,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .jcflexend {
 	justify-content: flex-end !important;
 }
+.jcenter {
+	justify-content: center !important;
+}
 
 .zd-row {
 	display: flex;
@@ -143,4 +146,10 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 }
 .mgb40 {
 	margin-bottom: 40rpx
+}
+.popshow {
+	transform: translateY(0);
+}
+.pophide {
+	transform: translateY(120%);
 }
\ No newline at end of file
diff --git a/components/ScanInput.vue b/components/ScanInput.vue
new file mode 100644
index 0000000..b7ce332
--- /dev/null
+++ b/components/ScanInput.vue
@@ -0,0 +1,141 @@
+<template>
+	<view class="zd-row search_wraper" :class="{'input_focus': focusState}">
+		<input 
+		ref="input"
+		type="text" 
+		class="search_input" 
+		:placeholder="placeholder"
+		:value="value"
+		:focus="focusState"
+		@blur="focusState=false"
+		@focus="focusState=true"
+		@input="handleChange($event)">
+		<view class="iconfont icon_scan" @tap="checkMpaasScan">&#xe6e2;</view>
+	</view>
+</template>
+
+<script>
+	import permision from "@/utils/permission.js"
+	export default {
+		data() {
+			return {
+				cur: '',
+				focusState: false
+			};
+		},
+		model: {
+			prop: 'value',
+			event: 'input'
+		},
+		props: {
+			placeholder: String,
+			value: String,
+			seaShow: {
+			  type: Boolean,
+			  default: false
+			}
+		},
+		methods: {
+			handleChange ($event) {
+				this.cur = $event.target.value
+				this.$emit('input', this.cur)
+				this.$emit('handleChange', this.cur)
+			},
+			toSearch () {
+				// this.$emit('toSearch', this.cur)
+				this.$nextTick(() => {
+					this.focusState = true
+				})
+			},
+			toDel () {
+				this.$emit('input', '')
+			},
+			async toScan() {
+				// #ifdef APP-PLUS
+				let status = await this.checkPermission();
+				if (status !== 1) {
+				    return;
+				}
+				// #endif
+				uni.scanCode({
+					success: (res) => {
+						this.$emit('input', res.result)
+						this.$emit('handleChange', res.result)
+					},
+					fail: (err) => {
+						// uni.showToast({
+						// 	title: '出错',
+						// 	icon: 'none'
+						// })
+					}
+				});
+			}
+			// #ifdef APP-PLUS
+			,
+			async checkPermission(code) {
+				let status = permision.isIOS ? await permision.requestIOS('camera') :
+					await permision.requestAndroid('android.permission.CAMERA');
+			
+				if (status === null || status === 1) {
+					status = 1;
+				} else {
+					uni.showModal({
+						content: "需要相机权限",
+						confirmText: "设置",
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppSetting();
+							}
+						}
+					})
+				}
+				return status;
+			}
+			// #endif
+			// #ifdef APP-PLUS
+			,
+			async checkMpaasScan () {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					// 扫码识别类型，参数可多选，qrCode、barCode，不设置，默认识别所有
+					'scanType':  ['qrCode','barCode'],
+					// 是否隐藏相册，默认false不隐藏
+					'hideAlbum': false
+				},
+				(ret) => {
+					// uni.showModal({
+					// 	title: "弹窗标题",
+					// 	// 返回值中，resp_code 表示返回结果值，10：用户取消，11：其他错误，1000：成功
+					// 	// 返回值中，resp_message 表示返回结果信息
+					// 	// 返回值中，resp_result 表示扫码结果，只有成功才会有返回
+					// 	content: JSON.stringify(ret),
+					// 	showCancel: false,
+					// 	confirmText: "确定"
+					// })
+					this.$emit('input', ret.resp_result)
+				})
+			}
+			// #endif
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../common/style/mixin.styl';
+.search_wraper
+	_wh(100%, 70rpx)
+	padding 0 4rpx 0 24rpx
+	border 1rpx solid #4980BD
+	background-color rgba(45,88,184,0.1)
+	border-radius 12rpx
+.search_input
+	width 100%
+	height: 70rpx;
+	line-height: 70rpx;
+	font-size: 28rpx;
+	color: #fff
+.icon_scan
+	_wh(140rpx, 60rpx)
+	_font(40rpx,60rpx,#fff,,center)
+	border-radius 24rpx
+</style>
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index bbdd744..ee90385 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -135,7 +135,7 @@
 	height: 76rpx;
 	line-height: 76rpx;
 	font-size: 28rpx;
-	color: #6a6a6a
+	color: #fff
 .icon-del
 	_wh(70rpx, 70rpx)
 	margin-right 10rpx
diff --git a/pages.json b/pages.json
index 71c8e38..9004f59 100644
--- a/pages.json
+++ b/pages.json
@@ -11,136 +11,6 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path": "pages/management/inscanerror",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/AgvOutError",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/HcxOutError",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/TaskOperate",
-			"style": {
-		    	"navigationStyle": "custom",
-				"enablePullDownRefresh": true,
-				"onReachBottomDistance": 50
-		    }  
-		},
-		{
-			"path": "pages/management/HcxErrorHandle",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/outscanerror",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/hcxcheck",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/agvinerror",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/searchMater",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/FinishedInStore",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/DeliveryConfirm",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/MaterList",
-			"style": {
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true,
-				"onReachBottomDistance": 50
-			}
-		},
-		{
-			"path": "pages/management/HalfFinishedInStore",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/SemifinishedInStore",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/SemifinishedInStoreSearch",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/SemifinishedOutStore",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/SemifinishedOutStoreSearch",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/semifinishedcheck",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/semifinishedchecksearch",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/semifinishedcompose",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/management/semifinishedcomposesearch",
-			"style": {
-				"navigationStyle": "custom"
-			}
 		}
 	    ,{
             "path" : "pages/management/in-storage",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index c9df4ae..9f4ff2e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -47,9 +47,9 @@
 			toPage (e) {
 				let url = ''
 				if (e.ywlx === 'OUT') {
-					url = '/pages/management/out-storage?id=' + e.djlx
+					url = '/pages/management/out-storage?id=' + e.djlx + '&name=' + e.name
 				} else {
-					url = '/pages/management/in-storage?id=' + e.djlx
+					url = '/pages/management/in-storage?id=' + e.djlx + '&name=' + e.name
 				}
 				uni.redirectTo({
 					url: url
diff --git a/pages/management/AgvOutError.vue b/pages/management/AgvOutError.vue
deleted file mode 100644
index f988347..0000000
--- a/pages/management/AgvOutError.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="AGV出箱异常"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">料箱码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">倒料</button>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>指令编号</th>
-						<th>设备编号</th>
-						<th>起点</th>
-						<th>目的</th>
-						<th>目的2</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
-						</td>
-						<td>{{e.instructorder_no}}</td>
-						<td>{{e.wcsdevice_code}}</td>
-						<td>{{e.startpoint_code}}</td>
-						<td>{{e.nextpoint_code}}</td>
-						<td>{{e.nextpoint_code2}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryInstraction, instOperation} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this._queryInstraction()
-			},
-			async _queryInstraction () {
-				let res = await queryInstraction()
-				this.dataList = [...res.data]
-			},
-			toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  this._instOperation()
-			},
-			async _instOperation () {
-				let res = await instOperation()
-				this.dataList = [...res.data]
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.grid-wrap
-	height calc(100% - 526rpx)
-</style>
\ No newline at end of file
diff --git a/pages/management/DeliveryConfirm.vue b/pages/management/DeliveryConfirm.vue
deleted file mode 100644
index ad16f48..0000000
--- a/pages/management/DeliveryConfirm.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="发货确认"></nav-bar>
-		<view class="filter-confirm-wrap">
-			<view class="filter-confirm-wrap-inner">
-				<view class="filter-wrap">
-					<view class="search-item filter-item">
-						<label class="search-label">发货区点位</label>
-						<view class="filter_input_wraper">
-							<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-						</view>
-					</view>
-					<view class="search-item filter-item">
-						<label class="search-label">载具号</label>
-						<view class="filter_input_wraper">
-							<search-box
-							v-model="val1"
-							/>
-						</view>
-					</view>
-				</view>
-				<view class="confirm-button-wrap confirm-button-wrap-c">
-					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !index1}" :disabled="disabled1" @tap="toSure1">点位解绑</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !index1}" :disabled="disabled2" @tap="toSure2">全部解绑</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {finishproductPoint, releasepoint} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				val1: '',
-				dataList: [],
-				disabled1: false,
-				disabled2: false
-			};
-		},
-		created () {
-			this._finishproductPoint()
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			async _finishproductPoint () {
-				let res = await finishproductPoint('2')
-				this.options1 = [...res]
-			},
-			toSure1 () {
-				this.disabled1 = true
-				if (!this.index1 || !this.val1) {
-					this.disabled1 = false
-					return
-				}
-				this._releasepoint('one')
-			},
-			toSure2 () {
-				this.disabled2 = true
-				if (!this.index1 || !this.val1) {
-					this.disabled2 = false
-					return
-				}
-				this._releasepoint('all')
-			},
-			async _releasepoint (type) {
-			  try {
-				let res = await releasepoint(this.index1, this.val1, type) 
-				this.disabled1 = false
-				this.disabled2 = false
-				this.index1 = ''
-				this.val1 = ''
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled1 = false
-				this.disabled2 = false
-			  }
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.filter-confirm-wrap
-	_wh(calc(100% - 30px), calc(100% - 72px))
-	background-color #fff
-	border-radius 12px
-	margin 15px auto
-	_fj()
-.filter-confirm-wrap-inner
-	width 50%
-	background-color #fff
-	border-radius 12px
-	padding-bottom 15px
-	margin 0 auto
-.filter-wrap
-	width 100%
-	padding 0 15px
-	_fj(center,,column,)
-.filter-item
-	width 100%
-.confirm-button-wrap-c
-	justify-content center
-	margin-top 50px
-</style>
\ No newline at end of file
diff --git a/pages/management/FinishedInStore.vue b/pages/management/FinishedInStore.vue
deleted file mode 100644
index b34cd9a..0000000
--- a/pages/management/FinishedInStore.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="成品入库"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">入库点</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">载具号</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="search-item flexend">
-					<button class="confirm-button" @tap="toDelect">清空</button>
-					<button class="confirm-button" @tap="toSelect">选择订单</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !index1 || !val1 || dataList.length === 0}" :disabled="disabled" @tap="toSure">入库确认</button>
-				</view>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>订单号</th>
-						<th>订单行号</th>
-						<th>规格</th>
-						<th>入库数量</th>
-						<th>物料编码</th>
-						<th>物料名称</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="(e, i) in dataList" :key="i">
-						<td>{{e.sale_code}}</td>
-						<td>{{e.order_line_code}}</td>
-						<td>{{e.material_spec}}</td>
-						<td>{{e.assign_qty}}</td>
-						<td>{{e.material_code}}</td>
-						<td>{{e.material_name}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {finishproductPoint, InstoreOrder} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: 'A1',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		onShow() {
-			if (this.$store.getters.publicArr) {
-				this.dataList = this.$store.getters.publicArr
-			}
-		},
-		destroyed () {
-			this.$store.dispatch('setPublicArr', '')
-		},
-		created () {
-			this._finishproductPoint()
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			toDelect () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this.$store.dispatch('setPublicArr', '')
-			},
-			async _finishproductPoint () {
-				let res = await finishproductPoint('1')
-				this.options1 = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.index1) {
-				uni.showToast({
-					title: '请选择入库点',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请输入载具号',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (this.dataList.length === 0) {
-				uni.showToast({
-					title: '请选择订单信息',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await InstoreOrder(this.index1, this.val1, this.dataList) 
-				this.disabled = false
-				this.index1 = ''
-				this.val1 = ''
-				this.toDelect()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toSelect () {
-				uni.navigateTo({
-					url: '/pages/management/MaterList'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.search-item
-	&:nth-child(1),&:nth-child(2)
-		width 30%
-	&:nth-child(3)
-		width 36%
-</style>
diff --git a/pages/management/HalfFinishedInStore.vue b/pages/management/HalfFinishedInStore.vue
deleted file mode 100644
index ae5bf3d..0000000
--- a/pages/management/HalfFinishedInStore.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品入库"></nav-bar>
-		<view class="filter-confirm-wrap">
-			<view class="filter-confirm-wrap-inner">
-				<view class="filter-wrap">
-					<view class="search-item filter-item">
-						<label class="search-label">订单号</label>
-						<view class="filter_input_wraper">
-							<input type="text" class="search-input-l" v-model="val1">
-						</view>
-					</view>
-					<view class="search-item filter-item">
-						<label class="search-label">物料</label>
-						<view class="filter_input_wraper" @tap="toSearch">
-							<input type="text" class="search-input-l" v-model="val2">
-						</view>
-					</view>
-					<view class="search-item filter-item">
-						<label class="search-label">名称</label>
-						<view class="filter_input_wraper">
-							<input type="text" class="search-input-l" v-model="val3" disabled="disabled">
-						</view>
-					</view>
-					<view class="search-item filter-item">
-						<label class="search-label">规格</label>
-						<view class="filter_input_wraper">
-							<input type="text" class="search-input-l" v-model="val4" disabled="disabled">
-						</view>
-					</view>
-					<view class="search-item filter-item">
-						<label class="search-label">数量</label>
-						<view class="filter_input_wraper">
-							<input type="number" class="search-input-l" v-model="val5">
-						</view>
-					</view>
-					<view class="search-item filter-item">
-						<label class="search-label">载具号</label>
-						<view class="filter_input_wraper">
-							<search-box
-							v-model="val6"
-							/>
-						</view>
-					</view>
-				</view>
-				<view class="confirm-button-wrap confirm-button-wrap-c">
-					<button class="confirm-button" @tap="toCancle">清空</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !val2 || !val5 || !val6 }" :disabled="disabled" @tap="toSure">确定</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {semiProductInFromPda} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				val3: '',
-				val4: '',
-				val5: '',
-				val6: '',
-				val7: '',
-				disabled: false
-			};
-		},
-		onShow () {
-			console.log(this.$store.getters.publicObj)
-			if (this.$store.getters.publicObj !== '') {
-				this.val2 = this.$store.getters.publicObj.material_code
-				this.val3 = this.$store.getters.publicObj.material_name
-				this.val4 = this.$store.getters.publicObj.material_spec
-				this.val7 = this.$store.getters.publicObj.material_uuid
-			}
-		},
-		destroyed () {
-			this.$store.dispatch('setPublicObj', '')
-		},
-		methods: {
-			toCancle () {
-				this.val1 = ''
-				this.val2 = ''
-				this.val3 = ''
-				this.val4 = ''
-				this.val5 = ''
-				this.val6 = ''
-				this.val7 = ''
-				this.$store.dispatch('setPublicObj', '')
-			},
-			toSearch () {
-				this.$store.dispatch('setPublicObj', '')
-				uni.navigateTo({
-					url: '/pages/management/searchMater'
-				})
-			},
-			toSure () {
-				this.disabled = true
-				if (!this.val1) {
-					uni.showToast({
-						title: '订单号不能为空',
-						icon: 'none'
-					})
-					this.disabled = false
-					return
-				}
-				if (!this.val2) {
-					uni.showToast({
-						title: '物料不能为空',
-						icon: 'none'
-					})
-					this.disabled = false
-					return
-				}
-				if (!this.val5) {
-					uni.showToast({
-						title: '数量不能为空',
-						icon: 'none'
-					})
-					this.disabled = false
-					return
-				}
-				if (Number(this.val5) < 0) {
-					uni.showToast({
-						title: '数量不能小于零',
-						icon: 'none'
-					})
-					this.disabled = false
-					return
-				}
-				if (!this.val6) {
-					uni.showToast({
-						title: '载具号不能为空',
-						icon: 'none'
-					})
-					this.disabled = false
-					return
-				}
-				this._semiProductInFromPda()
-			},
-			async _semiProductInFromPda () {
-			  try {
-				let res = await semiProductInFromPda(this.val1, this.val7, this.val5, this.val6) 
-				this.disabled = false
-				this.toCancle()
-				this.$store.dispatch('setPublicObj', '')
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.filter-confirm-wrap
-	_wh(calc(100% - 30px), calc(100% - 72px))
-	background-color #fff
-	border-radius 12px
-	margin 15px auto
-	_fj()
-.filter-confirm-wrap-inner
-	width 50%
-	background-color #fff
-	border-radius 12px
-	padding-bottom 15px
-	margin 0 auto
-.filter-wrap
-	width 100%
-	padding 0 15px
-	_fj(center,,column,)
-.filter-item
-	width 100%
-.confirm-button-wrap-c
-	justify-content center
-	margin-top 50px
-</style>
\ No newline at end of file
diff --git a/pages/management/HcxErrorHandle.vue b/pages/management/HcxErrorHandle.vue
deleted file mode 100644
index 3ec0071..0000000
--- a/pages/management/HcxErrorHandle.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="缓存线异常处理"></nav-bar>
-		<view class="filter-confirm-wrap">
-			<view class="filter-confirm-wrap-inner">
-				<view class="filter-wrap">
-					<view class="search-item filter-item">
-						<label class="search-label">生产区域</label>
-						<view class="filter_input_wraper">
-							<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-						</view>
-					</view>
-					<view class="search-item filter-item">
-						<label class="search-label">缓存线</label>
-						<view class="filter_input_wraper">
-							<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-						</view>
-					</view>
-				</view>
-				<view class="confirm-button-wrap confirm-button-wrap-c">
-					<button class="confirm-button" :disabled="disabled" @tap="toSure('1')">暂停</button>
-					<button class="confirm-button" :disabled="disabled" @tap="toSure('2')">启动</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, cacheLineExcepOpt} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				disabled: false
-			};
-		},
-		created() {
-			this._getCacheLine('A1')
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async toSure (type) {
-			  this.disabled = true
-			  if (!this.index2) {
-					uni.showToast({
-						title: '请选择',
-						icon: 'none'
-					})
-					this.disabled = false
-					return
-				}
-			  try {
-					let res = await cacheLineExcepOpt(this.index2, type)
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-			  } catch (e) {
-					this.disabled = false
-			  }
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.filter-confirm-wrap
-	_wh(calc(100% - 30px), calc(100% - 72px))
-	background-color #fff
-	border-radius 12px
-	margin 15px auto
-	_fj()
-.filter-confirm-wrap-inner
-	width 50%
-	background-color #fff
-	border-radius 12px
-	padding-bottom 15px
-	margin 0 auto
-.filter-wrap
-	width 100%
-	padding 0 15px
-	_fj(center,,column,)
-.filter-item
-	width 100%
-.confirm-button-wrap-c
-	justify-content center
-	margin-top 50px
-</style>
\ No newline at end of file
diff --git a/pages/management/HcxOutError.vue b/pages/management/HcxOutError.vue
deleted file mode 100644
index 84232e4..0000000
--- a/pages/management/HcxOutError.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="缓存线出箱异常"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">生产区域</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">缓存线位置</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">料箱码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-				<view class="search-item_2 flexend">
-					<button class="confirm-button" @tap="toSearch()">查询</button>
-					<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
-				</view>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>指令编号</th>
-						<th>设备编号</th>
-						<th>条码</th>
-						<th>起点</th>
-						<th>目的</th>
-						<th>目的2</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
-						</td>
-						<td>{{e.instructoperate_num}}</td>
-						<td>{{e.wcsdevice_code}}</td>
-						<td>{{e.vehicle_code}}</td>
-						<td>{{e.startpoint_code}}</td>
-						<td>{{e.nextpoint_code}}</td>
-						<td>{{e.nextpoint_code2}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, cacheLineOutBoxExceptionQuery, cacheLineOutBoxExceptionConfirm} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				val1: '',
-				val2: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-			this._getCacheLine('A1')
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._cacheLineOutBoxExceptionQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _cacheLineOutBoxExceptionQuery () {
-				let res = await cacheLineOutBoxExceptionQuery(this.index2, this.val1)
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  try {
-				let res = await cacheLineOutBoxExceptionConfirm(this.index2,this.pkId, '2', this.val2, this.index1, this.val1) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.grid-wrap
-	height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */
-</style>
\ No newline at end of file
diff --git a/pages/management/MaterList.vue b/pages/management/MaterList.vue
deleted file mode 100644
index 16729ab..0000000
--- a/pages/management/MaterList.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar :inner2="true" @goIn="goIn" title="物料列表"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">订单号</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item search-item-btns">
-					<button class="confirm-button" @tap="toSearch">查询</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="toSure">确认</button>
-				</view>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>订单行号</th>
-						<th>规格</th>
-						<th>订单数量</th>
-						<th>入库数量</th>
-						<th>物料编码</th>
-						<th>物料名称</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.material_id" :class="{'checked': e.checked}">
-						<td>
-							<view class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe608;</view>
-						</td>
-						<td>{{e.order_line_code}}</td>
-						<td>{{e.material_spec}}</td>
-						<td>{{e.sale_qty}}</td>
-						<td><input type="number" class="search-input-l" :class="{'bgr': e.bgr === true}" v-model="e.assign_qty"></td>
-						<td>{{e.material_code}}</td>
-						<td>{{e.material_name}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-		<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {orderSearch} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false,
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 10,
-				checkArr: []
-			};
-		},
-		methods: {
-			toSearch () {
-			  this.dataList = []
-			  this.pageNum = 1
-			  this._orderSearch()
-			},
-			/** 初始化查询 */
-			async _orderSearch () {
-				let res = await orderSearch(this.pageNum + '', this.pageSize + '', this.val1)
-				this.totalCount = res.totalElements
-				if (res.totalElements > 0) {
-					res.content.map(el => {
-						this.$set(el, 'checked', false)
-						this.$set(el, 'bgr', false)
-						this.$set(el, 'assign_qty', '0.000')
-					})
-					const dataMap = res.content
-					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
-					this.reload = false
-				} else {
-					this.dataList = []
-				}
-				if (this.totalCount == this.dataList.length) {
-					this.reload = false
-					this.status = 'noMore'
-				}
-			},
-			onReachBottom () {
-				if (this.totalCount > this.dataList.length) {
-					this.status = 'loading'
-					setTimeout(() => {
-						this.pageNum++
-						this._orderSearch()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
-			async toSure () {
-				let flag = false
-			    this.dataList.map(el => {
-					if (el.checked && (Number(el.assign_qty) < 0 || el.assign_qty === '')) {
-						this.$set(el, 'bgr', true)
-						flag = true
-					}
-				})
-				if (flag) {
-					return
-				}
-				if (this.checkArr.length) {
-					this.$store.dispatch('setPublicArr', this.checkArr)
-					uni.redirectTo({
-						url: '/pages/management/FinishedInStore'
-					})
-				}
-			},
-			toCheck (e) {
-				e.checked = !e.checked
-				this.checkArr = this.dataList.filter(i => { return i.checked === true })
-			},
-			goIn () {
-				uni.redirectTo({
-					url: '/pages/management/FinishedInStore'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.grid-wrap	
-    height: calc(100% - 137px); /** 42+ 15*4+ 35*1 */
-</style>
\ No newline at end of file
diff --git a/pages/management/SemifinishedInStore.vue b/pages/management/SemifinishedInStore.vue
deleted file mode 100644
index cde00d9..0000000
--- a/pages/management/SemifinishedInStore.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品入库"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">仓库</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">单据类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">物料</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">规格</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val2">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">数量(个)</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val3">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">单重(g)</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val4">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">入库点</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">载具号</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val5"
-						/>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">备注</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val6">
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toDelect">呼叫空载具</button>
-				<button class="confirm-button" @tap="toSelect">作业查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !index1 || !val1}" :disabled="disabled" @tap="toSure">确认入库</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {finishproductPoint, InstoreOrder} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: 'A1',
-				options2: [],
-				index2: 'A1',
-				options3: [],
-				index3: 'A1',
-				val1: '',
-				val2: '',
-				val3: '',
-				val4: '',
-				val5: '',
-				val6: '',
-				disabled: false
-			};
-		},
-		destroyed () {
-			this.$store.dispatch('setPublicArr', '')
-		},
-		created () {
-			// this._finishproductPoint()
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toDelect () {
-			  this.$store.dispatch('setPublicArr', '')
-			},
-			async _finishproductPoint () {
-				let res = await finishproductPoint('1')
-				this.options1 = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.index1) {
-				uni.showToast({
-					title: '请选择入库点',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请输入载具号',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await InstoreOrder(this.index1, this.val1) 
-				this.disabled = false
-				this.index1 = ''
-				this.val1 = ''
-				this.toDelect()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toSelect () {
-				uni.navigateTo({
-					url: '/pages/management/MaterList'
-				})
-			}
-		}
-	}
-</script>
diff --git a/pages/management/SemifinishedInStoreSearch.vue b/pages/management/SemifinishedInStoreSearch.vue
deleted file mode 100644
index cb0079f..0000000
--- a/pages/management/SemifinishedInStoreSearch.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品入库查询"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">仓库</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">开始日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="startDate"  @click="open1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">结束日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="endDate"  @click="open2">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">业务类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">物料</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1" placeholder="编号/名称">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">载具号</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch">查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">强制确认</button>
-			</view>
-		</view>
-		<view class="grid-wrap zd_wrapper">
-			<view class="slide_new">
-				<table class="grid-table">
-					<thead>
-						<tr>
-							<th>选择</th>
-							<th>序号</th>
-							<th>单据号</th>
-							<th>状态</th>
-							<th>类型</th>
-							<th>物料编号</th>
-							<th>物料名称</th>
-							<th>数量</th>
-							<th>单重(g)</th>
-							<th>载具号</th>
-							<th>入库点</th>
-							<th>货位</th>
-							<th>创建时间</th>
-							<th>创建人</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
-							<td>
-								<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
-							</td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-						</tr>
-					</tbody>
-				</table>
-			</view>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar1"
-			:insert="false"
-			:date="startDate"
-			@confirm="confirm1"
-			/>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar2"
-			:insert="false"
-			:date="endDate"
-			@confirm="confirm2"
-			/>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
-	import {dateFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				startDate: dateFtt(new Date()),
-				endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
-				options1: [{text: '1线本成品入库', value: '1'}],
-				index1: 'A1',
-				options2: [{text: '清洗入库', value: '1'}, {text: '挑料入库', value: '2'}, {text: '回流入库', value: 'A1'}, {text: '手工入库', value: 'A2'}],
-				index2: '1',
-				val1: '',
-				dataList: [{position_code: '1', vehicle_code: 'djlfjjljlkllkllldf', cacheline_code: 'jfjldfjl'}, {position_code: '2', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '21', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '22', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '23', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '24', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '25', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '26', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '27', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '29', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-		},
-		methods: {
-			open1(){
-				this.$refs.calendar1.open()
-			},
-			confirm1(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.endDate))
-				if (compare < 0) {
-					this.startDate = e.fulldate
-				}
-			},
-			open2(){
-				this.$refs.calendar2.open()
-			},
-			confirm2(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.startDate))
-				if (compare > 0) {
-					this.endDate = e.fulldate
-				}
-			},
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._inOutExceptionInstQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery(this.index2)
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.index2) {
-				uni.showToast({
-					title: '请选择缓存线',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.index3) {
-				uni.showToast({
-					title: '请选择位置类型',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请扫满箱码',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.grid-wrap	
-    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
-/deep/ .uni-calendar-item__weeks-box-item
-	height: 40px !important
-</style>
\ No newline at end of file
diff --git a/pages/management/SemifinishedOutStore.vue b/pages/management/SemifinishedOutStore.vue
deleted file mode 100644
index e2c0300..0000000
--- a/pages/management/SemifinishedOutStore.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品出库"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">仓库</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">单据类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">物料</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">规格</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val2">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">数量(个)</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val3">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">单重(g)</label>
-					<view class="filter_input_wraper">
-						<input type="number" class="search-input-l" v-model="val4">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">入库点</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">载具号</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val5"
-						/>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">备注</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val6">
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toDelect">呼叫空载具</button>
-				<button class="confirm-button" @tap="toSelect">作业查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !index1 || !val1}" :disabled="disabled" @tap="toSure">确认入库</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {finishproductPoint, InstoreOrder} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: 'A1',
-				options2: [],
-				index2: 'A1',
-				options3: [],
-				index3: 'A1',
-				val1: '',
-				val2: '',
-				val3: '',
-				val4: '',
-				val5: '',
-				val6: '',
-				disabled: false
-			};
-		},
-		destroyed () {
-			this.$store.dispatch('setPublicArr', '')
-		},
-		created () {
-			// this._finishproductPoint()
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toDelect () {
-			  this.$store.dispatch('setPublicArr', '')
-			},
-			async _finishproductPoint () {
-				let res = await finishproductPoint('1')
-				this.options1 = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.index1) {
-				uni.showToast({
-					title: '请选择入库点',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请输入载具号',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await InstoreOrder(this.index1, this.val1) 
-				this.disabled = false
-				this.index1 = ''
-				this.val1 = ''
-				this.toDelect()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toSelect () {
-				uni.navigateTo({
-					url: '/pages/management/MaterList'
-				})
-			}
-		}
-	}
-</script>
diff --git a/pages/management/SemifinishedOutStoreSearch.vue b/pages/management/SemifinishedOutStoreSearch.vue
deleted file mode 100644
index db438a6..0000000
--- a/pages/management/SemifinishedOutStoreSearch.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品出库查询"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">仓库</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">开始日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="startDate"  @click="open1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">结束日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="endDate"  @click="open2">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">业务类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">物料</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1" placeholder="编号/名称">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">载具号</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch">查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">强制确认</button>
-			</view>
-		</view>
-		<view class="grid-wrap zd_wrapper">
-			<view class="slide_new">
-				<table class="grid-table">
-					<thead>
-						<tr>
-							<th>选择</th>
-							<th>序号</th>
-							<th>单据号</th>
-							<th>状态</th>
-							<th>类型</th>
-							<th>物料编号</th>
-							<th>物料名称</th>
-							<th>数量</th>
-							<th>单重(g)</th>
-							<th>载具号</th>
-							<th>入库点</th>
-							<th>货位</th>
-							<th>创建时间</th>
-							<th>创建人</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
-							<td>
-								<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
-							</td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-						</tr>
-					</tbody>
-				</table>
-			</view>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar1"
-			:insert="false"
-			:date="startDate"
-			@confirm="confirm1"
-			/>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar2"
-			:insert="false"
-			:date="endDate"
-			@confirm="confirm2"
-			/>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
-	import {dateFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				startDate: dateFtt(new Date()),
-				endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
-				options1: [{text: '1线本成品入库', value: '1'}],
-				index1: 'A1',
-				options2: [{text: '清洗入库', value: '1'}, {text: '挑料入库', value: '2'}, {text: '回流入库', value: 'A1'}, {text: '手工入库', value: 'A2'}],
-				index2: '1',
-				val1: '',
-				dataList: [{position_code: '1', vehicle_code: 'djlfjjljlkllkllldf', cacheline_code: 'jfjldfjl'}, {position_code: '2', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '21', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '22', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '23', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '24', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '25', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '26', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '27', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '29', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-		},
-		methods: {
-			open1(){
-				this.$refs.calendar1.open()
-			},
-			confirm1(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.endDate))
-				if (compare < 0) {
-					this.startDate = e.fulldate
-				}
-			},
-			open2(){
-				this.$refs.calendar2.open()
-			},
-			confirm2(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.startDate))
-				if (compare > 0) {
-					this.endDate = e.fulldate
-				}
-			},
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._inOutExceptionInstQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery(this.index2)
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.index2) {
-				uni.showToast({
-					title: '请选择缓存线',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.index3) {
-				uni.showToast({
-					title: '请选择位置类型',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请扫满箱码',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.grid-wrap	
-    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
-/deep/ .uni-calendar-item__weeks-box-item
-	height: 40px !important
-</style>
\ No newline at end of file
diff --git a/pages/management/TaskManage-del.vue b/pages/management/TaskManage-del.vue
deleted file mode 100644
index feecdba..0000000
--- a/pages/management/TaskManage-del.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="任务管理"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">关键字</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">强制完成</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">重新下发</button>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>任务号</th>
-						<th>任务编号</th>
-						<th>条码</th>
-						<th>起点</th>
-						<th>目的</th>
-						<th>目的2</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
-						</td>
-						<td>{{e.instructoperate_num}}</td>
-						<td>{{e.wcsdevice_code}}</td>
-						<td>{{e.vehicle_code}}</td>
-						<td>{{e.startpoint_code}}</td>
-						<td>{{e.nextpoint_code}}</td>
-						<td>{{e.nextpoint_code2}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, cacheLineOutBoxExceptionQuery, cacheLineOutBoxExceptionConfirm} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-			this._cacheLineOutBoxExceptionQuery()
-		},
-		methods: {
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._cacheLineOutBoxExceptionQuery()
-			},
-			async _cacheLineOutBoxExceptionQuery () {
-				let res = await cacheLineOutBoxExceptionQuery()
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  try {
-				let res = await cacheLineOutBoxExceptionConfirm(this.val1) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.grid-wrap
-	height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
-</style>
\ No newline at end of file
diff --git a/pages/management/TaskOperate.vue b/pages/management/TaskOperate.vue
deleted file mode 100644
index 417ae10..0000000
--- a/pages/management/TaskOperate.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="任务管理"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">生产区域</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">任务类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">状态</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">指令号</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" placeholder="指令号、MES号" v-model="instNum">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">任务描述</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" placeholder="任务描述" v-model="taskName">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">条码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						placeholder="入箱条码、出箱条码"
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">起点</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" placeholder="起始点位、起始设备" v-model="startPoint">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">终点</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" placeholder="目的点位、目的设备" v-model="endPoint">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">开始日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="startDate"  @click="open1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">结束日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="endDate"  @click="open2">
-					</view>
-				</view>
-				<view class="search-item_2 flexend">
-					<button class="confirm-button" @tap="toSearch()">查询</button>
-					<button class="confirm-button" :disabled="disabled" @tap="toSure('8')">取消</button>
-					<button class="confirm-button" :disabled="disabled" @tap="toSure('7')">完成</button>
-					<button class="confirm-button" :disabled="disabled" @tap="toSure('5')">重发</button>
-				</view>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>任务编号</th>
-						<th>任务类型</th>
-						<th>任务描述</th>
-						<th>起点设备</th>
-						<th>目的设备</th>
-						<th>料箱码</th>
-						<th>状态</th>
-						<th>物料编码</th>
-						<th>创建时间</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
-						</td>
-						<td>{{e.instructoperate_num}}</td>
-						<td>{{e.task_type}}</td>
-						<td>{{e.task_name}}</td>
-						<td>{{e.startpoint_code}}</td>
-						<td>{{e.nextpoint_code}}</td>
-						<td>{{e.vehicle_code}}</td>
-						<td>{{e.status_name}}</td>
-						<td>{{e.processmaterial_code}}</td>
-						<td>{{e.create_time}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-		<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
-		<view>
-			<uni-calendar 
-			ref="calendar1"
-			:insert="false"
-			:date="startDate"
-			@confirm="confirm1"
-			/>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar2"
-			:insert="false"
-			:date="endDate"
-			@confirm="confirm2"
-			/>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {instStatusQuery, instPageQuery, instOperation, taskType} from '@/utils/getData1.js'
-	import {dateFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				page: 1,
-				options1: [],
-				index1: '',
-				options2: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index2: 'A1',
-				options3: [],
-				index3: '',
-				startDate: dateFtt(new Date()),
-				endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
-				instNum: '',
-				taskName: '',
-				startPoint: '',
-				endPoint: '',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false,
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 100
-			};
-		},
-		created() {
-			this._instStatusQuery()
-			this._taskType()
-		},
-		methods: {
-			open1(){
-				this.$refs.calendar1.open()
-			},
-			confirm1(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.endDate))
-				if (compare < 0) {
-					this.startDate = e.fulldate
-				}
-			},
-			open2(){
-				this.$refs.calendar2.open()
-			},
-			confirm2(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.startDate))
-				if (compare > 0) {
-					this.endDate = e.fulldate
-				}
-			},
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器2 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			async _instStatusQuery (id) {
-				let res = await instStatusQuery(id)
-				this.options1 = [...res]
-			},
-			async _taskType (id) {
-				let res = await taskType(id)
-				this.options3 = [...res]
-			},
-			toSearch () {
-				this.dataList = []
-				this.pageNum = 1
-				this._instPageQuery()
-			},
-			/** 初始化查询 */
-			async _instPageQuery () {
-				let form = {
-					page: this.pageNum + '',
-					size: this.pageSize + '',
-					status: this.index1,
-					inst_num: this.instNum,
-					task_name: this.taskName,
-					task_type: this.index3,
-					product_area: this.index2,
-					vehicle_code: this.val1,
-					start_point: this.startPoint,
-					end_point: this.endPoint,
-					start_date: this.startDate || '',
-					end_date: this.endDate || ''
-				}
-				let res = await instPageQuery(form)
-				this.totalCount = res.size
-				if (res.size > 0) {
-					const dataMap = res.content
-					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
-					this.reload = false
-				} else {
-					this.dataList = []
-				}
-				if (this.totalCount == this.dataList.length) {
-					this.reload = false
-					this.status = 'noMore'
-				}
-				
-			},
-			onReachBottom () {
-				if (this.totalCount > this.dataList.length) {
-					this.status = 'loading'
-					setTimeout(() => {
-						this.pageNum++
-						this._instPageQuery()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
-			async toSure (type) {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  try {
-				let res = await instOperation(this.pkId, type)
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.grid-wrap
-	height: auto
-	overflow: auto
-	height: calc(100% - 337px); /** 42+ 15*8+ 35*5 */
-/deep/ .uni-calendar-item__weeks-box-item
-	height: 40px !important
->>>.search_input
-	padding-right 60px
-</style>
\ No newline at end of file
diff --git a/pages/management/agvinerror.vue b/pages/management/agvinerror.vue
deleted file mode 100644
index 9cba8a3..0000000
--- a/pages/management/agvinerror.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="AGV入箱异常"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">满箱码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">空箱码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>指令编号</th>
-						<th>设备编号</th>
-						<th>起点</th>
-						<th>目的</th>
-						<th>目的2</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
-						</td>
-						<td>{{e.instructorder_no}}</td>
-						<td>{{e.wcsdevice_code}}</td>
-						<td>{{e.startpoint_code}}</td>
-						<td>{{e.nextpoint_code}}</td>
-						<td>{{e.nextpoint_code2}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryInstraction, instOperation} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				val1: '',
-				val2: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this._queryInstraction()
-			},
-			async _queryInstraction () {
-				let res = await queryInstraction()
-				this.dataList = [...res.data]
-			},
-			toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  this._instOperation()
-			},
-			async _instOperation () {
-				let res = await instOperation()
-				this.dataList = [...res.data]
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.grid-wrap
-	height calc(100% - 237px) /** 42+ 15*6+ 35*3 */
-</style>
\ No newline at end of file
diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue
deleted file mode 100644
index 8491677..0000000
--- a/pages/management/hcxcheck.vue
+++ /dev/null
@@ -1,379 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="缓存线盘点"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap search-wrap_1">
-				<view class="search-item">
-					<label class="search-label">生产区域</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item flexend">
-					<button class="confirm-button" :disabled="disabled4" @tap="_cacheLineHandCheck">盘点开始</button>
-					<button class="confirm-button" :disabled="disabled5" @tap="_cacheLineHandCheckEnd">盘点结束</button>
-					<button class="confirm-button" @tap="toSearch()">刷新</button>
-				</view>
-			</view>
-		</view>
-		<view class="material-wrap">
-			<view class="status-wrap">
-				<view class="status-item">
-					<text class="status-icon bg-gray"></text>
-					<text class="status-txt">空位</text>
-				</view>
-				<view class="status-item">
-					<text class="status-icon bg-green"></text>
-					<text class="status-txt">空箱</text>
-				</view>
-				<view class="status-item">
-					<text class="status-icon bg-yellow"></text>
-					<text class="status-txt">满箱</text>
-				</view>
-				<view class="status-item">
-					<text class="status-icon bg-red"></text>
-					<text class="status-txt">异常</text>
-				</view>
-			</view>
-			<view class="material-item-wrap">
-				<view v-if="Number(e.vehicle_status) !== 5" class="material-item" v-for="(e, i) in dataList" :key="i" :class="['bg-gray', 'bg-green', 'bg-yellow','bg-red'][Number(e.vehicle_status) - 1]" @tap="toInfo(e)">
-					<view class="material-title">{{e.vehicle_code}}</view>
-					<view class="material-spec">{{e.material_spec}}</view>
-					<!-- <view v-show="e.layer_num === 1 && (e.seat_order_num === 1 || e.seat_order_num === 2)" class="badge__content">{{['准备位', '对接位'][Number(e.seat_order_num) - 1]}}</view> -->
-				</view>
-			</view>
-		</view>
-		<view class="popup-bottom-wrap" :class="active === true ? 'addHeight' : 'delHeight'">
-			<view class="search-confirm-wrap">
-				<view class="search-wrap">
-					<view class="search-item">
-						<label class="search-label">料箱码</label>
-						<view class="filter_input_wraper">
-							<search-box
-							v-model="val1"
-							/>
-						</view>
-					</view>
-					<view class="search-item">
-						<label class="search-label">物料</label>
-						<view class="filter_input_wraper" @tap="searchMater">
-							<input type="text" class="search-input-l" v-model="val2">
-						</view>
-					</view>
-					<view class="search-item">
-						<label class="search-label">名称</label>
-						<view class="filter_input_wraper">
-							<input type="text" class="search-input-l" v-model="val3" disabled="disabled">
-						</view>
-					</view>
-					<view class="search-item">
-						<label class="search-label">规格</label>
-						<view class="filter_input_wraper">
-							<input type="text" class="search-input-l" v-model="val4" disabled="disabled">
-						</view>
-					</view>
-					<view class="search-item">
-						<label class="search-label">数量</label>
-						<view class="filter_input_wraper">
-							<input type="number" class="search-input-l" v-model="val6">
-						</view>
-					</view>
-					<view class="search-item">
-						<label class="search-label">重量</label>
-						<view class="filter_input_wraper">
-							<input type="number" class="search-input-l" v-model="val7">
-						</view>
-					</view>
-					<view class="search-item">
-						<label class="search-label">层</label>
-						<view class="filter_input_wraper">
-							<input type="number" class="search-input-l" v-model="obj.layer_num" disabled>
-						</view>
-					</view>
-					<view class="search-item">
-						<label class="search-label">位置</label>
-						<view class="filter_input_wraper">
-							<input type="text" class="search-input-l" v-model="obj.seat_order_num" disabled>
-						</view>
-					</view>
-					<view class="search-item">
-						<label class="search-label">工序</label>
-						<view class="filter_input_wraper">
-							<uni-data-select v-model="index3" :localdata="options3" :selectUp="true" @change="selectChange3"></uni-data-select>
-						</view>
-					</view>
-				</view>
-				<view class="confirm-button-wrap">
-					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !val6 || !val7}" :disabled="disabled1" @tap="_setfullBox">设为满框</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !val1}" :disabled="disabled2" @tap="_setEmptyBox">设为空框</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !val1}" :disabled="disabled3" @tap="_deleteBox">删除</button>
-				</view>
-			</view>
-		</view>
-		<view v-show="active" class="overlay" @tap="closePop"></view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, workprocedureQuery, getCacheLineMaterialInfo, setfullBox, setEmptyBox, deleteBox, cacheLineHandCheck, cacheLineHandCheckEnd} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				options3: [],
-				index3: '',
-				val1: '',
-				val2: '',
-				val3: '',
-				val4: '',
-				val5: '',
-				val6: '',
-				val7: '',
-				dataList: [],
-				active: false,
-				obj: {},
-				disabled1: false,
-				disabled2: false,
-				disabled3: false,
-				disabled4: false,
-				disabled5: false
-				
-			};
-		},
-		created () {
-			this._getCacheLine('A1')
-			this._workprocedureQuery()
-		},
-		destroyed () {
-			this.$store.dispatch('setPublicObj', '')
-		},
-		onShow () {
-			if (this.$store.getters.publicObj !== '') {
-				this.val2 = this.$store.getters.publicObj.material_code
-				this.val3 = this.$store.getters.publicObj.material_name
-				this.val4 = this.$store.getters.publicObj.material_spec
-				this.val5 = this.$store.getters.publicObj.material_uuid
-			}
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-					this.index2 = ''
-				}
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-				if (this.index2) {
-					this._getCacheLineMaterialInfo()
-				}
-			},
-			/** 缓存线 */
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _getCacheLineMaterialInfo () {
-				let res = await getCacheLineMaterialInfo(this.index1, this.index2)
-				this.dataList = [...res]
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			/** 工序 */
-			async _workprocedureQuery () {
-				let res = await workprocedureQuery()
-				this.options3 = [...res]
-				this.options3.map(el => {
-					this.$set(el, 'text', el.workprocedure_name)
-					this.$set(el, 'value', el.workprocedure_code)
-				})
-			},
-			toSearch () {
-				this.val1 = ''
-				this.index3 = ''
-				this.val2 = ''
-				this.val3 = ''
-				this.val4 = ''
-				this.val5 = ''
-				this.val6 = ''
-				this.val7 = ''
-				this.obj = {}
-				this.active = false
-				this.$store.dispatch('setPublicObj', '')
-				this._getCacheLineMaterialInfo()
-			},
-			toInfo(e) {
-				this.active = true
-				this.obj = e
-				this.val1 = this.obj.vehicle_code
-				this.options3.map(el => {
-					if (el.workprocedure_code === e.workprocedure_code) {
-						this.index3 = el.value
-					}
-				})
-				this.val2 = this.obj.material_code
-				this.val3 = this.obj.material_name
-				this.val4 = this.obj.material_spec
-				this.val5 = this.obj.material_uuid
-				this.val6 = this.obj.quantity
-				this.val7 = this.obj.weight
-			},
-			searchMater () {
-				this.$store.dispatch('setPublicObj', '')
-				uni.navigateTo({
-					url: '/pages/management/searchMater'
-				})
-			},
-			closePop () {
-				this.active = false
-			},
-			async _setfullBox () {
-			  this.disabled1 = true
-			  if (!this.val1 || !this.val6 || !this.val7) {
-				this.disabled1 = false
-				return
-			  }
-			  try {
-				let obj = {}
-				this.$set(obj, 'position_code', this.obj.position_code)
-				this.$set(obj, 'vehicle_code', this.val1)
-				this.$set(obj, 'material_uuid', this.val5)
-				this.$set(obj, 'workprocedure_code', this.index3)
-				this.$set(obj, 'wcsdevice_code', this.obj.wcsdevice_code)	
-				this.$set(obj, 'quantity', this.val6)
-				this.$set(obj, 'weight', this.val7)
-				let res = await setfullBox(obj) 
-				this.disabled1 = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled1 = false
-			  }
-			},
-			async _setEmptyBox () {
-			  this.disabled2 = true
-			  if (!this.val1) {
-				this.disabled2 = false
-				return
-			  }
-			  try {
-				let obj = {}
-				this.$set(obj, 'vehicle_code', this.val1)
-				this.$set(obj, 'wcsdevice_code', this.obj.wcsdevice_code)
-				this.$set(obj, 'position_code', this.obj.position_code)
-				let res = await setEmptyBox(obj) 
-				this.disabled2 = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled2 = false
-			  }
-			},
-			async _deleteBox () {
-			  this.disabled3 = true
-			  if (!this.val1) {
-				this.disabled3 = false
-				return
-			  }
-			  try {
-				let obj = {}
-				this.$set(obj, 'vehicle_code', this.val1)
-				this.$set(obj, 'position_code', this.obj.position_code)
-				let res = await deleteBox(obj) 
-				this.disabled3 = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled3 = false
-			  }
-			},
-			async _cacheLineHandCheck () {
-				this.disabled4 = true
-				try {
-					let res = await cacheLineHandCheck('0', this.index2) 
-					this.disabled4 = false
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled4 = false
-				}
-			},
-			async _cacheLineHandCheckEnd () {
-				this.disabled5 = true
-				try {
-					let res = await cacheLineHandCheckEnd('1', this.index2) 
-					this.disabled5 = false
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled5 = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.popup-bottom-wrap
-	position fixed
-	bottom 0
-	left 0
-	width 100%
-	height 0
-	z-index 100
-	background-color #fff
-	_fj()
-.overlay
-	position fixed
-	bottom 0
-	left 0
-	_wh(100%, 100%)
-	background-color rgba(0,0,0,.7)
-	z-index 99
-.addHeight
-	transition height .2s linear
-	height 215px /** 35*4+ 15*5 */
-.delHeight
-	transition height .2s linear
-	height 0
-.search-wrap_1
-	.search-item
-		&:nth-child(1),&:nth-child(2)
-			width 30%
-		&:nth-child(3)
-			width 36%
-</style>
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index e07cc2c..ad56c21 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -14,9 +14,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="zd-row jcflexstart table-title_wraper">
-			<text>采购入库</text>
-		</view>
+		<view class="zd-row jcflexstart table-title_wraper">{{title}}</view>
 		<view class="grid-wrap">
 			<view class="table-wrap">
 				<view class="zd-row zd-th-wraper">
@@ -76,7 +74,7 @@
 						<view class="zd-row mgt40">
 							<view class="zd-col-12 zd-row jcflexstart">
 								<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" :disabled="disabled2" @tap="_easOutInBillDetailUpdate">多库位修改</button>
-								<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length !== 1}" :disabled="disabled1" @tap="toSure">单库位修改</button>
+								<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length !== 1}" @tap="_queryInventoryInfo">单库位修改</button>
 							</view>
 							<view class="zd-col-12">
 								<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
@@ -87,26 +85,67 @@
 			</view>
 			<pagination v-show="dataList1.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
 		</view>
+		<view class="pop-wraper" :class="show ? 'popshow' : 'pophide'">
+			<view class="allwidth pop-title">库位修改</view>
+			<view class="pop-grid-wraper">
+				<view class="zd-row zd-sec-th-wraper zd-pop-th-wraper">
+					<view class="zd-col-2 zd-sec-th"><text>序号</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>出库单号</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>物料编号</text></view>
+					<view class="zd-col-5 zd-sec-th"><text>物料名称</text></view>
+					<view class="zd-col-5 zd-sec-th"><text>实际库位</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>数量</text></view>
+				</view>
+				<view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id">
+					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.code}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.code}}</text></view>
+					<view class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.code}}</text></view>
+					<view class="zd-col-5 zd-sec-td zd-pop-td">
+						<scan-input
+						v-model="ele.ckmc"
+						/>
+					</view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td">
+						<input v-show="!ele.checked" type="number" class="pop-input" v-model="ele.qty" @blur="handleBlur(ele)">
+						<text v-show="ele.checked">{{ele.qty}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row jcenter">
+				<view class="zd-col-4">
+					<button class="confirm-button confirm-button_cancle" @tap="show = false">取消</button>
+				</view>
+				<view class="zd-col-4">
+					<button class="confirm-button" :class="{'confirm-button_disabled': dataList3.length === 0}" :disabled="disabled3" @tap="_easOutInBillDetailUpdate1">确定</button>
+				</view>
+			</view>
+		</view>
+		<view v-if="show" class="modal" @click.stop="show = false"></view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
-	import {easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate} from '@/utils/getData2.js'
+	import {easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
 			SearchBox,
+			ScanInput,
 			Pagination
 		},
 		data() {
 			return {
+				title: '',
 				id: '',
 				val1: '',
 				dataList1: [],
 				dataList2: [],
+				dataList3: [],
 				pkId: '',
 				checkArr1: [],
 				disabled1: false,
@@ -124,7 +163,9 @@
 				},
 				currentPage2: 1,
 				checkArr2: [],
-				disabled2: false
+				disabled2: false,
+				show: false,
+				disabled3: false
 			};
 		},
 		onShow() {
@@ -137,6 +178,7 @@
 		},
 		onLoad (options) {
 			this.id = options.id
+			this.title = options.name
 		},
 		methods: {
 			toSearch () {
@@ -244,6 +286,53 @@
 			  } catch (e) {
 				this.disabled2 = false
 			  }
+			},
+			async _queryInventoryInfo () {
+				let res = await queryInventoryInfo(this.checkArr2)
+				res.result.map(el => {
+					this.$set(el, 'checked', false)
+					this.$set(el, 'yqty', el.qty)
+				})
+				this.dataList3 = [...res.result]
+				this.show = true
+			},
+			handleBlur (ele) {
+				console.log(this.dataList3)
+				ele.checked = true
+				let index = ''
+				let obj = {}
+				this.dataList3.map((e, i) => {
+					if (e.id === ele.id) {
+						index = i
+						obj = Object.assign({}, e, {'checked': false}, {'ckmc': ''}, {id: e.id + Math.random() * 1000}, {qty: Number(e.yqty) - Number(ele.qty)}, {yqty: Number(e.yqty) - Number(ele.qty)})
+					}
+				})
+				this.dataList3.splice(index+1, 0, obj)
+				this.dataList3 = [...this.dataList3]
+			},
+			async _easOutInBillDetailUpdate1 () {
+			  this.disabled3 = true
+			  if (this.dataList3.length === 0) {
+				this.disabled3 = false
+				return
+			  }
+			  try {
+				let res = await easOutInBillDetailUpdate(this.dataList3) 
+				this.disabled3 = false
+				this.show = false
+				this.queryParams2 = {
+					pageSize: 10,
+					pageNum: 1
+				}
+				this.currentPage2 = 1
+				this._easOutInBillDetailPage()
+				uni.showToast({
+					title: res.desc,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled3 = false
+			  }
 			}
 		}
 	}
diff --git a/pages/management/inscanerror.vue b/pages/management/inscanerror.vue
deleted file mode 100644
index 20529e4..0000000
--- a/pages/management/inscanerror.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="扫码异常"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">生产区域</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">位置类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">满箱码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="search-item_2">
-					<!-- <button class="confirm-button" @tap="toSearch">查询</button> -->
-					<button class="confirm-button" :class="{'confirm-button_disabled': !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">确认</button>
-				</view>
-			</view>
-		</view>
-		<!-- <view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>缓存线编码</th>
-						<th>缓存线位置编码</th>
-						<th>料箱码</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
-						</td>
-						<td>{{e.cacheline_code}}</td>
-						<td>{{e.position_code}}</td>
-						<td>{{e.vehicle_code}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view> -->
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
-				index3: '1',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-			this._getCacheLine('A1')
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._inOutExceptionInstQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			// async _inOutExceptionInstQuery () {
-			// 	let res = await inOutExceptionInstQuery(this.index2)
-			// 	this.dataList = [...res]
-			// },
-			async toSure () {
-			  this.disabled = true
-			 //  if (!this.pkId) {
-				// uni.showToast({
-				// 	title: '请选择',
-				// 	icon: 'none'
-				// })
-				// this.disabled = false
-				// return
-			 //  }
-			  if (!this.index2) {
-				uni.showToast({
-					title: '请选择缓存线',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.index3) {
-				uni.showToast({
-					title: '请选择位置类型',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请扫满箱码',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.index3) 
-				this.disabled = false
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.grid-wrap	
-    height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */
-</style>
\ No newline at end of file
diff --git a/pages/management/out-storage.vue b/pages/management/out-storage.vue
index 239d03a..046a496 100644
--- a/pages/management/out-storage.vue
+++ b/pages/management/out-storage.vue
@@ -1,19 +1,343 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<nav-bar title="出库"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="zd-row">
+				<view class="zd-col-11 zd-row">
+					<search-box
+					v-model="val1"
+					/>
+					<button class="confirm-button" @tap="toSearch">查询</button>
+				</view>
+				<view class="zd-col-11 zd-row jcflexend">
+					<button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0}" :disabled="disabled1" @tap="toSure">单据审核</button>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row jcflexstart table-title_wraper">{{title}}</view>
+		<view class="grid-wrap">
+			<view class="table-wrap">
+				<view class="zd-row zd-th-wraper">
+					<view class="zd-col-2 zd-th"><text>序号</text></view>
+					<view class="zd-col-2 zd-th"><text>选择</text></view>
+					<view class="zd-col-3 zd-th"><text>入库单号</text></view>
+					<view class="zd-col-3 zd-th"><text>EAS单号</text></view>
+					<view class="zd-col-2 zd-th"><text>状态</text></view>
+					<view class="zd-col-3 zd-th"><text>去向</text></view>
+					<view class="zd-col-3 zd-th"><text>入库日期</text></view>
+					<view class="zd-col-3 zd-th"><text>领料人</text></view>
+					<view class="zd-col-3 zd-th"><text>制单人</text></view>
+				</view>
+				<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
+					<view class="zd-row" :class="{'zd-td-checked': pkId === e.id}">
+						<view class="zd-col-2 zd-td" @tap.stop="toCollapse(e)"><text>{{i+1}}</text></view>
+						<view class="zd-col-2 zd-td" @tap.stop="toCheck1(e)">
+							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
+						</view>
+						<view class="zd-col-3 zd-td fontcol1" @tap.stop="toCollapse(e)"><text>{{e.code}}</text></view>
+						<view class="zd-col-3 zd-td" @tap.stop="toCollapse(e)"><text>{{e.djbh}}</text></view>
+						<view class="zd-col-2 zd-td" @tap.stop="toCollapse(e)"><text class="fontbg1">{{e.djzt}}</text></view>
+						<view class="zd-col-3 zd-td" @tap.stop="toCollapse(e)"><text>{{e.ckmc}}</text></view>
+						<view class="zd-col-3 zd-td" @tap.stop="toCollapse(e)"><text>{{e.cksj}}</text></view>
+						<view class="zd-col-3 zd-td" @tap.stop="toCollapse(e)"><text>{{e.llr}}</text></view>
+						<view class="zd-col-3 zd-td" @tap.stop="toCollapse(e)"><text>{{e.cjr}}</text></view>
+					</view>
+					<view v-show="pkId === e.id" class="zd-sec-wraper">
+						<view class="zd-row zd-sec-th-wraper">
+							<view class="zd-col-1 zd-sec-th"><text>序号</text></view>
+							<view class="zd-col-1 zd-sec-th"><text>选择</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>入库单号</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>明细编号</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>存货编号</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>物料编号</text></view>
+							<view class="zd-col-3 zd-sec-th"><text>物料名称</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>推荐库位</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>实际库位</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>已入数量</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>数量</text></view>
+							<view class="zd-col-3 zd-sec-th"><text>单据日期</text></view>
+						</view>
+						<view class="zd-row zd-td-wraper" v-for="(el, j) in dataList2" :key="el.id" @tap.stop="toCheck2(el)">
+							<view class="zd-col-1 zd-sec-td"><text>{{j+1}}</text></view>
+							<view class="zd-col-1 zd-sec-td"><view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view></view>
+							<view class="zd-col-2 zd-sec-td"><text>{{el.djbh}}</text></view>
+							<view class="zd-col-2 zd-sec-td"><text>{{el.zzbm}}</text></view>
+							<view class="zd-col-2 zd-sec-td"><text>{{el.kwbm}}</text></view>
+							<view class="zd-col-2 zd-sec-td"><text>{{el.wlbm}}</text></view>
+							<view class="zd-col-3 zd-sec-td"><text>{{el.wlmc}}</text></view>
+							<view class="zd-col-2 zd-sec-td"><text>{{el.djbh}}</text></view>
+							<view class="zd-col-2 zd-sec-td"><text>{{el.djbh}}</text></view>
+							<view class="zd-col-2 zd-sec-td"><text>{{el.jbsl}}</text></view>
+							<view class="zd-col-2 zd-sec-td"><text>{{el.fzsl}}</text></view>
+							<view class="zd-col-3 zd-sec-td"><text>{{el.cksj}}</text></view>
+						</view>
+						<view class="zd-row mgt40">
+							<view class="zd-col-12 zd-row jcflexstart">
+								<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" :disabled="disabled2" @tap="_easOutInBillDetailUpdate">多库位修改</button>
+								<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length !== 1}" @tap="_queryInventoryInfo">单库位修改</button>
+							</view>
+							<view class="zd-col-12">
+								<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<pagination v-show="dataList1.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
+		</view>
+		<view class="pop-wraper" :class="show ? 'popshow' : 'pophide'">
+			<view class="allwidth pop-title">库位修改</view>
+			<view class="pop-grid-wraper">
+				<view class="zd-row zd-sec-th-wraper zd-pop-th-wraper">
+					<view class="zd-col-2 zd-sec-th"><text>序号</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>出库单号</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>物料编号</text></view>
+					<view class="zd-col-5 zd-sec-th"><text>物料名称</text></view>
+					<view class="zd-col-5 zd-sec-th"><text>实际库位</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>数量</text></view>
+				</view>
+				<view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id">
+					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.code}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.code}}</text></view>
+					<view class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.code}}</text></view>
+					<view class="zd-col-5 zd-sec-td zd-pop-td">
+						<scan-input
+						v-model="ele.ckmc"
+						/>
+					</view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td">
+						<input v-show="!ele.checked" type="number" class="pop-input" v-model="ele.qty" @blur="handleBlur(ele)">
+						<text v-show="ele.checked">{{ele.qty}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row jcenter">
+				<view class="zd-col-4">
+					<button class="confirm-button confirm-button_cancle" @tap="show = false">取消</button>
+				</view>
+				<view class="zd-col-4">
+					<button class="confirm-button" :class="{'confirm-button_disabled': dataList3.length === 0}" :disabled="disabled3" @tap="_easOutInBillDetailUpdate1">确定</button>
+				</view>
+			</view>
+		</view>
+		<view v-if="show" class="modal" @click.stop="show = false"></view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import ScanInput from '@/components/ScanInput.vue'
+	import Pagination from '@/components/Pagination.vue'
+	import {easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			ScanInput,
+			Pagination
+		},
 		data() {
 			return {
-				
+				title: '',
+				id: '',
+				val1: '',
+				dataList1: [],
+				dataList2: [],
+				dataList3: [],
+				pkId: '',
+				checkArr1: [],
+				disabled1: false,
+				totalCount1: 0,
+				queryParams1:{
+					pageSize: 10,
+					pageNum: 1
+				},
+				currentPage1: 1,
+				code: '',
+				totalCount2: 0,
+				queryParams2:{
+					pageSize: 5,
+					pageNum: 1
+				},
+				currentPage2: 1,
+				checkArr2: [],
+				disabled2: false,
+				show: false,
+				disabled3: false
 			};
+		},
+		onShow() {
+			if (this.$store.getters.publicArr) {
+				this.dataList1 = this.$store.getters.publicArr
+			}
+		},
+		destroyed () {
+			this.$store.dispatch('setPublicArr', '')
+		},
+		onLoad (options) {
+			this.id = options.id
+			this.title = options.name
+		},
+		methods: {
+			toSearch () {
+				this.queryParams1 = {
+					pageSize: 10,
+					pageNum: 1
+				}
+				this.currentPage1 = 1
+				this.dataList2 = []
+				this._easOutInBillPage()
+			},
+			async _easOutInBillPage () {
+				let res = await easOutInBillPage(this.val1, this.id, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				this.checkArr1 = []
+				res.result.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList1 = [...res.result]
+				this.totalCount1 = Number(res.totalElements)
+				this.queryParams1.pageSize = Number(res.pageSize)
+				this.queryParams1.pageNum = Number(res.pageNum)
+			},
+			async _easOutInBillDetailPage () {
+				let res = await easOutInBillDetailPage(this.code, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
+				this.checkArr2 = []
+				res.result.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList2 = [...res.result]
+				this.totalCount2 = Number(res.totalElements)
+				this.queryParams2.pageSize = Number(res.pageSize)
+				this.queryParams2.pageNum = Number(res.pageNum)
+			},
+			handlePageChange1(page) {
+				this.queryParams1.pageNum = page
+				this.currentPage1 = page
+				this.dataList2 = []
+				this._easOutInBillPage()
+			},
+			handlePageChange2(page) {
+				this.queryParams2.pageNum = page
+				this.currentPage2 = page
+				this._easOutInBillDetailPage()
+			},
+			toCollapse (e) {
+				this.pkId = this.pkId === e.id ? '' : e.id
+				if (this.pkId === e.id) {
+					this.queryParams2 = {
+						pageSize: 10,
+						pageNum: 1
+					}
+					this.currentPage2 = 1
+					this.code = e.code
+					this._easOutInBillDetailPage()
+				}
+			},
+			toCheck1 (e) {
+				e.checked = !e.checked
+				let arr = this.dataList1.filter(el => el.checked === true)
+				this.checkArr1 = arr.map(el => {return el.code})
+			},
+			async toSure () {
+			  this.disabled1 = true
+			  if (this.checkArr1.length === 0) {
+				this.disabled1 = false
+				return
+			  }
+			  try {
+				let res = await easOutInBillUpdate(this.checkArr1) 
+				this.disabled1 = false
+				this.checkArr1 = []
+				this.toSearch()
+				uni.showToast({
+					title: res.desc,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled1 = false
+			  }
+			},
+			toCheck2 (e) {
+				e.checked = !e.checked
+				this.checkArr2 = this.dataList2.filter(el => el.checked === true)
+			},
+			async _easOutInBillDetailUpdate () {
+			  this.disabled2 = true
+			  if (this.checkArr2.length === 0) {
+				this.disabled2 = false
+				return
+			  }
+			  try {
+				let res = await easOutInBillDetailUpdate(this.checkArr2) 
+				this.disabled2 = false
+				this.checkArr2 = []
+				this.queryParams2 = {
+					pageSize: 10,
+					pageNum: 1
+				}
+				this.currentPage2 = 1
+				this._easOutInBillDetailPage()
+				uni.showToast({
+					title: res.desc,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled2 = false
+			  }
+			},
+			async _queryInventoryInfo () {
+				let res = await queryInventoryInfo(this.checkArr2)
+				res.result.map(el => {
+					this.$set(el, 'checked', false)
+					this.$set(el, 'yqty', el.qty)
+				})
+				this.dataList3 = [...res.result]
+				this.show = true
+			},
+			handleBlur (ele) {
+				console.log(this.dataList3)
+				ele.checked = true
+				let index = ''
+				let obj = {}
+				this.dataList3.map((e, i) => {
+					if (e.id === ele.id) {
+						index = i
+						obj = Object.assign({}, e, {'checked': false}, {'ckmc': ''}, {id: e.id + Math.random() * 1000}, {qty: Number(e.yqty) - Number(ele.qty)}, {yqty: Number(e.yqty) - Number(ele.qty)})
+					}
+				})
+				this.dataList3.splice(index+1, 0, obj)
+				this.dataList3 = [...this.dataList3]
+			},
+			async _easOutInBillDetailUpdate1 () {
+			  this.disabled3 = true
+			  if (this.dataList3.length === 0) {
+				this.disabled3 = false
+				return
+			  }
+			  try {
+				let res = await easOutInBillDetailUpdate(this.dataList3) 
+				this.disabled3 = false
+				this.show = false
+				this.queryParams2 = {
+					pageSize: 10,
+					pageNum: 1
+				}
+				this.currentPage2 = 1
+				this._easOutInBillDetailPage()
+				uni.showToast({
+					title: res.desc,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled3 = false
+			  }
+			}
 		}
 	}
 </script>
 
-<style lang="stylus">
-
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
 </style>
diff --git a/pages/management/outscanerror.vue b/pages/management/outscanerror.vue
deleted file mode 100644
index 0c5d7da..0000000
--- a/pages/management/outscanerror.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="出箱扫码异常"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">生产区域</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">缓存线</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">料箱码</label>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="search-item search-item-btns">
-					<button class="confirm-button" @tap="toSearch">查询</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId}" :disabled="disabled" @tap="toSure">确认</button>
-				</view>
-			</view>
-			<!-- <view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
-			</view> -->
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>指令编号</th>
-						<th>设备编号</th>
-						<th>条码</th>
-						<th>起点</th>
-						<th>目的</th>
-						<th>目的2</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
-						</td>
-						<td>{{e.instructorder_no}}</td>
-						<td>{{e.wcsdevice_code}}</td>
-						<td>{{e.vehicle_code}}</td>
-						<td>{{e.startpoint_code}}</td>
-						<td>{{e.nextpoint_code}}</td>
-						<td>{{e.nextpoint_code2}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				disabled: false
-			};
-		},
-		created() {
-			this._getCacheLine('A1')
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this.pkObj = {}
-			  this._inOutExceptionInstQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery('2',this.index2,this.val1)
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  try {
-				this.$set(this.pkObj, 'inOut_type', '2')
-				let res = await inOutExceptionInstConfirm(this.pkObj) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
-			  this.pkObj = this.pkId === e.instruct_uuid ? e : {}
-			}
-		}
-	}
-</script>
diff --git a/pages/management/searchMater.vue b/pages/management/searchMater.vue
deleted file mode 100644
index 0781dce..0000000
--- a/pages/management/searchMater.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar :inner2="true" @goIn="goIn" title="物料查询"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">物料</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item search-item-btns">
-					<button class="confirm-button" @tap="_materialQuery">查询</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId}" @tap="toSure">确认</button>
-				</view>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>编码</th>
-						<th>名称</th>
-						<th>规格</th>
-						<th>系列</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.material_uuid"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.material_uuid}"></view>
-						</td>
-						<td>{{e.material_code}}</td>
-						<td>{{e.material_name}}</td>
-						<td>{{e.material_spec}}</td>
-						<td>{{e.class_name}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {materialQuery} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				val1: '',
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				page: ''
-			};
-		},
-		created () {
-			this._materialQuery()
-		},
-		onLoad (options) {
-			this.page = options.page
-		},
-		methods: {
-			goIn () {
-				// 上一个页面hcxcheck、HalfFinishedInStore，只能用uni.navigateBack()上个页面才能缓存
-				uni.navigateBack()
-			},
-			async _materialQuery () {
-				let res = await materialQuery(this.val1)
-				this.dataList = [...res]
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.material_uuid ? '' : e.material_uuid
-			  this.pkObj = this.pkId === e.material_uuid ? e : {}
-			},
-			toSure () {
-				if (!this.pkId) {
-					return
-				}
-				this.$store.dispatch('setPublicObj', this.pkObj)
-				this.goIn()
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-.grid-wrap
-	height: calc(100% - 137px); /** 42+ 15*4+ 35 */
-</style>
diff --git a/pages/management/semifinishedcheck.vue b/pages/management/semifinishedcheck.vue
deleted file mode 100644
index 3051519..0000000
--- a/pages/management/semifinishedcheck.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品盘点"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">仓库</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">单据类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">盘点站点</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">备注</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item_2">
-					<button class="confirm-button" @tap="toSearch">添加盘点物料</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">删除一行</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">生成盘点单</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">盘点作业</button>
-				</view>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>序号</th>
-						<th>盘点库区</th>
-						<th>盘点货位</th>
-						<th>物料号</th>
-						<th>物料名称</th>
-						<th>数量</th>
-						<th>单重(g)</th>
-						<th>载具号</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
-						</td>
-						<td>{{e.cacheline_code}}</td>
-						<td>{{e.position_code}}</td>
-						<td>{{e.vehicle_code}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
-				index3: '1',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-			this._getCacheLine('A1')
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._inOutExceptionInstQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery(this.index2)
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.index2) {
-				uni.showToast({
-					title: '请选择缓存线',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.index3) {
-				uni.showToast({
-					title: '请选择位置类型',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请扫满箱码',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.grid-wrap	
-    height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */
-</style>
\ No newline at end of file
diff --git a/pages/management/semifinishedchecksearch.vue b/pages/management/semifinishedchecksearch.vue
deleted file mode 100644
index 7dfa002..0000000
--- a/pages/management/semifinishedchecksearch.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品盘点查询"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">仓库</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">开始日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="startDate"  @click="open1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">结束日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="endDate"  @click="open2">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">业务类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">物料</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1" placeholder="编号/名称">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">载具号</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">货位号</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item_2">
-					<button class="confirm-button" @tap="toSearch">查询</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">下发</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">盘点确认</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">实盘为准</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">账务为准</button>
-				</view>
-			</view>
-		</view>
-		<view class="grid-wrap zd_wrapper">
-			<view class="slide_new">
-				<table class="grid-table">
-					<thead>
-						<tr>
-							<th>选择</th>
-							<th>序号</th>
-							<th>盘点仓位</th>
-							<th>载具号</th>
-							<th>物料号</th>
-							<th>物料名称</th>
-							<th>数量</th>
-							<th>盘点数量</th>
-							<th>单重(g)</th>
-							<th>是否异常</th>
-							<th>盘点状态</th>
-							<th>盘点站台</th>
-							<th>下发状态</th>
-							<th>单据号</th>
-							<th>业务类型</th>
-							<th>创建人</th>
-							<th>创建时间</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
-							<td>
-								<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
-							</td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-						</tr>
-					</tbody>
-				</table>
-			</view>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar1"
-			:insert="false"
-			:date="startDate"
-			@confirm="confirm1"
-			/>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar2"
-			:insert="false"
-			:date="endDate"
-			@confirm="confirm2"
-			/>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
-	import {dateFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				startDate: dateFtt(new Date()),
-				endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
-				index3: '1',
-				val1: '',
-				dataList: [{position_code: '1', vehicle_code: 'djlfjjljlkllkllldf', cacheline_code: 'jfjldfjl'}, {position_code: '2', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '21', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '22', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '23', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '24', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '25', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '26', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '27', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '29', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-		},
-		methods: {
-			open1(){
-				this.$refs.calendar1.open()
-			},
-			confirm1(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.endDate))
-				if (compare < 0) {
-					this.startDate = e.fulldate
-				}
-			},
-			open2(){
-				this.$refs.calendar2.open()
-			},
-			confirm2(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.startDate))
-				if (compare > 0) {
-					this.endDate = e.fulldate
-				}
-			},
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._inOutExceptionInstQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery(this.index2)
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.index2) {
-				uni.showToast({
-					title: '请选择缓存线',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.index3) {
-				uni.showToast({
-					title: '请选择位置类型',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请扫满箱码',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.grid-wrap	
-    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
-/deep/ .uni-calendar-item__weeks-box-item
-	height: 40px !important
-</style>
\ No newline at end of file
diff --git a/pages/management/semifinishedcompose.vue b/pages/management/semifinishedcompose.vue
deleted file mode 100644
index d209ede..0000000
--- a/pages/management/semifinishedcompose.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品拼盘"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">仓库</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">单据类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">物料</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">规格</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">备注</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-				<view class="search-item flexend">
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">生成盘点单</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">作业查询</button>
-				</view>
-			</view>
-		</view>
-		<view class="grid-wrap">
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>选择</th>
-						<th>仓位</th>
-						<th>数量(个)</th>
-						<th>载具号</th>
-						<th>单重(g)</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
-						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
-						</td>
-						<td>{{e.cacheline_code}}</td>
-						<td>{{e.position_code}}</td>
-						<td>{{e.vehicle_code}}</td>
-						<td></td>
-					</tr>
-				</tbody>
-			</table>
-			<view class="transfer-wrapper">
-				<button class="transfer-button">>></button>
-				<button class="transfer-button"><<</button>
-			</view>
-			<table class="grid-table">
-				<thead>
-					<tr>
-						<th>顺序</th>
-						<th>仓位</th>
-						<th>数量(个)</th>
-						<th>载具号</th>
-						<th>单重(g)</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
-						<td></td>
-						<td>{{e.cacheline_code}}</td>
-						<td>{{e.position_code}}</td>
-						<td>{{e.vehicle_code}}</td>
-						<td></td>
-					</tr>
-				</tbody>
-			</table>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
-				index3: '1',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-			this._getCacheLine('A1')
-		},
-		methods: {
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._inOutExceptionInstQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery(this.index2)
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.index2) {
-				uni.showToast({
-					title: '请选择缓存线',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.index3) {
-				uni.showToast({
-					title: '请选择位置类型',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请扫满箱码',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.grid-wrap	
-    height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */
-.grid-wrap
-	_fj(, flex-start)
-	.grid-table
-		width calc(50% - 40px)
-.transfer-wrapper
-	_wh(80px, 100%)
-	padding 0 15px
-	_fj(center,,column)
-.transfer-button
-	width 50px
-	background-color #D7592F
-	color #fff
-	line-height 35px
-	margin 15px 0
-</style>
\ No newline at end of file
diff --git a/pages/management/semifinishedcomposesearch.vue b/pages/management/semifinishedcomposesearch.vue
deleted file mode 100644
index 4acbaef..0000000
--- a/pages/management/semifinishedcomposesearch.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="半成品拼盘查询"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="search-wrap">
-				<view class="search-item">
-					<label class="search-label">仓库</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">开始日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="startDate"  @click="open1">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">结束日期</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="endDate"  @click="open2">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">业务类型</label>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">物料</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1" placeholder="编号/名称">
-					</view>
-				</view>
-				<view class="search-item">
-					<label class="search-label">载具号</label>
-					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" v-model="val1">
-					</view>
-				</view>
-			</view>
-			<view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch">查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">拼盘完成</button>
-			</view>
-		</view>
-		<view class="grid-wrap zd_wrapper">
-			<view class="slide_new">
-				<table class="grid-table">
-					<thead>
-						<tr>
-							<th>选择</th>
-							<th>序号</th>
-							<th>单据号</th>
-							<th>状态</th>
-							<th>类型</th>
-							<th>物料编号</th>
-							<th>物料名称</th>
-							<th>数量</th>
-							<th>单重(g)</th>
-							<th>转出货位</th>
-							<th>转出载具</th>
-							<th>转入货位</th>
-							<th>转入载具</th>
-							<th>创建时间</th>
-							<th>创建人</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
-							<td>
-								<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
-							</td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-							<td>{{e.vehicle_code}}</td>
-							<td></td>
-							<td>{{e.cacheline_code}}</td>
-							<td>{{e.position_code}}</td>
-						</tr>
-					</tbody>
-				</table>
-			</view>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar1"
-			:insert="false"
-			:date="startDate"
-			@confirm="confirm1"
-			/>
-		</view>
-		<view>
-			<uni-calendar 
-			ref="calendar2"
-			:insert="false"
-			:date="endDate"
-			@confirm="confirm2"
-			/>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
-	import {dateFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				startDate: dateFtt(new Date()),
-				endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
-				index1: 'A1',
-				options2: [],
-				index2: '',
-				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
-				index3: '1',
-				val1: '',
-				dataList: [{position_code: '1', vehicle_code: 'djlfjjljlkllkllldf', cacheline_code: 'jfjldfjl'}, {position_code: '2', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '21', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '22', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '23', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '24', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '25', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '26', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '27', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '29', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}],
-				pkId: '',
-				disabled: false
-			};
-		},
-		created() {
-		},
-		methods: {
-			open1(){
-				this.$refs.calendar1.open()
-			},
-			confirm1(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.endDate))
-				if (compare < 0) {
-					this.startDate = e.fulldate
-				}
-			},
-			open2(){
-				this.$refs.calendar2.open()
-			},
-			confirm2(e) {
-				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.startDate))
-				if (compare > 0) {
-					this.endDate = e.fulldate
-				}
-			},
-			/** 选择器1 */
-			selectChange1(e) {
-				this.index1 = e
-				if (this.index1) {
-					this._getCacheLine(e)
-				}
-				this.index2 = ''
-			},
-			/** 选择器2 */
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 选择器3 */
-			selectChange3(e) {
-				this.index3 = e
-			},
-			toSearch () {
-			  this.dataList = []
-			  this.pkId = ''
-			  this._inOutExceptionInstQuery()
-			},
-			async _getCacheLine (id) {
-				let res = await getCacheLine(id)
-				this.options2 = [...res]
-			},
-			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery(this.index2)
-				this.dataList = [...res]
-			},
-			async toSure () {
-			  this.disabled = true
-			  if (!this.pkId) {
-				uni.showToast({
-					title: '请选择',
-					icon: 'none'
-				})
-				this.disabled = false
-				return
-			  }
-			  if (!this.index2) {
-				uni.showToast({
-					title: '请选择缓存线',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.index3) {
-				uni.showToast({
-					title: '请选择位置类型',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  if (!this.val1) {
-				uni.showToast({
-					title: '请扫满箱码',
-					icon: 'none'
-				})
-				this.disabled = false
-				return  
-			  }
-			  try {
-				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
-				this.disabled = false
-				this.toSearch()
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
-			  } catch (e) {
-				this.disabled = false
-			  }
-			},
-			toRadio (e) {
-			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.grid-wrap	
-    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
-/deep/ .uni-calendar-item__weeks-box-item
-	height: 40px !important
-</style>
\ No newline at end of file
diff --git a/static/images/pop_bg.png b/static/images/pop_bg.png
new file mode 100644
index 0000000..48e1af3
Binary files /dev/null and b/static/images/pop_bg.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index ec01c8c..1b08339 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -13,104 +13,34 @@ export const handLogin = (user, password) => request({
 export const pdaUpdate = () => request({
 	url:'api/cacheLineHand/appUpdate'
 })
-// export const pdaUpdate = () => {
-// 	let res = {
-// 		versionName: '1.0.0',
-// 		androidUrl: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk'
-// 	}
-// 	return res
-// }
 
 // 首页显示出入库单据数量
-// export const getBillsCount = (area) => request({
-// 	url:'api/easOutInBill/getBillsCount',
-// 	data: {}
-// })
-export const getBillsCount = (area) => {
-	let res = [
-        {name: '销售出库', djlx: 'XSCKD', ywlx: 'OUT', counts: '1'},
-        {name: '采购退货出库', djlx: 'CGTHD', ywlx: 'OUT', counts: '1'},
-        {name: '调拨出库', djlx: 'DBCKD', ywlx: 'OUT', counts: '1'},
-        {name: '委外出库', djlx: 'WWFLD', ywlx: 'OUT', counts: '1'},
-        {name: '生产出库', djlx: 'LLCKD', ywlx: 'OUT', counts: '1'},
-        {name: '采购入库', djlx: 'CGRKD', ywlx: 'IN', counts: '1'},
-        {name: '生产退料入库', djlx: 'LLTHD', ywlx: 'IN', counts: '1'},
-        {name: '调拨入库', djlx: 'DBRKD', ywlx: 'IN', counts: '1'},
-        {name: '委外入库', djlx: 'WWRKD', ywlx: 'IN', counts: '1'}
-    ]
-	return res
-}
+export const getBillsCount = (area) => request({
+	url:'api/easOutInBill/getBillsCount',
+	data: {}
+})
+
 // 1.2分页查询出入库单据
-// export const easOutInBillPage = (fuzzy, djlx, page, size) => request({
-// 	url:'api/easOutInBill/page',
-// 	data: {
-// 		fuzzy: fuzzy,
-// 		djlx: djlx,
-// 		page: page,
-// 		size: size
-// 	}
-// })
-export const easOutInBillPage = (size, page, fuzzy, djlx) => {
-	let res = {
-		code: '1',
-		desc: '',
-		pageNum: '1',
-		pageSize: '10',
-		totalElements: '50',
-		result: [
-			{id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '6', code: 'IO20218', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '7', code: 'IO20219', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '8', code: 'IO20220', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '9', code: 'IO20221', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '10', code: 'IO20222', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}]
+export const easOutInBillPage = (fuzzy, djlx, page, size) => request({
+	url:'api/easOutInBill/page',
+	data: {
+		fuzzy: fuzzy,
+		djlx: djlx,
+		page: page,
+		size: size
 	}
-	return res
-}
+})
+
 // 1.2分页查询出入库单据
-// export const easOutInBillDetailPage = (djid, page, size) => request({
-// 	url:'api/easOutInBillDetail/page',
-// 	data: {
-// 		djid: djid,
-// 		page: page,
-// 		size: size
-// 	}
-// })
-export const easOutInBillDetailPage = (djid, page, size) => {
-	let res = {}
-	if (page === '1') {
-		res = {
-			code: '1',
-			desc: '',
-			pageNum: '2',
-			pageSize: '5',
-			totalElements: '50',
-			result: [
-				{id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-				{id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-				{id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-				{id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-				{id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}]
-		}
-	} else {
-		res = {
-			code: '1',
-			desc: '',
-			pageNum: '2',
-			pageSize: '5',
-			totalElements: '50',
-			result: [
-				{id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-				{id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-				{id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}]
-		}
+export const easOutInBillDetailPage = (djid, page, size) => request({
+	url:'api/easOutInBillDetail/page',
+	data: {
+		djid: djid,
+		page: page,
+		size: size
 	}
-	return res
-}
+})
+
 // 1.3审核出入库单据
 export const easOutInBillUpdate = (djid) => request({
 	url:'api/easOutInBill/update',
@@ -118,29 +48,105 @@ export const easOutInBillUpdate = (djid) => request({
 		djid: djid
 	}
 })
+
 // 1.4查询出单据明细库位
-// export const queryInventoryInfo = (arr) => request({
-// 	url:'api/easOutInBillDetail/queryInventoryInfo',
-// 	data: arr
-// })
-export const queryInventoryInfo = (arr) => {
-	let res = {
-		code: '1',
-		desc: '',
-		pageNum: '2',
-		pageSize: '5',
-		totalElements: '50',
-		result: [
-			{id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
-			{id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}]
-	}
-	return res
-}
+export const queryInventoryInfo = (arr) => request({
+	url:'api/easOutInBillDetail/queryInventoryInfo',
+	data: arr
+})
+
 // 1.5修改出单据明细库位
 export const easOutInBillDetailUpdate = (arr) => request({
 	url:'/api/easOutInBillDetail/update',
 	data: arr
-})
\ No newline at end of file
+})
+
+// export const pdaUpdate = () => {
+// 	let res = {
+// 		versionName: '1.0.0',
+// 		androidUrl: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk'
+// 	}
+// 	return res
+// }
+// export const getBillsCount = (area) => {
+// 	let res = [
+//         {name: '销售出库', djlx: 'XSCKD', ywlx: 'OUT', counts: '1'},
+//         {name: '采购退货出库', djlx: 'CGTHD', ywlx: 'OUT', counts: '1'},
+//         {name: '调拨出库', djlx: 'DBCKD', ywlx: 'OUT', counts: '1'},
+//         {name: '委外出库', djlx: 'WWFLD', ywlx: 'OUT', counts: '1'},
+//         {name: '生产出库', djlx: 'LLCKD', ywlx: 'OUT', counts: '1'},
+//         {name: '采购入库', djlx: 'CGRKD', ywlx: 'IN', counts: '1'},
+//         {name: '生产退料入库', djlx: 'LLTHD', ywlx: 'IN', counts: '1'},
+//         {name: '调拨入库', djlx: 'DBRKD', ywlx: 'IN', counts: '1'},
+//         {name: '委外入库', djlx: 'WWRKD', ywlx: 'IN', counts: '1'}
+//     ]
+// 	return res
+// }
+// export const easOutInBillPage = (size, page, fuzzy, djlx) => {
+// 	let res = {
+// 		code: '1',
+// 		desc: '',
+// 		pageNum: '1',
+// 		pageSize: '10',
+// 		totalElements: '50',
+// 		result: [
+// 			{id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '6', code: 'IO20218', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '7', code: 'IO20219', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '8', code: 'IO20220', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '9', code: 'IO20221', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 			{id: '10', code: 'IO20222', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}]
+// 	}
+// 	return res
+// }
+// export const easOutInBillDetailPage = (djid, page, size) => {
+// 	let res = {}
+// 	if (page === '1') {
+// 		res = {
+// 			code: '1',
+// 			desc: '',
+// 			pageNum: '2',
+// 			pageSize: '5',
+// 			totalElements: '50',
+// 			result: [
+// 				{id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 				{id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 				{id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 				{id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 				{id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}]
+// 		}
+// 	} else {
+// 		res = {
+// 			code: '1',
+// 			desc: '',
+// 			pageNum: '2',
+// 			pageSize: '5',
+// 			totalElements: '50',
+// 			result: [
+// 				{id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 				{id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'},
+// 				{id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文'}]
+// 		}
+// 	}
+// 	return res
+// }
+// export const queryInventoryInfo = (arr) => {
+// 	let res = {
+// 		code: '1',
+// 		desc: '',
+// 		pageNum: '2',
+// 		pageSize: '5',
+// 		totalElements: '50',
+// 		result: [
+// 			{id: '1', code: 'IO20213', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'},
+// 			{id: '2', code: 'IO20214', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'},
+// 			{id: '3', code: 'IO20215', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'},
+// 			{id: '4', code: 'IO20216', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'},
+// 			{id: '5', code: 'IO20217', djbh: 'SOUT4201', djzt: '未审核', ckmc: '叉车装配线', cksj: '2023-06-16', llr: '陈晓华', cjr: 'EAS_钱丽文', qty: '1000'}]
+// 	}
+// 	return res
+// }
\ No newline at end of file