From bc29ddb26f9447537bf98ef94b9e2ac9ad4f15f6 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 16 Aug 2024 09:29:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=93=8D=E6=8E=A73=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/SearchBox.vue                      |   2 +-
 pages.json                                    |  26 +-
 pages/common/mater-list.vue                   | 148 ++++++++++++
 pages/entry/mater-group-to-store.vue          | 222 +++++-------------
 pages/home/home.vue                           |   5 +-
 .../change-mode.vue => mode/command.vue}      |  42 +---
 pages/mode/pick.vue                           |  92 ++++++++
 pages/mode/switch-in-out.vue                  |  92 ++++++++
 static/image/menu/RF07.png                    | Bin 0 -> 2668 bytes
 9 files changed, 425 insertions(+), 204 deletions(-)
 create mode 100644 pages/common/mater-list.vue
 rename pages/{entry/change-mode.vue => mode/command.vue} (61%)
 create mode 100644 pages/mode/pick.vue
 create mode 100644 pages/mode/switch-in-out.vue
 create mode 100644 static/image/menu/RF07.png

diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 24deec5..71fa162 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -10,7 +10,7 @@
 		@blur="handleBlur"
 		@confirm="handleSend">
 		<view class="zd-row buttons_wraper">
-			<uni-icons v-show="value.length" class="pdr10" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
+			<uni-icons v-show="value !== '' && value !== null && value !== undefined" class="pdr10" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
 			<uni-icons type="scan" size="22" :color="focusState ? '#ff6a00' : '#4e6ef2'" @tap="focusState=true"></uni-icons>
 		</view>
 	</view>
diff --git a/pages.json b/pages.json
index f99307d..dfbdf4d 100644
--- a/pages.json
+++ b/pages.json
@@ -183,6 +183,22 @@
         ,{
             "path" : "pages/entry/mater-group-to-store",
             "style" :                                                                                    
+            {
+               "navigationStyle": "custom" 
+            }
+            
+        }
+        ,{
+            "path" : "pages/mode/switch-in-out",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/common/mater-list",
+            "style" :                                                                                    
             {
                 "navigationStyle": "custom",
                 "enablePullDownRefresh": true,
@@ -191,7 +207,15 @@
             
         }
         ,{
-            "path" : "pages/entry/change-mode",
+            "path" : "pages/mode/pick",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/mode/command",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
new file mode 100644
index 0000000..14c9f5e
--- /dev/null
+++ b/pages/common/mater-list.vue
@@ -0,0 +1,148 @@
+<template>
+	<view class="zd_container">
+		<!-- 查询物料 -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="val1">
+					</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>
+								<th>载具编码</th>
+								<th>仓库编码</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.unit_id}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.stor_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {groupMaterList} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 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._groupMaterList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
+</style>
diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue
index a1e2da1..92f81c3 100644
--- a/pages/entry/mater-group-to-store.vue
+++ b/pages/entry/mater-group-to-store.vue
@@ -6,113 +6,89 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">物料</span>
+						<span class="filter_label">物料编码</span>
 					</view>
 					<view class="zd-col-24">
-						<input type="text" class="filter_input" v-model="val1">
+						<input type="text" class="filter_input" v-model="currentData.material_code" @tap="toJump">
 					</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>
-								<th>载具编码</th>
-								<th>仓库编码</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.unit_id}}</td>
-								<td>{{e.single_weight}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.stor_code}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_groupMaterIn">组盘确认</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-6">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料名称</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料规格</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">单位</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_id" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
 						<span class="filter_label">物料单重</span>
 					</view>
-					<view class="zd-col-17">
-						<input type="number" class="filter_input" v-model="single_weight">
+					<view class="zd-col-24">
+						<input type="number" class="filter_input" v-model="currentData.single_weight">
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
+					<view class="zd-col-7">
 						<span class="filter_label">物料批次</span>
 					</view>
-					<view class="zd-col-17">
-						<input type="number" class="filter_input" v-model="pcsn">
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="currentData.pcsn">
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
+					<view class="zd-col-7">
 						<span class="filter_label">物料数量</span>
 					</view>
-					<view class="zd-col-17">
-						<input type="number" class="filter_input" v-model="qty">
+					<view class="zd-col-24">
+						<input type="number" class="filter_input" v-model="currentData.qty">
 					</view>
 				</view>
-				<view class="zd-row">
-					<view class="zd-col-6">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
 						<span class="filter_label">载具编码</span>
 					</view>
-					<view class="zd-col-17">
-						<search-box
-						v-model="vehicle_code"
-						/>
+					<view class="zd-col-24">
+						<search-box v-model="currentData.vehicle_code"/>
 					</view>
 				</view>
-				<view class="zd-row">
-					<view class="zd-col-6">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
 						<span class="filter_label">仓库编码</span>
 					</view>
-					<view class="zd-col-17">
-						<search-box
-						v-model="stor_code"
-						/>
+					<view class="zd-col-24">
+						<search-box v-model="currentData.stor_code"/>
 					</view>
 				</view>
 			</view>
-			<view class="zd-row submit-bar">
-				<button class="zd-col-7 button-default" @tap="show = false">关闭</button>
-				<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-				<button class="zd-col-7 button-primary" @tap="toSave">保存</button>
-			</view>
 		</view>
