From 44ea40fe022443a727fdc8935312f5d863a33464 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 19 Aug 2024 18:04:12 +0800
Subject: [PATCH] =?UTF-8?q?add=E7=BB=84=E7=9B=98=E5=85=A5=E5=BA=93\?=
 =?UTF-8?q?=E7=A9=BA=E6=A1=86=E9=80=81=E5=9B=9E\=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E9=94=81=E5=AE=9A\=E8=A1=A5=E7=A9=BA=E6=89=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  46 +--
 pages/home/home.vue                           |  27 +-
 pages/manage/area-lock.vue                    |  82 +++++
 pages/manage/back/in-storage.vue              | 107 -------
 pages/manage/back/man-group-disk.vue          | 289 ------------------
 pages/manage/back/out-storage.vue             | 262 ----------------
 pages/manage/back/search-mater-1.vue          |  77 -----
 pages/manage/back/search-mater.vue            | 103 -------
 pages/manage/back/task-flow.vue               | 132 --------
 ...empty-tray-out.vue => empty-tray-back.vue} |  35 +--
 .../{empty-tray-in.vue => fill-tray.vue}      |  36 +--
 pages/manage/fixed-point-task.vue             | 146 ---------
 pages/manage/group-in-storage.vue             | 260 ++--------------
 pages/manage/mater-out-storage.vue            | 139 ---------
 pages/manage/out-storage-confirm.vue          | 182 -----------
 pages/manage/point-update.vue                 | 132 --------
 pages/manage/produce-cut.vue                  |  99 ------
 pages/manage/task-manage.vue                  | 185 -----------
 static/image/menu/RF01.png                    | Bin 1814 -> 3276 bytes
 static/image/menu/RF02.png                    | Bin 3276 -> 0 bytes
 static/image/menu/RF03.png                    | Bin 1613 -> 3101 bytes
 static/image/menu/RF05.png                    | Bin 2390 -> 0 bytes
 static/image/menu/RF07.png                    | Bin 3101 -> 0 bytes
 static/image/menu/RF08.png                    | Bin 2265 -> 0 bytes
 static/image/menu/RF09.png                    | Bin 2456 -> 0 bytes
 25 files changed, 146 insertions(+), 2193 deletions(-)
 create mode 100644 pages/manage/area-lock.vue
 delete mode 100644 pages/manage/back/in-storage.vue
 delete mode 100644 pages/manage/back/man-group-disk.vue
 delete mode 100644 pages/manage/back/out-storage.vue
 delete mode 100644 pages/manage/back/search-mater-1.vue
 delete mode 100644 pages/manage/back/search-mater.vue
 delete mode 100644 pages/manage/back/task-flow.vue
 rename pages/manage/{empty-tray-out.vue => empty-tray-back.vue} (78%)
 rename pages/manage/{empty-tray-in.vue => fill-tray.vue} (66%)
 delete mode 100644 pages/manage/fixed-point-task.vue
 delete mode 100644 pages/manage/mater-out-storage.vue
 delete mode 100644 pages/manage/out-storage-confirm.vue
 delete mode 100644 pages/manage/point-update.vue
 delete mode 100644 pages/manage/produce-cut.vue
 delete mode 100644 pages/manage/task-manage.vue
 delete mode 100644 static/image/menu/RF02.png
 delete mode 100644 static/image/menu/RF05.png
 delete mode 100644 static/image/menu/RF07.png
 delete mode 100644 static/image/menu/RF08.png
 delete mode 100644 static/image/menu/RF09.png

