From 3787452cd650084b17e8a6d5d5c1b7fd869d9fe7 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 23 Apr 2024 17:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/modules/taskmanage.vue | 37 +++++++++++++++++++++++++++++++++---
 pages/modules/zlmanage.vue   | 33 +++++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/pages/modules/taskmanage.vue b/pages/modules/taskmanage.vue
index a17015c..e0471eb 100644
--- a/pages/modules/taskmanage.vue
+++ b/pages/modules/taskmanage.vue
@@ -2,6 +2,30 @@
 	<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">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">起始设备</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">目标设备</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
+			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
 					<table>
@@ -11,9 +35,9 @@
 								<th>起点</th>
 								<th>终点</th>
 								<th>状态</th>
-								<th>托盘号</th>
 								<th>优先级</th>
 								<th>时间</th>
+								<th>载具号</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -22,9 +46,9 @@
 								<td>{{e.start_devicecode}}</td>
 								<td>{{e.next_devicecode}}</td>
 								<td>{{e.task_status_name}}</td>
-								<td>{{e.carrier}}</td>
 								<td>{{e.priority}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.carrier}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -34,16 +58,19 @@
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure1('1')">重新生成</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure2('2')">强制完成</button>
+			<button class="submit-button" :disabled="disabled" @tap="_handTasks">查询</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
 	import {handTasks, handTaskoperation} from '@/utils/getData02.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
@@ -117,4 +144,8 @@
 </script>
 
 <style lang="stylus">
+.submit-bar
+	justify-content: space-around;
+.submit-button
+	margin: 0 0px 10px 0;
 </style>
diff --git a/pages/modules/zlmanage.vue b/pages/modules/zlmanage.vue
index 7071be1..c5c9f88 100644
--- a/pages/modules/zlmanage.vue
+++ b/pages/modules/zlmanage.vue
@@ -2,6 +2,30 @@
 	<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">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">起始设备</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">目标设备</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
+			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
 					<table>
@@ -41,16 +65,19 @@
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure1('1')">指令撤销</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure2('2')">重新下发</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure3('3')">强制完成</button>
+			<button class="submit-button" :disabled="disabled" @tap="_handInsts">查询</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
 	import {handInsts, handInst} from '@/utils/getData02.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
@@ -132,4 +159,8 @@
 </script>
 
 <style lang="stylus">
+.submit-bar
+	justify-content: space-around;
+.submit-button
+	margin: 0 0px 10px 0;
 </style>