-		<view v-if="show" class="msg_mask"></view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupMaterIn">组盘确认</button>
+		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {groupMaterList, groupMaterIn} from '@/utils/getData2.js'
+	import {groupMaterIn} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -121,109 +97,37 @@
 		data() {
 			return {
 				title: '',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 10,
-				show: false,
-				single_weight: null,
-				pcsn: null,
-				qty: null,
-				vehicle_code: '',
-				stor_code:'',
+				currentData: {},
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.currentData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
 		methods: {
-			searchList () {
-				this.dataList = []
-				this.pageNum = 1
-				this._groupMaterList()
-			},
-			async _groupMaterList () {
-				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
-				if (res.code === '200') {
-					this.totalCount = res.totalElements
-					if (res.totalElements > 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._groupMaterList()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
-			toCheck (e) {
-				this.pkId = e.material_id
-				this.show = true
-			},
-			clearUp () {
-				this.single_weight = null
-				this.pcsn = null
-				this.qty = null
-				this.vehicle_code = ''
-				this.stor_code = ''
-			},
-			toSave () {
-				this.dataList.map(e => {
-					if (e.material_id === this.pkId) {
-						e.single_weight = this.single_weight
-						e.pcsn = this.pcsn
-						e.qty = this.qty
-						e.vehicle_code = this.vehicle_code
-						e.stor_code = this.stor_code
-					}
+			toJump () {
+				uni.navigateTo({
+					url: '/pages/common/mater-list?title=查询物料'
 				})
-				this.show = false
 			},
 			toEmpty () {
-				this.val1 = ''
-				this.dataList = []
-				this.pageNum = 1
+				this.currentData = {}
 				this.disabled = false
-				this.pkId = ''
 			},
 			async _groupMaterIn () {
 				this.disabled = true
-				if (!this.pkId) {
+				if (JSON.stringify(this.currentData) === '{}') {
 					this.disabled = false
 					return
 				}
-				let obj = []
-				this.dataList.map(e => {
-					if (e.material_id === this.pkId) {
-						obj = e
-					}
-				})
 				try {
-					let res = await groupMaterIn(this.stor_code, obj)
+					let res = await groupMaterIn(this.currentData.stor_code, this.currentData)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
@@ -246,8 +150,4 @@
 </script>
 
 <style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
 </style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3a91786..b72e901 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -41,12 +41,13 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '设备操控', path: '/pages/entry/change-mode'}, {title: '组盘入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
+					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '组盘入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
 					{title: '出库管理', path: 'RF02', sonTree: [{title: '托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
 					{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', path: '/pages/in/store-info'}]},
 					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
 					{title: '盘点管理', path: 'RF05', sonTree: [{title: '盘点作业', path: '/pages/check/check-task'}]},
-					{title: '任务管理', path: 'RF06', sonTree: [{title: '任务管理', path: '/pages/task/task-manage'}]}
+					{title: '任务管理', path: 'RF06', sonTree: [{title: '任务管理', path: '/pages/task/task-manage'}]},
+					{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]}
 				],
 				show: false,
 				secM: [],
diff --git a/pages/entry/change-mode.vue b/pages/mode/command.vue
similarity index 61%
rename from pages/entry/change-mode.vue
rename to pages/mode/command.vue
index ef3371b..ca31d2e 100644
--- a/pages/entry/change-mode.vue
+++ b/pages/mode/command.vue
@@ -35,10 +35,8 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-3 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_switchInOut">切换<br/>出入库模式</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pinkStartStop">拣选工位<br/>启停模式</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !index || !val2}" :disabled="disabled" @tap="_toCommandTP">下发输送线<br/>运动命令</button>
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !index || !val2}" :disabled="disabled" @tap="_toCommandTP">下发输送线运动命令</button>
 		</view>
 	</view>
 </template>
@@ -46,7 +44,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {switchInOut, pinkStartStop, toCommandTP} from '@/utils/getData2.js'
+	import {toCommandTP} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -69,40 +67,6 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _switchInOut () {
-				this.disabled = true
-				if (!this.val1 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await switchInOut(this.val1, this.index)
-					this.disabled = false
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			async _pinkStartStop () {
-				this.disabled = true
-				if (!this.val1 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await pinkStartStop(this.val1, this.index)
-					this.disabled = false
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
 			async _toCommandTP () {
 				this.disabled = true
 				if (!this.val1 || !this.index || !this.val2) {
diff --git a/pages/mode/pick.vue b/pages/mode/pick.vue
new file mode 100644
index 0000000..c315c69
--- /dev/null
+++ b/pages/mode/pick.vue
@@ -0,0 +1,92 @@
+<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-7">
+						<span class="filter_label">扫码点位</span>
+					</view>
+					<view class="zd-col-24">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">操作命令</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pinkStartStop">拣选工位启停模式</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {pinkStartStop} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{value: '0', text: '是'}, {value: '1', text: '否'}],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _pinkStartStop () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pinkStartStop(this.val1, this.index)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/pages/mode/switch-in-out.vue b/pages/mode/switch-in-out.vue
new file mode 100644
index 0000000..5c3a9c6
--- /dev/null
+++ b/pages/mode/switch-in-out.vue
@@ -0,0 +1,92 @@
+<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-7">
+						<span class="filter_label">扫码点位</span>
+					</view>
+					<view class="zd-col-24">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">操作命令</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_switchInOut">切换出入库模式</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {switchInOut} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{value: '0', text: '是'}, {value: '1', text: '否'}],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _switchInOut () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await switchInOut(this.val1, this.index)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c177a8163ce2d03f84990bc92bdb687a1dd55a
GIT binary patch
literal 2668
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

literal 0
HcmV?d00001