diff --git a/pages.json b/pages.json
index aec5e87..d665a70 100644
--- a/pages.json
+++ b/pages.json
@@ -19,20 +19,12 @@
 		    }  
 		}
         ,{
-            "path" : "pages/manage/empty-tray-out",
+            "path" : "pages/manage/empty-tray-back",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/manage/empty-tray-in",
-            "style" :                                                                                    
-            {
-               "navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/manage/group-in-storage",
@@ -43,7 +35,7 @@
             
         }
         ,{
-            "path" : "pages/manage/mater-out-storage",
+            "path" : "pages/manage/area-lock",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
@@ -51,45 +43,13 @@
             
         }
         ,{
-            "path" : "pages/manage/produce-cut",
+            "path" : "pages/manage/fill-tray",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
             
         }
-        ,{
-            "path" : "pages/manage/point-update",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/fixed-point-task",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/task-manage",
-            "style" :                                                                                    
-            {
-                 "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/out-storage-confirm",
-            "style" :                                                                                    
-            {
-                 "navigationStyle": "custom"
-            }
-            
-        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 91d888c..d870994 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -15,7 +15,7 @@
 			<view class="zd_home_wrapper">
 				<view class="menus_wrap">
 					<view class="fir_menu_wrap">
-						<view class="fir_menu-item" v-for="e in menuList1" :key="e.id" @tap="toPage(e)">
+						<view class="fir_menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage(e)">
 							<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
 							<view class="menu-name">{{e.title}}</view>
 						</view>
@@ -32,27 +32,10 @@
 			return {
 				userName: '',
 				menuList: [
-					{id: '1', name: '人工组盘', sonTree: [
-						{menu_id: '1', icon: 'RF01', name: '人工组盘', path: '/pages/manage/man-group-disk'}
-					]},
-					{id: '2', name: '原材料库', sonTree: [
-						{menu_id: '1', icon: 'RF02', name: '入库', path: '/pages/manage/in-storage'},
-						{menu_id: '2', icon: 'RF03', name: '出库', path: '/pages/manage/out-storage'}
-					]},
-					{id: '3', name: '任务流转', sonTree: [
-						{menu_id: '1', icon: 'RF04', name: '任务流转', path: '/pages/manage/task-flow'}
-					]}
-				],
-				menuList1: [
-					{id: 1, title: '空托盘出库', icon: 'RF01', path: '/pages/manage/empty-tray-out'},
-					{id: 2, title: '空托盘入库', icon: 'RF02', path: '/pages/manage/empty-tray-in'},
-					{id: 3, title: '组盘入库', icon: 'RF03', path: '/pages/manage/group-in-storage'},
-					{id: 4, title: '原料出库', icon: 'RF04', path: '/pages/manage/mater-out-storage'},
-					{id: 5, title: '生产下料', icon: 'RF05', path: '/pages/manage/produce-cut'},
-					{id: 6, title: '点位更新', icon: 'RF06', path: '/pages/manage/point-update'},
-					{id: 7, title: '定点作业', icon: 'RF07', path: '/pages/manage/fixed-point-task'},
-					{id: 8, title: '作业管理', icon: 'RF08', path: '/pages/manage/task-manage'},
-					{id: 9, title: '出库确认', icon: 'RF09', path: '/pages/manage/out-storage-confirm'}
+					{title: '组盘入库', icon: 'RF03', path: '/pages/manage/group-in-storage'},
+					{title: '空框送回', icon: 'RF01', path: '/pages/manage/empty-tray-back'},
+					{title: '区域锁定', icon: 'RF06', path: '/pages/manage/area-lock'},
+					{title: '补空托', icon: 'RF04', path: '/pages/manage/fill-tray'}
 				],
 				show: false,
 				secM: []
diff --git a/pages/manage/area-lock.vue b/pages/manage/area-lock.vue
new file mode 100644
index 0000000..ce2caea
--- /dev/null
+++ b/pages/manage/area-lock.vue
@@ -0,0 +1,82 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">区域</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': index1 === ''}" :disabled="disabled" @tap="_fullVehicleOut">锁定</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': index1 === ''}" :disabled="disabled" @tap="_fullVehicleOut">释放</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryMaterial, queryLinkMaterial, fullVehicleOut} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _queryMaterial (e) {
+				let res = await queryMaterial(e)
+				res.map(el => {
+					this.$set(el, 'value', el.material_id)
+					this.$set(el, 'text', el.material_name)
+				})
+				this.options1 = [...res]
+			},
+			selectChange (e) {
+			},
+			async _fullVehicleOut () {
+				this.disabled = true
+				if (this.index1 === '') {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await fullVehicleOut(this.index1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+</style>
diff --git a/pages/manage/back/in-storage.vue b/pages/manage/back/in-storage.vue
deleted file mode 100644
index 85e1afd..0000000
--- a/pages/manage/back/in-storage.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="入库"></nav-bar>
-		<view class="zd_content">
-			<view class="flow_wrapper" v-for="e in dataList" :key="e.point_code">
-				<view class="zd-row">
-					<view class="zd-col-24">
-						<view class="zd-row">
-							<view class="zd-col-2">
-								<view class="zd-row flow_icon_item_1">
-									<view class="iconfont icon_start_point">&#xe820;</view>
-								</view>
-							</view>
-							<view class="zd-col-22">
-								<view class="zd-row flow_start_item" @tap="checkcode(e)" :class="{'flow_start_item_checked': pkId === e.point_code}">
-									<view class="zd-col-12 pdl20 pdr20 font-size-1">{{e.point_code}}</view>
-									<view class="zd-col-12 pdr20 font-size-2">{{e.point_name}}</view>
-									<view v-show="pkId === e.point_code" class="iconfont icon_choosed">&#xe66b;</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar_new">
-			<button class="zd-col-11 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_callEmptyVehicle">呼叫空托</button>
-			<button class="zd-col-11 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_fullVehicleIn">满托入库</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPoints, callEmptyVehicle, fullVehicleIn} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				dataList: [],
-				disabled1: false,
-				disabled2: false,
-				pkId: ''
-			};
-		},
-		created () {
-			this._queryPoints()
-		},
-		methods: {
-			/** 初始化查询 */
-			async _queryPoints () {
-				let res = await queryPoints('1')
-				this.dataList = [...res]	
-			},
-			checkcode (e) {
-				this.pkId = this.pkId === e.point_code ? '' : e.point_code
-			},
-			/** 呼叫空托 */
-			async _callEmptyVehicle () {
-				this.disabled1 = true
-				if (!this.pkId) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await callEmptyVehicle(this.pkId)
-					this.disabled1 = false
-					this.pkId = ''
-					this._queryPoints()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			/** 满托入库 */
-			async _fullVehicleIn () {
-				this.disabled2 = true
-				if (!this.pkId) {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let res = await fullVehicleIn(this.pkId)
-					this.disabled2 = false
-					this.pkId = ''
-					this._queryPoints()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled2 = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/back/man-group-disk.vue b/pages/manage/back/man-group-disk.vue
deleted file mode 100644
index 1fc48c8..0000000
--- a/pages/manage/back/man-group-disk.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="人工组盘"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">载具类型</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">物料</span>
-					</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input filter_input_disabled pointer" v-model="val2" @tap="getMater">
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">物料数量</span>
-					</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val3">
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">当前点位</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<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" @click="toCheck(e)" :class="{'checked': e.checked}">
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.vehicle_type}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.point_code}}</td>
-								<td>{{e.material_qty}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar_new">
-			<view class="zd-col-4">
-				<view class="zd-row flexcol">
-					<view class="iconfont icon_unchecked mgb10" :class="{'icon_checked': isV}" @tap="isVirtual">&#xe66b;</view>
-					<view class="filter_input_wraper_inn_text">是否配盘</view>
-				</view>
-			</view>
-			<button class="zd-col-4 submit-button_new" @tap="clearUp">清空</button>
-			<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': !index1 || !val1 || !val3 || !index2 || !$store.getters.publicObj}" :disabled="disabled1" @tap="_groupManual">开始组盘</button>
-			<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': checkArr.length === 0}" :disabled="disabled2" @tap="_groupLink">开始配盘</button>
-			<button class="zd-col-4 submit-button_new" :class="{'btn-disabled': !val1 || (isV === true && printActive === false)}" :disabled="disabled3" @tap="_pdaPrintf">打印</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {getCLodop} from "@/utils/CLodopfuncs.js"
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPoints, getVehicleType, queryVehicleGroup, groupManual, groupLink, pdaPrintf} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				val1: '',
-				val2: '',
-				val3: '',
-				val4: '',
-				val5: '',
-				options2: [],
-				index2: '',
-				dataList: [],
-				isV: false,
-				disabled1: false,
-				disabled2: false,
-				disabled3: false,
-				checkArr: [],
-				printActive: false
-			};
-		},
-		created () {
-			this._getVehicleType()
-			this._queryPoints()
-			this._queryVehicleGroup()
-		},
-		destroyed () {
-			this.$store.dispatch('setPublicObj', '')
-		},
-		onShow() {
-			if (this.$store.getters.publicObj) {
-				this.val2 = this.$store.getters.publicObj.material_name
-				this.val4 = this.$store.getters.publicObj.material_id
-				this.val5 = this.$store.getters.publicObj.material_code
-			}
-		},
-		methods: {
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 载具类型下拉框 */
-			async _getVehicleType () {
-				let res = await getVehicleType()
-				this.options1 = [...res]
-			},
-			/** 点位下拉框 */
-			async _queryPoints () {
-				let res = await queryPoints('1')
-				res.map(el => {
-					this.$set(el, 'value', el.point_code)
-					this.$set(el, 'text', el.point_name)
-				})
-				this.options2 = [...res]	
-			},
-			/** grid */
-			async _queryVehicleGroup () {
-				let res = await queryVehicleGroup()
-				res.map(el => {
-					this.$set(el, 'checked', false)
-				})
-				this.dataList = [...res]	
-			},
-			getMater () {
-				uni.navigateTo({
-					url: '/pages/manage/search-mater-1'
-				})
-			},
-			toCheck (e) {
-				e.checked = !e.checked
-				this.checkArr = this.dataList.filter(i => { return i.checked === true })
-			},
-			isVirtual () {
-				this.isV = !this.isV
-			},
-			/** 开始组盘 */
-			async _groupManual () {
-				this.disabled1 = true
-				if (!this.index1 || !this.val1 || !this.val3 || !this.index2 || !this.$store.getters.publicObj) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await groupManual(this.index1, this.val1, this.index2, this.val4, this.val5, this.val3, this.isV)
-					this.disabled1 = false
-					this.checkArr = []
-					this._queryVehicleGroup()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			/** 开始配盘 */
-			async _groupLink () {
-				this.disabled2 = true
-				if (this.checkArr.length === 0) {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let arr = []
-					this.checkArr.map(el => {
-						if (el.checked) {
-							arr.push({group_id: el.group_id, vehicle_code: this.val1})
-						}
-					})
-					let res = await groupLink(arr)
-					this.disabled2 = false
-					this.checkArr = []
-					this.printActive = true
-					this._queryVehicleGroup()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled2 = false
-				}
-			},
-			clearUp () {
-				this.index1 = ''
-				this.index2 = ''
-				this.val1 = ''
-				this.val2 = ''
-				this.val3 = ''
-				this.printActive = false
-				this.$store.dispatch('setPublicObj', '')
-			},
-			/** 打印 */
-			async _pdaPrintf () {
-				this.disabled3 = true
-				if (!this.val1 || (this.isV === true && this.printActive === false)) {
-					this.disabled3 = false
-					return
-				}
-				try {
-					let res = await pdaPrintf(this.val1)
-					this.disabled3 = false
-					if (JSON.stringify(res) !== '{}') {
-						setTimeout(this.toPrint(res), 800)
-					}
-				} catch (e) {
-					this.disabled3 = false
-				}
-			},
-			toPrint (data) {
-				let iparr = this.$store.getters.printUrl.split(":")
-				let printUrl = iparr[1].slice(2)
-				let LODOP = getCLodop();
-				if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
-				    uni.showToast({
-						title: '当前配置ip：' + printUrl + '网络不通，请检查',
-						icon: 'none',
-						duration: 5000
-					})
-				    return
-				  }
-				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
-				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
-				// 更换为打印服务器ip 不需要加前缀
-				LODOP.PRINT_INIT(null, printUrl);
-				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
-				LODOP.SET_PRINTER_INDEX(-1);
-				// 设置打印纸大小
-				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '');
-				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1);
-				LODOP.SET_PRINT_STYLE('FontSize', 12);
-				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '32mm', '32mm', 'QRCode', data.vehicle_code + '##' + data.material_code + '##' + data.material_qty + '##' + data.pcsn + '##' + data.print_time);
-				LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '载具编码：' + data.vehicle_code);
-				LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '物料编码：' + data.material_code);
-				LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '物料名称：' + data.material_name);
-				LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '物料数量：' + data.material_qty);
-				LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '配盘批次：' + data.pcsn);
-				LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '打印时间：' + data.print_time);
-				LODOP.PRINT();  // 打印
-				// LODOP.PREVIEW()
-				uni.showToast({
-					title: '打印成功',
-					icon: 'none'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/back/out-storage.vue b/pages/manage/back/out-storage.vue
deleted file mode 100644
index 5e39f5a..0000000
--- a/pages/manage/back/out-storage.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="出库"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">物料</span>
-					</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input filter_input_disabled pointer" v-model="val1" @tap="getMater">
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">起点点位</span>
-					</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val2">
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">终点点位</span>
-					</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>点位编码</th>
-								<th>点位名称</th>
-								<th>载具编码</th>
-								<th>物料编码</th>
-								<th>物料名称</th>
-								<th>配盘批次</th>
-								<th>物料数量</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.group_id === pkId}">
-								<td>{{e.point_code}}</td>
-								<td>{{e.point_name}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.material_qty}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar_new">
-			<button class="zd-col-4 submit-button_new" @tap="clearUp">清空</button>
-			<button class="zd-col-6 submit-button_new" :class="{'btn-disabled': !val2 || !index1}" :disabled="disabled1" @tap="_fullVehicleOut">满托出库</button>
-			<button class="zd-col-6 submit-button_new" @tap="popUp(1)">余料回库</button>
-			<button class="zd-col-7 submit-button_new" @tap="popUp(2)">满托出库确认</button>
-		</view>
-		<view class="msg_wrapper" :class="show ? 'popshow' : 'pophide'">
-			<view class="msg_box">
-				<view class="filter_item">
-					<view class="filter_label">当前点位</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options1" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">载具编码</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val3"
-						/>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">物料数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val4">
-					</view>
-				</view>
-			</view>
-			<view class="zd-row msg_btns">
-				<button class="zd-col-9 msg_btn_cancle" @tap="toClear">清空</button>
-				<button class="zd-col-13 msg_btn" :class="{'btn-disabled': !index2 || !val3 || !val4}" :disabled="disabled2" @tap="toConfirm">确认</button>
-			</view>
-		</view>
-		<view v-if="show" class="msg_mask" @click.stop="show = false"></view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryLinkMaterial, queryPoints, fullVehicleOut, vehicleGoBack, fullVehicleOutConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				options1: [],
-				index1: '',
-				index2: '',
-				val3: '',
-				val4: '',
-				dataList: [],
-				disabled1: false,
-				disabled2: false,
-				disabled3: false,
-				pkId: '',
-				show: false,
-				type: ''
-			};
-		},
-		created () {
-			this._queryPoints()
-		},
-		destroyed () {
-			this.$store.dispatch('setPublicObj', '')
-		},
-		onShow() {
-			if (this.$store.getters.publicObj) {
-				this.val1 = this.$store.getters.publicObj.material_name
-				this._queryLinkMaterial(this.$store.getters.publicObj.material_id)
-			}
-		},
-		methods: {
-			getMater () {
-				uni.navigateTo({
-					url: '/pages/manage/search-mater-1'
-				})
-			},
-			/** grid查询 */
-			async _queryLinkMaterial (e) {
-				let res = await queryLinkMaterial(e)
-				this.dataList = [...res]
-			},
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 点位下拉框 */
-			async _queryPoints () {
-				let res = await queryPoints('2')
-				res.map(el => {
-					this.$set(el, 'value', el.point_code)
-					this.$set(el, 'text', el.point_name)
-				})
-				this.options1 = [...res]	
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.group_id ? '' : e.group_id
-				this.val2 = this.pkId === e.group_id ? e.point_code : ''
-			},
-			/** 满托出库 */
-			async _fullVehicleOut () {
-				this.disabled1 = true
-				if (!this.val2 || !this.index1) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await fullVehicleOut(this.val2, this.index1)
-					this.disabled1 = false
-					this._queryLinkMaterial(this.$store.getters.publicObj.material_id)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			
-			popUp (type) {
-				this.show = true
-				this.type = type
-			},
-			toClear () {
-				this.index2 = ''
-				this.val3 =''
-				this.val4 =''
-			},
-			toConfirm () {
-				if (this.type === 1) {
-					this._vehicleGoBack()
-				}
-				if (this.type === 2) {
-					this._fullVehicleOutConfirm()
-				}
-			},
-			/** 余料回库 */
-			async _vehicleGoBack () {
-				this.disabled2 = true
-				if (!this.index2 || !this.val3 || !this.val4) {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let res = await vehicleGoBack(this.index2, this.val3, this.val4)
-					this.disabled2 = false
-					this.toClear()
-					this.show = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled2 = false
-					this.toClear()
-					this.show = false
-				}
-			},
-			/** 满托出库确认 */
-			async _fullVehicleOutConfirm () {
-				this.disabled2 = true
-				if (!this.index2 || !this.val3 || !this.val4) {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let res = await fullVehicleOutConfirm(this.index2, this.val3, this.val4)
-					this.disabled2 = false
-					this.toClear()
-					this.show = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled2 = false
-					this.toClear()
-					this.show = false
-				}
-			},
-			clearUp () {
-				this.index1 = ''
-				this.val1 = ''
-				this.val2 = ''
-				this.dataList = []
-				this.pkId = ''
-				this.$store.dispatch('setPublicObj', '')
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/back/search-mater-1.vue b/pages/manage/back/search-mater-1.vue
deleted file mode 100644
index 83b3bd6..0000000
--- a/pages/manage/back/search-mater-1.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar :inner2="true" @goIn="goIn" title="物料查询"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>物料编码</th>
-								<th>物料名称</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.material_id === pkId}">
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar_new">
-			<button class="zd-col-24 submit-button_new" :class="{'btn-disabled': !pkId}" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryMaterial} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				dataList: [],
-				pkId: '',
-				pkObj: {}
-			};
-		},
-		created () {
-			this._getMaterial()
-		},
-		methods: {
-			handleChange (e) {
-				this._getMaterial(e)
-			},
-			async _getMaterial (e) {
-				let res = await queryMaterial(e)
-				this.dataList = [...res]
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.material_id ? '' : e.material_id
-				this.pkObj = this.pkId === e.material_id ? e : {}
-			},
-			toSure () {
-				if (!this.pkId) {
-					return
-				}
-				this.$store.dispatch('setPublicObj', this.pkObj)
-				this.goIn()
-				
-			},
-			goIn () {
-				uni.navigateBack()
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/back/search-mater.vue b/pages/manage/back/search-mater.vue
deleted file mode 100644
index 1975123..0000000
--- a/pages/manage/back/search-mater.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar :inner2="true" @goIn="goIn" title="物料查询"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">物料Id</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						@handleChange="handleChange"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>点位编码</th>
-								<th>点位名称</th>
-								<th>载具编码</th>
-								<th>物料编码</th>
-								<th>物料名称</th>
-								<th>配盘批次</th>
-								<th>物料数量</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.material_id === pkId}">
-								<td>{{e.point_code}}</td>
-								<td>{{e.point_name}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.material_qty}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar_new">
-			<button class="zd-col-11 submit-button_new" :class="{'btn-disabled': !pkId}" @tap="toSure">确认</button>
-			<button class="zd-col-11 submit-button_new" @tap="searchList">查询</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryLinkMaterial} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				dataList: [],
-				pkId: '',
-				pkObj: {}
-			};
-		},
-		methods: {
-			handleChange (e) {
-				this._getMaterial(e)
-			},
-			searchList () {
-				this._getMaterial(this.val1)
-			},
-			/** grid查询 */
-			async _getMaterial (e) {
-				let res = await queryLinkMaterial(e)
-				this.dataList = [...res]
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.material_id ? '' : e.material_id
-				this.pkObj = this.pkId === e.material_id ? e : {}
-			},
-			toSure () {
-				if (!this.pkId) {
-					return
-				}
-				this.$store.dispatch('setPublicObj', this.pkObj)
-				this.goIn()
-				
-			},
-			goIn () {
-				uni.navigateBack()
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/back/task-flow.vue b/pages/manage/back/task-flow.vue
deleted file mode 100644
index 88e71a6..0000000
--- a/pages/manage/back/task-flow.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="任务流转"></nav-bar>
-		<view class="zd_content">
-			<view class="flow_wrapper" v-for="e in dataList" :key="e.point_code">
-				<view class="zd-row">
-					<view class="zd-col-24">
-						<view class="zd-row">
-							<view class="zd-col-2">
-								<view class="zd-row flow_icon_item_1">
-									<view class="iconfont icon_start_point">&#xe820;</view>
-								</view>
-							</view>
-							<view class="zd-col-22">
-								<view class="zd-row flow_start_item" @tap="checkcode1(e)" :class="{'flow_start_item_checked': pkId1 === e.point_id}">
-									<view class="zd-col-8 pdl20 pdr20 font-size-1">{{e.point_code}}</view>
-									<view class="zd-col-16 pdr20 font-size-2">{{e.point_name}}</view>
-									<view v-show="pkId1 === e.point_code" class="iconfont icon_choosed">&#xe66b;</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-24">
-						<view class="zd-row flow_icon_item_2">
-							<view class="iconfont icon_vdash_line">&#xe603;</view>
-						</view>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-24">
-						<view class="zd-row flexstart">
-							<view class="zd-col-2">
-								<view class="zd-row flow_icon_item_1">
-									<view class="iconfont icon_start_point">&#xe61f;</view>
-								</view>
-							</view>
-							<view class="zd-col-22">
-								<view class="zd-row mgb10 flow_start_item" v-for="el in e.end_points" :key="el.point_code" @tap="checkcode2(el, e)" :class="{'flow_start_item_checked': pkId2 === el.point_id}">
-									<view class="zd-col-8 pdl20 pdr20 font-size-1">{{el.point_code}}</view>
-									<view class="zd-col-16 pdr20 font-size-2">{{el.point_name}}</view>
-									<view v-show="pkId2 === el.point_code" class="iconfont icon_choosed">&#xe66b;</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar_new">
-			<button class="zd-col-24 submit-button_new" :class="{'btn-disabled': !pkId1}" :disabled="disabled" @tap="toSure">生成任务</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryAllPoints, createP2pTask} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				dataList: [],
-				disabled: false,
-				pkId1: '',
-				pkId2: '',
-				pid1: '',
-				pid2: '',
-				pd2: ''
-			};
-		},
-		created () {
-			this._queryAllPoints()
-		},
-		methods: {
-			/** 初始化查询 */
-			async _queryAllPoints () {
-				let res = await queryAllPoints()
-				this.dataList = [...res]	
-			},
-			checkcode1 (e) {
-				if (this.pid2 !== '' && e.point_id !== this.pid2) {
-					this.pkId2 = ''
-					this.pid2 = ''
-					this.pd2 = ''
-				}
-				this.pkId1 = this.pkId1 === e.point_id ? '' : e.point_id
-				this.pid1 = this.pkId1 === e.point_id ? e.point_code : ''
-			},
-			checkcode2 (el, e) {
-				if (this.pkId1 !== '' && this.pkId1 !== e.point_id) {
-					return
-				}
-				this.pkId2 = this.pkId2 === el.point_id ? '' : el.point_id
-				this.pid2 = this.pkId2 === el.point_id ? e.point_id : ''
-				this.pd2 = this.pkId2 === el.point_id ? el.point_code : ''
-			},
-			/** 重新下发 */
-			async toSure () {
-				this.disabled = true
-				if (!this.pkId1) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await createP2pTask(this.pid1, this.pd2)
-					this.disabled = false
-					this.pkId1 = ''
-					this.pkId2 = ''
-					this.pid1 = ''
-					this.pid2 = ''
-					this.pd2 = ''
-					this._queryAllPoints()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/empty-tray-out.vue b/pages/manage/empty-tray-back.vue
similarity index 78%
rename from pages/manage/empty-tray-out.vue
rename to pages/manage/empty-tray-back.vue
index e076c27..b9e4674 100644
--- a/pages/manage/empty-tray-out.vue
+++ b/pages/manage/empty-tray-back.vue
@@ -4,6 +4,16 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">地面点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
 					<view class="zd-col-5">
 						<span class="filter_label">载具类型</span>
 					</view>
@@ -14,29 +24,11 @@
 					</view>
 					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
-				<!-- <view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">点位编码</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
-					</view>
-				</view> -->
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">点位编码</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-11 button-primary" :class="{'button-info': index1 === '' || !val1}" :disabled="disabled" @tap="_callEmptyVehicle">确认</button>
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': index1 === '' || !val1}" :disabled="disabled" @tap="_callEmptyVehicle">送回确认</button>
 		</view>
 	</view>
 </template>
@@ -64,9 +56,6 @@
 		onLoad (options) {
 			this.title = options.title
 		},
-		created () {
-			this._getVehicleType()
-		},
 		methods: {
 			/** 载具类型下拉框 */
 			async _getVehicleType () {
diff --git a/pages/manage/empty-tray-in.vue b/pages/manage/fill-tray.vue
similarity index 66%
rename from pages/manage/empty-tray-in.vue
rename to pages/manage/fill-tray.vue
index 354ac99..248f341 100644
--- a/pages/manage/empty-tray-in.vue
+++ b/pages/manage/fill-tray.vue
@@ -14,9 +14,9 @@
 					</view>
 					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
-				<view class="zd-row border-bottom">
+				<view class="zd-row">
 					<view class="zd-col-5">
-						<span class="filter_label">载具编码</span>
+						<span class="filter_label">当前点位</span>
 					</view>
 					<view class="zd-col-19">
 						<search-box
@@ -24,21 +24,12 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">点位编码</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
+				
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-11 button-primary" :class="{'button-info': index1 === '' || !val1 || !val2}" :disabled="disabled" @tap="_emptyInStore">确认</button>
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_unbindVehicle">补空确认</button>
 		</view>
 	</view>
 </template>
@@ -46,7 +37,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getVehicleType, emptyInStore} from '@/utils/getData2.js'
+	import {getVehicleType, bindVehicle, unbindVehicle} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -55,19 +46,15 @@
 		data() {
 			return {
 				title: '',
+				val1: '',
 				options1: [],
 				index1: '',
-				val1: '',
-				val2: '',
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
-		created () {
-			this._getVehicleType()
-		},
 		methods: {
 			/** 载具类型下拉框 */
 			async _getVehicleType () {
@@ -77,14 +64,14 @@
 			pickerChange (e) {
 				this.index1 = e.detail.value
 			},
-			async _emptyInStore () {
+			async _bindVehicle () {
 				this.disabled = true
-				if (this.index1 === '' || !this.val1  || !this.val2) {
-					this.disabled = false
+				if (!this.val1 || this.index1 === '') {
+					this.disabled1 = false
 					return
 				}
 				try {
-					let res = await emptyInStore(this.options1[this.index1].value, this.val1, this.val2)
+					let res = await bindVehicle(this.val1, this.options1[this.index1].value)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -97,7 +84,6 @@
 			clearUp () {
 				this.index1 = ''
 				this.val1 = ''
-				this.val2 = ''
 				this.disabled = false
 			}
 		}
diff --git a/pages/manage/fixed-point-task.vue b/pages/manage/fixed-point-task.vue
deleted file mode 100644
index 2cd6165..0000000
--- a/pages/manage/fixed-point-task.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">起点区域</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange1"></zxz-uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">起点点位</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">终点区域</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<zxz-uni-data-select v-model="index3" filterable :localdata="options3" @change="selectChange3"></zxz-uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">终点点位</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<zxz-uni-data-select v-model="index4" filterable :localdata="options4"></zxz-uni-data-select>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-11 button-primary" :class="{'button-info': !index2 || !index4}" :disabled="disabled" @tap="_taskConfirm">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryDevice, taskConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				options3: [],
-				index3: '',
-				options4: [],
-				index4: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._queryDevice()
-		},
-		methods: {
-			/** 点位下拉框 */
-			async _queryDevice () {
-				let res = await queryDevice()
-				res.map(el => {
-					this.$set(el, 'value', el.region_code)
-					this.$set(el, 'text', el.region_name)
-				})
-				this.options1 = [...res]
-				this.options3 = [...res]
-			},
-			selectChange1 (e) {
-				this.options2 = []
-				this.options1.map(el => {
-					if (el.value === e) {
-						this.options2 = [...el.deviceArr]
-					}
-				})
-				if (this.options2.length > 0) {
-					this.options2.map(ele => {
-						this.$set(ele, 'value', ele.point_code)
-						this.$set(ele, 'text', ele.point_name)
-					})
-				}
-			},
-			selectChange3 (e) {
-				this.options4 = []
-				this.options3.map(el => {
-					if (el.value === e) {
-						this.options4 = [...el.deviceArr]
-					}
-				})
-				if (this.options4.length > 0) {
-					this.options4.map(ele => {
-						this.$set(ele, 'value', ele.point_code)
-						this.$set(ele, 'text', ele.point_name)
-					})
-				}
-			},
-			async _taskConfirm () {
-				this.disabled = true
-				if (!this.index2 || this.index4 === '') {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await taskConfirm(this.index2, this.index4)
-					this.clearUp()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			clearUp () {
-				this.index1 = ''
-				this.index2 = ''
-				this.index3 = ''
-				this.index4 = ''
-				this.options2 = []
-				this.options4 = []
-				this.disabled = false
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/group-in-storage.vue b/pages/manage/group-in-storage.vue
index 420d538..c255fd9 100644
--- a/pages/manage/group-in-storage.vue
+++ b/pages/manage/group-in-storage.vue
@@ -3,17 +3,6 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">载具类型</span>
-					</view>
-					<view class="zd-col-17 filter_picker">
-						<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
-							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
-						</picker>
-					</view>
-					<uni-icons type="right" size="14" color="#999"></uni-icons>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
 						<span class="filter_label">载具编码</span>
@@ -26,10 +15,20 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
-						<span class="filter_label">物料</span>
+						<span class="filter_label">地面点位</span>
 					</view>
-					<view class="zd-col-19 filter_select">
-						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">订单编码</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="number" class="filter_input" v-model="val3">
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -37,25 +36,15 @@
 						<span class="filter_label">物料数量</span>
 					</view>
 					<view class="zd-col-19">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">当前点位</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val3"
-						/>
+						<input type="number" class="filter_input" v-model="val4">
 					</view>
 				</view>
 				<view class="zd-row">
 					<view class="zd-col-5">
-						<span class="filter_label">是否配盘</span>
+						<span class="filter_label">当前工序</span>
 					</view>
-					<view class="zd-col-19 zd-row jcflexend">
-						<switch :checked="isSwitchOn" color="#4e6ef2" style="transform:scale(0.7)" @change="switch1Change"/>
+					<view class="zd-col-19 filter_select">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
 			</view>
@@ -89,53 +78,16 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-4 button-primary" :class="{'button-info': index1 === '' || !val1 || !val3 || !index2 || !val2}" :disabled="disabled1" @tap="_groupManual">组盘</button>
-			<button class="zd-col-4 button-primary" @tap="_queryVehicleGroup">配盘</button>
-			<button class="zd-col-4 button-primary" :class="{'button-info': !pkId}" :disabled="disabled3" @tap="_pdaPrintf">打印</button>
-			<button class="zd-col-4 button-primary" :class="{'button-info': !pkId}" :disabled="disabled4" @tap="_fullVehicleIn">入库</button>
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_fullVehicleIn">入库确认</button>
 		</view>
-		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
-			<view class="msg_content">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>载具编码</th>
-								<th>载具类型</th>
-								<th>物料编码</th>
-								<th>物料名称</th>
-								<th>点位</th>
-								<th>物料数量</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="e in dataList1" :key="e.group_id" @click="toCheck(e)" :class="{'checked': e.checked}">
-								<td class="fontcol1">{{e.vehicle_code}}</td>
-								<td><view class="fontbg">{{e.vehicle_type}}</view></td>
-								<td class="fontcol2">{{e.material_code}}</td>
-								<td class="fontcol2">{{e.material_name}}</td>
-								<td>{{e.point_code}}</td>
-								<td>{{e.material_qty}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-			<view class="zd-row submit-bar">
-				<button class="zd-col-9 button-default" @tap.stop="show = false">取消</button>
-				<button class="zd-col-13 button-primary" :class="{'button-info': checkArr.length === 0}" :disabled="disabled2" @tap="_groupLink">确认</button>
-			</view>
-		</view>
-		<view v-if="show" class="msg_mask"></view>
 	</view>
 </template>
 
 <script>
-	import {getCLodop} from "@/utils/CLodopfuncs.js"
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getVehicleType, queryMaterial, queryExistGroup, groupManual, queryVehicleGroup, groupLink, pdaPrintf, fullVehicleIn} from '@/utils/getData2.js'
+	import {fullVehicleIn} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -146,202 +98,56 @@
 				title: '',
 				options1: [],
 				index1: '',
-				options2: [],
-				index2: '',
 				val1: '',
 				val2: '',
 				val3: '',
-				isSwitchOn: false,
+				val4: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {},
-				disabled1: false,
-				show: false,
-				dataList1: [],
-				checkArr: [],
-				disabled2: false,
-				disabled3: false,
-				disabled4: false
+				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
-		created () {
-			this._getVehicleType()
-			this._queryMaterial()
-			this._queryExistGroup()
-		},
 		methods: {
-			/** 载具类型下拉框 */
+			selectChange1(e) {
+				this.index1 = e
+			},
 			async _getVehicleType () {
 				let res = await getVehicleType()
 				this.options1 = [...res]
 			},
-			pickerChange (e) {
-				this.index1 = e.detail.value
-			},
-			/** 物料下拉框*/
-			async _queryMaterial (e) {
-				let res = await queryMaterial(e)
-				res.map(el => {
-					this.$set(el, 'value', el.material_id)
-					this.$set(el, 'text', el.material_name)
-				})
-				this.options2 = [...res]
-			},
-			/** 是否配盘 */
-			switch1Change: function (e) {
-				this.isSwitchOn = e.detail.value
-			},
-			/** 查询已配盘的组盘信息 */
-			async _queryExistGroup () {
-				let res = await queryExistGroup()
-				this.dataList = [...res]
-			},
-			/** 组盘 */
-			async _groupManual () {
-				this.disabled1 = true
-				if (this.index1 === '' || !this.val1 || !this.val3 || !this.index2 || !this.val2) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let code = ''
-					this.options2.map(el => {
-						if (el.value === this.index2) {
-							code = el.material_code
-						}
-					})
-					let res = await groupManual(this.options1[this.index1].value, this.val1, this.val3, this.index2, code, this.val2, this.isSwitchOn)
-					this.clearUp()
-					this._queryExistGroup()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
+			
 			clearUp () {
 				this.index1 = ''
 				this.val1 = ''
-				this.val3 = ''
-				this.index2 = ''
 				this.val2 = ''
-				this.isSwitchOn = false
-				this.disabled1 = false
-			},
-			/** 获取待配盘信息 */
-			async _queryVehicleGroup () {
-				this.dataList1 = []
-				this.checkArr = []
-				this.disabled2 = false
-				let res = await queryVehicleGroup()
-				res.map(el => {
-					this.$set(el, 'checked', false)
-				})
-				this.dataList1 = [...res]
-				this.show = true
+				this.val3 = ''
+				this.val4 = ''
+				this.disabled = false
 			},
 			toCheck (e) {
 				e.checked = !e.checked
 				this.checkArr = this.dataList1.filter(i => { return i.checked === true })
 			},
-			/** 配盘确定 */
-			async _groupLink () {
-				this.disabled2 = true
-				if (this.checkArr.length === 0) {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let res = await groupLink(this.checkArr)
-					this.disabled2 = false
-					this.show = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this._queryExistGroup()
-				} catch (e) {
-					this.disabled2 = false
-				}
-			},
 			toChose (e) {
 				this.pkId = this.pkId === e.point_code ? '' : e.point_code
 				this.pkObj = this.pkId === e.point_code ? e : {}
 			},
-			/**  打印 */
-			async _pdaPrintf () {
-				this.disabled3 = true
-				if (!this.pkId) {
-					this.disabled3 = false
-					return
-				}
-				try {
-					let res = await pdaPrintf(this.pkObj.vehicle_code)
-					this.disabled3 = false
-					this.pkId = ''
-					if (JSON.stringify(res) !== '{}') {
-						setTimeout(this.toPrint(res), 800)
-					}
-				} catch (e) {
-					this.disabled3 = false
-				}
-			},
-			toPrint (data) {
-				let iparr = this.$store.getters.printUrl.split(":")
-				let printUrl = iparr[1].slice(2)
-				let LODOP = getCLodop();
-				if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
-				    uni.showToast({
-						title: '当前配置ip：' + printUrl + '网络不通，请检查',
-						icon: 'none',
-						duration: 5000
-					})
-				    return
-				  }
-				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
-				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
-				// 更换为打印服务器ip 不需要加前缀
-				LODOP.PRINT_INIT(null, printUrl);
-				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
-				LODOP.SET_PRINTER_INDEX(-1);
-				// 设置打印纸大小
-				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '');
-				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1);
-				LODOP.SET_PRINT_STYLE('FontSize', 12);
-				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '32mm', '32mm', 'QRCode', data.vehicle_code + '##' + data.material_code + '##' + data.material_qty + '##' + data.pcsn + '##' + data.print_time);
-				LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '载具编码：' + data.vehicle_code);
-				LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '物料编码：' + data.material_code);
-				LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '物料名称：' + data.material_name);
-				LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '物料数量：' + data.material_qty);
-				LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '配盘批次：' + data.pcsn);
-				LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '打印时间：' + data.print_time);
-				LODOP.PRINT();  // 打印
-				// LODOP.PREVIEW()
-				uni.showToast({
-					title: '打印成功',
-					icon: 'none'
-				})
-			},
 			/**  入库 */
 			async _fullVehicleIn () {
-				this.disabled4 = true
+				this.disabled = true
 				if (!this.pkId) {
-					this.disabled4 = false
+					this.disabled = false
 					return
 				}
 				try {
 					let res = await fullVehicleIn(this.pkId)
-					this.disabled4 = false
-					this.pkId = ''
-					this._queryExistGroup()
+					this.clearUp()
 				} catch (e) {
-					this.disabled4 = false
+					this.disabled = false
 				}
 			}
 		}
diff --git a/pages/manage/mater-out-storage.vue b/pages/manage/mater-out-storage.vue
deleted file mode 100644
index 57d70bf..0000000
--- a/pages/manage/mater-out-storage.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">物料</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange"></zxz-uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">出库点位</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th class="fontcol1">点位编码</th>
-								<th>点位名称</th>
-								<th>载具编码</th>
-								<th>物料编码</th>
-								<th>物料名称</th>
-								<th>配盘批次</th>
-								<th>物料数量</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toChose(e)" :class="{'checked': e.point_code === pkId}">
-								<td class="fontcol1">{{e.point_code}}</td>
-								<td class="fontcol2">{{e.point_name}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.material_qty}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-11 button-primary" :class="{'button-info': !pkId || !val1}" :disabled="disabled" @tap="_fullVehicleOut">出库</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryMaterial, queryLinkMaterial, fullVehicleOut} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				options1: [],
-				index1: '',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._queryMaterial()
-		},
-		methods: {
-			/** 物料下拉框*/
-			async _queryMaterial (e) {
-				let res = await queryMaterial(e)
-				res.map(el => {
-					this.$set(el, 'value', el.material_id)
-					this.$set(el, 'text', el.material_name)
-				})
-				this.options1 = [...res]
-			},
-			selectChange (e) {
-				this._queryLinkMaterial(e)
-			},
-			/** grid */
-			async _queryLinkMaterial (e) {
-				let res = await queryLinkMaterial(e)
-				this.dataList = [...res]
-			},
-			toChose (e) {
-				this.pkId = this.pkId === e.point_code ? '' : e.point_code
-			},
-			async _fullVehicleOut () {
-				this.disabled = true
-				if (!this.pkId || !this.val1) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await fullVehicleOut(this.pkId, this.val1)
-					this.pkId = ''
-					this.disabled = false
-					this._queryLinkMaterial(this.index1)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			clearUp () {
-				this.index1 = ''
-				this.dataList = []
-				this.val1 = ''
-				this.disabled = false
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-@import '../../common/style/mixin.styl';
-</style>
diff --git a/pages/manage/out-storage-confirm.vue b/pages/manage/out-storage-confirm.vue
deleted file mode 100644
index b8a5ae2..0000000
--- a/pages/manage/out-storage-confirm.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val1"
-						@handleChange="handleChange"
-						/>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">出库点位</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-5">
-						<span class="filter_label">物料编码</span>
-					</view>
-					<view class="zd-col-19">
-						<input type="text" class="filter_input" v-model="data.material_code" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-5">
-						<span class="filter_label">物料名称</span>
-					</view>
-					<view class="zd-col-19">
-						<input type="text" class="filter_input" v-model="data.material_name" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-5">
-						<span class="filter_label">配盘批次</span>
-					</view>
-					<view class="zd-col-19">
-						<input type="text" class="filter_input" v-model="data.pcsn" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-5">
-						<span class="filter_label">物料数量</span>
-					</view>
-					<view class="zd-col-19">
-						<input type="text" class="filter_input" v-model="val5" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">出库数量</span>
-					</view>
-					<view class="zd-col-19">
-						<input type="number" class="filter_input" v-model="val3">
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">剩余数量</span>
-					</view>
-					<view class="zd-col-19">
-						<input type="number" class="filter_input" v-model="val4">
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !val2 || val4 === ''}" :disabled="disabled1" @tap="_fullVehicleOutConfirm">出库确认</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !val2 || val4 === ''}" :disabled="disabled2" @tap="_vehicleGoBack">回库</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryGroupInfoByVehicle, fullVehicleOutConfirm, vehicleGoBack} from '@/utils/getData2.js'
-	import {accSubtract} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				val3: '',
-				val4: '',
-				val5: '',
-				data: {},
-				title: '',
-				disabled1: false,
-				disabled2: false
-			};
-		},
-		watch: {
-			val3 () {
-				if (this.val5 !== '') {
-					this.val4 =  accSubtract(this.val5, this.val3)
-				}
-			},
-			val4 () {
-				if (this.val5 !== '') {
-					this.val3 =  accSubtract(this.val5, this.val4)
-				}
-			}
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			handleChange (e) {
-				this._queryGroupInfoByVehicle(e)
-			},
-			async _queryGroupInfoByVehicle (e) {
-				let res = await queryGroupInfoByVehicle(e)
-				this.data = res
-				this.val2 = this.data.point_code
-				if (this.data.material_qty) {
-					this.val5 = this.data.material_qty
-				}
-			},
-			async _fullVehicleOutConfirm () {
-				this.disabled1 = true
-				if (!this.val1  || !this.val2  || this.val4 === '') {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await fullVehicleOutConfirm(this.val2, this.val1, this.val4)
-					this.disabled1 = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			async _vehicleGoBack () {
-				this.disabled2 = true
-				if (!this.val1  || !this.val2  || this.val4 === '') {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let res = await vehicleGoBack(this.val2, this.val1, this.val4)
-					this.disabled2 = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled2 = false
-				}
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.val3 = ''
-				this.data = {}
-				this.disabled1 = false
-				this.disabled2 = false
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/point-update.vue b/pages/manage/point-update.vue
deleted file mode 100644
index 332894f..0000000
--- a/pages/manage/point-update.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">当前点位</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">载具类型</span>
-					</view>
-					<view class="zd-col-17 filter_picker">
-						<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
-							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
-						</picker>
-					</view>
-					<uni-icons type="right" size="14" color="#999"></uni-icons>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': index1 === '' || !val1  || !val2}" :disabled="disabled1" @tap="_bindVehicle">绑定</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="_unbindVehicle">解绑</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getVehicleType, bindVehicle, unbindVehicle} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				options1: [],
-				index1: '',
-				disabled1: false,
-				disabled2: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._getVehicleType()
-		},
-		methods: {
-			/** 载具类型下拉框 */
-			async _getVehicleType () {
-				let res = await getVehicleType()
-				this.options1 = [...res]
-			},
-			pickerChange (e) {
-				this.index1 = e.detail.value
-			},
-			async _bindVehicle () {
-				this.disabled1 = true
-				if (!this.val1 || this.index1 === '' || !this.val2) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await bindVehicle(this.val1, this.options1[this.index1].value, this.val2)
-					this.clearUp()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			async _unbindVehicle () {
-				this.disabled2 = true
-				if (!this.val1) {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let type = ''
-					if (this.index1 !== '') {
-						type = this.options1[this.index1].value
-					}
-					let res = await unbindVehicle(this.val1, type, this.val2)
-					this.clearUp()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled2 = false
-				}
-			},
-			clearUp () {
-				this.index1 = ''
-				this.val1 = ''
-				this.val2 = ''
-				this.disabled1 = false
-				this.disabled2 = false
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/produce-cut.vue b/pages/manage/produce-cut.vue
deleted file mode 100644
index 05dbb80..0000000
--- a/pages/manage/produce-cut.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">当前点位</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val1"
-						@handleChange="handleChange"
-						/>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">下一点位</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-11 button-primary" :class="{'button-info': index1 === '' || !val1}" :disabled="disabled" @tap="_createP2pTask">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryEndPointsByStart, createP2pTask} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				options1: [],
-				index1: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			handleChange (e) {
-				this._queryEndPointsByStart(e)
-			},
-			/** 下一点位下拉框 */
-			async _queryEndPointsByStart (e) {
-				let res = await queryEndPointsByStart(e)
-				if (res.length > 0) {
-					res.map(el => {
-						this.$set(el, 'value', el.point_code2)
-						this.$set(el, 'text', el.point_name)
-					})
-					this.options1 = [...res]
-					this.index1 = this.options1[0].value
-				}
-			},
-			async _createP2pTask () {
-				this.disabled = true
-				if (!this.val1 || this.index1 === '') {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await createP2pTask(this.val1, this.index1)
-					this.clearUp()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			clearUp () {
-				this.index1 = ''
-				this.options1 = []
-				this.val1 = ''
-				this.disabled = false
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/manage/task-manage.vue b/pages/manage/task-manage.vue
deleted file mode 100644
index aa508be..0000000
--- a/pages/manage/task-manage.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar :title="title" :searchActive="true" @toSearch="toSearch"></nav-bar>
-		<view class="zd_content pdt0">
-			<view class="filter_wrapper">
-				<view class="zd-row">
-					<view class="zd-col-8 font-style-1" v-for="e in state" :key="e.id" @tap="changeTab(e)">
-						<view class="font-style-1" :class="{'font-style-2': e.id === tab}">{{e.text}}</view>
-						<view class="tab-line" :class="{'tab-line_active': e.id === tab}"></view>
-					</view>
-				</view>
-			</view>
-			<view class="item-wrapper">
-				<view class="item-wrap" v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{isChecked: pkId === e.inst_uuid}">
-					<view class="zd-row mgb10">
-						<view class="item-font-1">{{e.task_no}}&nbsp;&#124;&nbsp;{{['就绪', '执行中', '完成'][Number(e.inst_status)]}}</view>
-					</view>
-					<view class="zd-row">
-						<view class="zd-col-16">
-							<view class="item-font-2 mgb10">{{e.create_time}}&nbsp;&#124;&nbsp;{{['请求取货', '取货完成', '请求放货', '放货完成'][Number(e.inst_step) - 1]}}</view>
-							<view class="zd-row mgb10">
-								<view class="item-font-3">载具号：</view>
-								<view class="item-font-4">{{e.carrier}}</view>
-							</view>
-							<view class="zd-row mgb10">
-								<view class="item-font-3">指令号：</view>
-								<view class="item-font-4">{{e.instruction_code}}</view>
-							</view>
-							<view class="zd-row mgb10">
-								<view class="item-font-3">车号：</view>
-								<view class="item-font-4">{{e.carno}}</view>
-							</view>
-						</view>
-						<view class="zd-col-8">
-							<view class="item-font-5">{{e.priority}}</view>
-							<view class="item-font-8">优先级</view>
-						</view>
-					</view>
-					<view class="zd-row">
-						<view class="item-font-3">设备：</view>
-						<view class="item-font-6">{{e.start_devicecode}}</view>
-						<view class="item-font-7">&ndash;</view>
-						<view class="item-font-6">{{e.next_devicecode}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_pdaInst('1')">指令撤销</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_pdaInst('2')">重新下发</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_pdaInst('3')">强制完成</button>
-		</view>
-		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
-			<view class="msg_content">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">关键字</span>
-					</view>
-					<view class="zd-col-19">
-						<input type="text" class="filter_input" v-model="val1">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">起始设备</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">目标设备</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<search-box
-						v-model="val3"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="zd-row submit-bar">
-				<button class="zd-col-7 button-default" @tap.stop="show = false">取消</button>
-				<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
-				<button class="zd-col-7 button-primary" @tap="_pdaInsts">查询</button>
-			</view>
-		</view>
-		<view v-if="show" class="msg_mask"></view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {pdaInsts, pdaInst} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				show: false,
-				state: [{id:'-1', text: '全部'}, {id:'0', text: '就绪'}, {id:'1', text: '执行中'}, {id:'2', text: '完成'}],
-				tab: '-1',
-				title: '',
-				val1: '',
-				val2: '',
-				val3: '',
-				data: [],
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._pdaInsts()
-		},
-		methods: {
-			toSearch () {
-				this.show = true
-				this.tab = '-1'
-			},
-			async _pdaInsts () {
-				this.show = false
-				let res = await pdaInsts(this.val1, this.val2, this.val3)
-				if (res.code === '1') {
-					this.data = [...res.result]
-					this.dataList = [...this.data]
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			},
-			changeTab (e) {
-				this.tab = e.id
-				if (e.id !== '-1') {
-					let arr = this.data.filter(el => {return el.inst_status === e.id})
-					this.dataList = [...arr]
-				} else {
-					this.dataList = [...this.data]
-				}
-			},
-			async _pdaInst (type) {
-				this.disabled = true
-				if (!this.pkId) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await pdaInst(type, this.pkId)
-					this.disabled = false
-					this.tab = '-1'
-					this._pdaInsts()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.val3 = ''
-				this.pkId = ''
-				this.disabled = false
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.inst_uuid ? '' : e.inst_uuid
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png
index 450da60d94f3a4f932d0cf2c25f581f68a4ee164..4b8ce5cdf3e29b67e8fd267d69a68cde4b434284 100644
GIT binary patch
literal 3276
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
F^glh{Q{(^u

literal 1814
zcmaJ?X;2eq7>*T@U{MaM1<}L+7E!WE2#}<tn2>N(6NI23(a{_W1jz1^Y)rtSP5|pM
zAdaY`MMNkl?UWHG76<Su2!g|<NNvCh6%i2u1x00$?jmS^6nDPe{l0hJ=XtMZXAf)?
z2iaIVSrZ5Zn~-2ZIQEXlZ!1ge$vV&b0(&{4!YEV%$Dn$d1|;y5upA_ZsAaKWI4Dyl
zC)I;~1j1Z*RYVjTCECDIz-p=t_n{ip2!<vQ{QM1wOpyShWH}hCg1D5S%4-y|O39@}
zdW&cxBmj(41*d30Ns2f^k&>WbD=Gfpk^KxDj6e;dGO|IP2x&P6E@g_BgY9uMKp{`L
zpb1>choquJ8_5B%1|)k^eLNL(FBaLCO{IIYSq$b{GJ{6<0cdQ1&h(_wIW#thMkh~S
z6fBxX8N&$|1Ww1oPFzYHiXt2U(ChV7y%!bM!~%3Sn+?zy0E6L)d3b7*Ayj7YgtRU*
z3<6NA(5Mhp1w&+<Q6`6VD3^j|`k@3h@{tzOPPYkb7+{bg0G&$1OPX;Mi9YYDR)6%?
zqT%4DeE*kN8<C8FKscy{bs7aWxEL2a6v7G6fHD-;M8I(3OcyuC!6>YagAsB-0NyoU
zvb#v8P(iqH^%P1Z;)Fn2R0b))5CNBh@laJNC5O)t_zIXzUVuR8MW+i{Y%gyX%UkHf
zr?dDBA3kdaD}WU`H3*?ISmh@ye^x9m2sMI57JwSnPEZ-Bfz{-x!a1thb79TOH;q-!
zo(p?cEPy2g;N$(zxMxh5hVbo2@nVOM@&_SI^BPRthe?CWux}<kM8JzMm<Mv#2S<cC
z*ETznc%??4-hu(1x;A%l+Gd{okoEU>^8^;MEn+^UjlnA-r{6M<Mmuh{_M}9c>Q`8@
zbAtJch=pcTwtL|z=%K3VUN`gV&^_(*@vh3)-aUidv8JIscHSg6?M{+2?=2A0Vj*f-
z%yVFVSVH_bwd`=qYFj2xVlm-wq&A#j2{W?`qSJfqbL@){rF$4D{9eO>KVJ?dv}K?V
zkSiN%I#V_kyZw{Z_M#{Cfe*U1;)(6xZb-_=dbBIdr(vYLbezcP8OijUb0$NZ@&5er
z)izCO($g+r(T#!DjJFGrW%H4PYs>2@iiF&h9>dDN^PwU?z1QIUER+Px-EzU2!Rook
zM|*X{2Y(*B-Nm@<$;w|a!f4eM1e)ekmz-|S?V;CfxwiB7b-<6~qr=_5GyyHUGg~XW
z5?$I|SLiyJH<N81(&Y2R==i=Jd#Sf1%U@r%OMMm@da~F_Qqym|Q+TNRg59?+EA*2W
zZATZp$+BCMRPgxMG(ttYVUl<?K8e~&bGTxbwj8<8U+)%Z+JfG^D*dVKlF47ts!G?h
z>Kc}IbQU(2CEG&8b^AKADMv~!IiRjpRvixlO+vrSR3f3TGNnq~KIdGq{A}h(Um;TK
z|9q+NWnJT!v0>s(B^8!BUhl9Esni(y*D+(zA46r0j+P#%)7n6SG|zar?Lc?xJ5bvZ
z-cj4<Odrch*cB6u&&UM!-)$CKnS*pU5=`S(W>U$#wBLran^?X#&JfMg)Qs}|HFG^8
z<KNu3oOF$YN2TXpH%r>Mdl%W8e8bl~Ew4L&ZB<*p4KH;4iSD}&_lI0Nc`cHoPD>Vs
zBHLeGj{%%r`s(W^0>%{fbw8x}R+ES+a;LWI#SGne{^8}6z8A4ye>HqtWooq<TG>~&
z$>!lm{^^BW>B_#vDQ;EUwkKXxRf)^3Oz)m|2wldtMeQTzAU5<(m4|Svr$Fg|_QR2n
z-F5M=>40$S#QuxNPM*~_IJ@Q9Wj}k8w#T?C?qELg6eSMZcyyiYHgGKb>GEYn^R8`O
zEj+yV(VSP%!k16W?a&Eli)}EeFRIxsajg0Z;&&Z+^v-MGXrnr^Dn4hjKX#wsvqHz!
fFR@UUytkqenyVd-?XgQQ#s5?xLb0Hfzr*-1fS}Bf

diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png
deleted file mode 100644
index 4b8ce5cdf3e29b67e8fd267d69a68cde4b434284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3276
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
F^glh{Q{(^u

diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png
index 6417a79f0e56715159c4beb35362b8c1c2b30e6b..18a06e7db227e563c0739b88f0fc96e0ffd541bd 100644
GIT binary patch
delta 3097
zcmV+!4CeFA44oK|BYz9zNkl<Zc%1E=f2f~T9mijvug>jG?GAEfNc77;3?wJEtt=y@
zRMsq*Q^ArT$`Uln2&F*nk3c0+6e_VF5Gpy-U~GshT`eoLKe{j|7Be+0g%&u<xx3B#
z>5u0*=X^froagS|?|tr_!t;iEpXYmiJ?Fg7=e*D7bH2~LFn?gcfB^#r3>YwAz<>b*
z1`HT5V8DO@0|pEjFkpU=aVn{5`f#U!w9Sb6CdK?9DN8gJ5N+zmy!KvQeE}{)xE^6G
z$Ww^k0rHzBU(&P1Jlpmme_k^ZxZ=>f#x61zWsJtERiGtKTZY`=Lbifxdxb<w&P-cQ
z6olh}&jM4xV}HOWQCS6S1lb8Z18fEz#b?ByvU{nY;gRE!HV%3qI<w&7vrkF{YsQEB
zuoC1t(7nL@C?7}-X{rxvfro)Tz?V^(h_h^0om3_he3?Z?4@9fEww74*KR54|jMAV^
zLAeFwAE0-m@-AQ9TBNIdI`Bh;=TN={y2?pVAT%0+n19bpgZ?Z!SdE(A$2l;XjI><a
z!SilZ?g4oL;b!2iB@45#l8Aph!goPl1nvOd>E}3;7F{}~d$edMmS&#pstLeZC=UR8
zL9Yc}8FjvBF4uOlYpd-|*%N{5QJw{U2Ao;#$D7ikfhxg;4lBR~G@IKLa3yeD;h9(s
zF9@~GnSV^H#Z8%Iz*Qi-f$gY#Y)RQQ=+B}H9kfLxJZm%X48jw@#kstv8)@nk3&fBa
zrQXbB^e#2)f&#Ju^tYf-BWwajZ?er0+y)c%HxMr?5WN~@5AZO^+PbCMwyYaC%Oh)D
zh<dGA**G)nKpp}9ipZDPvV8emN4XI65U`9)uzz3z7GV`|4Z>FuPEAki(pYmHRb0eT
zUe<UHuD-y?^&^$92Q@DPcO(3O%cfsB+StbpSb8AZEazq*ry+a|_zG~6CnEU4_L}FD
zh{_3!QqhuT2VG1~7IB95i;0QX|AE|#=v{1{ez9xp$B^hz7})zkzKQTTU|DrQkszC%
zTYsi4Qz53dDxB43qjTl*iLFeiau|^Z5xt#Dr~i_V{n!zGmz)dS0CEYa_;ZWwNzU@y
z#3J30TeG~l8pw!~)NWNK!u@Pz@HfIXgxlD3@Tr)y<V4>o7Xmi{A90-yOEzwbIdMnP
zXiH>a(YCHu^0TtB?QC*#1ISle$Vlz}5r4RqO$WCwEzx)IJ%n$h4&|F+O@G6+lAljP
z2;)a>S%hMxSdDg8Zri~)8|L|4(!p$b3drqp>GTcr<qO7j?;^>jLoUF`NOs6I8guBT
z#+4Qy2?p}5?ASJu6u^jS(^+rU&!U6IEwxFh>~*yf%>~DgRVxtTMj}~006z!zbbk^a
zND;mWoaQXDY2^37uU(re$vo0?HUj6kiEDoC1NlBun_btHGZ3yQ$5<4csEuSU7?0=x
zp|QeT7D9q@8^V+++@@#RimU-WEmSfYKWTr=GtC4AG?spj(~4%o{s7z@3n|Sc#h?bb
zd>XbaUjuT*QO{@=aDF|mbl?to;(x$8c5y8#XE1W$!fj@Xa%%3ySM`S=Ho-`lni+Pd
zirIaTF16*x$G9Q*zx-~a-by00X+K(iF3LGHw;GAX3lnxFO5IgcNrQ$5!i|gPK4a2N
zT6)IcDxIDa#+8nbgMJ=3(strTkmZH0sa%V&3-DyS4T@zTXF0+`WT;%(4u4dWl@{VT
zLimJfue}Ng9|EocUTe~F7X;X{9EA05bYWtI!=Mkg<@W(Uo+Cd6#uA-MWcUg&8CR>d
zN+%=6gCHY3o@GcSE!53|4SOu=+`a7CBlE$XgBaJ5(0AJp-Or`dtL)g1-IufBq|Uir
zYVz{3A-l_sYTN1>kKGH3%71G5W3vsBR&#B-lcVa&Sr8UZbm*+(xx<wT1jjSwTn9tC
zB%j(>uI~l0Znn|Iq<l~4ATabj_~Wyl)6Ne)9sJvkkq&QzmS8btnE^*D7gN^eRmdqO
zLbD0a>jw`hSiF|)h@GJREP7#nG-RFxrPanV>a8rKcNo7*v$}rN{(rQ;Y;j8}81Ey~
z^tj&!*YS-c9l?@jlMLr48_UvEJ>}!A5nHCHU|{7)J$W5Pi|#?{-y2Rk!m_j*OTo9z
zQ?Je8YB$5#jMvIfjm&(x*Z2yPW@RQ^?dJZ5k`6M0#gXt5a41QJb*l`NbW)c)6LF)<
z*q@7(%<4RdZQ}&s9e+i|{tUVgjRqI>DaMVH4Ioo-K#sUrIJ=dSnCds(;w>^ZsW>aP
zt14)<4O}jthKE<I0sV8T=yuUw(1UbXE6hfoZ(?x*a{t=og-z2vBNQ?uSZ60pw(~5C
zj@G>$+n?Z4I%DVuJxE6dc0<c|e4A;{j)BfVK`7JnqR#v2aDQQnl@+sI2EJ3NcCdSp
z^FzNxtC&rsYcr|ntkv&)62NG<sbiap9tnPp7T$&U`eA}En|>L%WiCS;7yW2-uDJ@8
z^Nw$$awVcCHvV&NSrs|4_nJ?fzJ|&#5N;yuq9+@V1dJ3&xL*yUM^Rl5+=Ox~4|Tjh
z^Sap#dywj}gnuae790qNN|_dmoQ*Pta2~?0?)N#`Uok4H<mbf4mB2=X?EsuSViuxT
zqdZA?;ZZq)auP6I9b^a5a@FBkx#>dBFFD#YvA1sn%!Z|AGAeDw&8hN?a;2=ELnl{*
zBN^a1Y9!A9Gd=osEqZ$Q4le<vC2R+tPKiQ1ydkR>BY(%>&Ey`4(RF1Cc%;$Z&c!*2
z>JH#cGhZ(O8=Th?J(tD7!Zq4zppyb~RSqJYi^zLHPl{wa&%th_?dPcVMgo${_$tD)
zz>Ig@93~NVpsX?O%|75FU~eonGl$@3f#|{Os8~VRxLp5b2GzaJ4YS{9NB`JPSRoT6
z(wQad1Akx=WCzN+XsyaVns>8zr$;WH6<hS=-q`>lxKQMly&hyU=rU)WHqL<Dvq+gX
z;%ipW5k$5EyDBlrB+3rZb;&D|eTZIwvfKIYON5??&Lb+xvrk8K7s3gUWyd=C$aAx`
z9!r#%uLI{aS{)l*2|R|dE`EUk`=BNH7-13oXn#tdSNI@sLbAqCB?Km!zZ>6DvT61?
zgf>RNT7;=KVI|5o;KOOt6j1#U@V@qE92@|4v4BXir_C@AkHuTK@;gNLBQohDMtjvt
zT7Db-^DrT=0#794m-|7_ckgaA^>1_&>K2bl56?&|!KOdOjGQ+|Rtog=4NKPhNPfgW
zfq%0=F9s%@Mca2MtXx<NR?Mauy^(3)ap3RfCC3fv+mp7U`vSIe5IDEgxt0=!_fcSi
z@an=m(St=>vNDpKk;)6G-s=aDTdip)cNf*%<UVuSC?5d6kd!PCm=T$83Dq~2Ap0_7
zJ31c8uvn*e7I78p3Xrpb<z5P`$70BJq<@EYoK+s8`SZC0W<suM&NH~gMU|p=qHK*#
z2DdIsoH#pieQzfCzrfT&!n^*64!&w0yZ|U~L3kR`GZJz6N^lJ&_s=HBYm|iN5Y__!
zX|4Pa=;rpY>5@pOaxKV{sBY_Ryz@j4FVM7Ct8XDOS?5J4XQcmrU@WzhO{1@c_kS1b
zya)J9W2LdcA%x8+kDIc~K)28YD~0#D6zJ*8S*q@{A^&+3I{QpVqLThzTXLyri%2db
z&o}M3haW<86X;IU_yn+xK=u-|-B-Z!8Y+`1BFtPhkw1Z6jdD57ON}WzzW7-44r*kC
zO-+s<{1SMwBhotnvJu#Zv@W0MM1SjNZ=^ZRtE|YyK~LX;>kGiCZpk|fSAhEv?kjfn
z7@Sy_uC?m0QPrNAyI(cyhXbGu+35N0ql0CC3fLJ-hPD0ryaqpK^!2ykTawe?wIq!@
z7XpgtOOw)tM6UHfY_w<t7u$Xv2T<7v?d!u0CV+=%{wUw$xW$o_zRsiX0e|^bvHoHl
zQVBvrzGM}m`z2Yrt)Gz*t-BKkKt2sTW9puQvNAr;{wxC7J)L!M80F$t6VGjZW`KV;
zg<N#tE!KVso6CXov15f)znG|5u^-_=RDTMrr}@Vz`{!JHz<>b*1`HT5V8DO@0|pEj
nFkrxd0RsjM7%*VK6661|cM^Ji9-e4O00000NkvXXu0mjfw&>)}

literal 1613
zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%o>>?5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNY@uLosb^?v
zX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*8A=6l&%Q8or6i
znRy^VO|ULsUn|eN;*!L?<Wx@=TP2`5dYPFiR?bcaM$WDVW=@W-#)gKj7LG>FCYC0~
z#zrP?F3y$~CNRA&`N^fZsd*(Zy(tL2<~a3&5=3qR&}Ns^qRg_?6t|-MTm`Vltuk@D
z#RR8$P`xR*-C~MUuRhQ*`k?4Vif)(?Fb#p2@Wcz`z>|M!9x%-p0TcJKqp>p?7?^f@
zx;TbZ+<J5OythcA4BLnAb7Peal}_=^YkFn>Vp6+?c7CNtr$WaE0g0=sDoQW1TuVA!
zT!YSRzOk}dATmUtgvX|vrD}z<Ym(u|Z+mucKC|s==IptZ_iFe3Ft9IA|9<$5^?U1G
z8FP!>rq;SD32a#q+9U=cye<G)Kq8ED*MiWzZ=7t$=NO9FZ!`LMx%tGT-ZOH)e^&`#
zowoSa9`EZv-v;iAPp#Fg^|`X)uAAOneWUs_*X8wV=X4wH?W;}8zP(QFzxly4vnxb@
zzxn+8r_?*$+jka7pV~hmGo`-Ke;xY?<CNZ=FLyM25&aXqhgmW`Z}E4f@1C>HFs5{f
z-co+Aw#&}erEHVqe3x^ROIfNWSo>U<dqO00eRfKX<-63zeXTMIt?Rx_Qj0$#+xpIZ
zzFcwawkp9IAG>)LEqiozzD%C|O`1(dd}izVFH?EFFE11-QTT3k!Ohy6uOY5oGxU8m
zPrr=r`IkLmK&dSYSl0pxU?7wjZ|#aPlf2K8RsO>NgkTDjWup$a)$FSN8jok@6N7bb
z<XkvD!MpUd$&H@eFD%Mt+3TD6X78+izR^8$!_D6pzfX|nxuM7tk!PIHZe*lmQ|96P
z!6|wBqw=@iCsvE?Tb}nMnfcr0CH!(aU&^282tEHHXFmD*hI!A`EnYJpw^Y8K#a*a4
z|6=S3(<hbO_b+pOTAa7D#l~xy<MxYd|2+P(n^)YW-@1QJ;Cf~2Cw(kGV|IVB`s8r0
zO=rfdaE&YddE!q57HCemxiE9W%!Ml_L@s<eL2}`8$%&E+?;9!^JN*uPmY8BKZ1lL{
zX#LV3rk_M_9{qAiQol{r>`8!I8!*D7K(QWmLCcXl>cYY6=XK`qxmhjy@0edb!wKmV
zr}wY<-&FHYo_)hFalb4p7EpM>0u7#W^4|YaJ-{INq2Y!8o-Lq?gTd3)&t;ucLK6Vv
Cv27>-

diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
deleted file mode 100644
index 30c871f3c82ecc4e9bc9851577dc0b125a22aaa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2390
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

diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
deleted file mode 100644
index 44fa467c97507a2c7fd0ce2c3e85e16d8b9ec273..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3101
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

diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
deleted file mode 100644
index ab42ca3b85373546cb4034a8aaffe47af49e9640..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2265
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
G-2VV-b-LaF

diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
deleted file mode 100644
index ee6ef0880e4e51db9cde6a829c4a186ac511b5fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2456
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