From 1d1c69da1ae2abf2e8abac497cf1d6e1031afaf9 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 12 Dec 2022 10:44:36 +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.json                          |   8 +-
 pages/DispatchManage/TaskManage.vue | 134 ++++++++++++++++++++++++++++
 static/image/.DS_Store              | Bin 6148 -> 6148 bytes
 static/image/menu/RF10.png          | Bin 0 -> 2668 bytes
 utils/getData2.js                   |  28 ++++++
 5 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 pages/DispatchManage/TaskManage.vue
 create mode 100644 static/image/menu/RF10.png

diff --git a/pages.json b/pages.json
index cdd52a3..f42a362 100644
--- a/pages.json
+++ b/pages.json
@@ -198,7 +198,6 @@
 		    {
 		        "navigationStyle": "custom"
 		    }
-		    
 		}
 		,{
 		    "path" : "pages/ProductManage/SlittingFeeding",
@@ -207,6 +206,13 @@
 		    	"enablePullDownRefresh": true,
 		    	"onReachBottomDistance": 50
 		    }   
+		},
+		{
+			"path": "pages/DispatchManage/TaskManage",
+			"style" :
+			{
+			    "navigationStyle": "custom"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/DispatchManage/TaskManage.vue b/pages/DispatchManage/TaskManage.vue
new file mode 100644
index 0000000..d754bee
--- /dev/null
+++ b/pages/DispatchManage/TaskManage.vue
@@ -0,0 +1,134 @@
+<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">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>任务号</th>
+								<th>载具编码</th>
+								<th>取货点1</th>
+								<th>放货点1</th>
+								<th>取货点2</th>
+								<th>放货点2</th>
+								<th>状态</th>
+								<th>任务类型</th>
+								<th>AGV</th>
+								<th>生成时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
+								<td>{{e.task_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.point_code1}}</td>
+								<td>{{e.point_code2}}</td>
+								<td>{{e.point_code3}}</td>
+								<td>{{e.point_code4}}</td>
+								<td>{{e.task_status}}</td>
+								<td>{{e.task_type}}</td>
+								<td>{{e.car_no}}</td>
+								<td>{{e.create_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_taskConfirm">强制完成</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_againLssued">重新下发</button>
+			<button class="submit-button" @tap="_taskTaskQuery">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {taskTaskQuery, againLssued, taskConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				disabled1: false,
+				disabled2: false,
+				pkId: '',
+				pkObj: {}
+			};
+		},
+		methods: {
+			/** 初始化查询 */
+			async _taskTaskQuery () {
+				let res = await taskTaskQuery(this.val1)
+				this.dataList = [...res.data]	
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.task_code ? '' : e.task_code
+				this.pkObj = this.pkId === e.task_code ? e : {}
+			},
+			/** 重新下发 */
+			async _againLssued () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await againLssued(this.pkObj)
+					this.disabled1 = false
+					this.pkId = ''
+					this._taskTaskQuery()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 强制完成 */
+			async _taskConfirm () {
+				this.disabled2 = true
+				if (!this.pkId) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await taskConfirm(this.pkObj)
+					this.disabled2 = false
+					this.pkId = ''
+					this._taskTaskQuery()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/static/image/.DS_Store b/static/image/.DS_Store
index 473fbc2115494c968fc8638d6ecb53a3629be10f..3684645bf599d50cc882702c5a6760e69cc1ebc5 100644
GIT binary patch
delta 531
zcmZoMXfc=|#>B!ku~2NHo+2ar#(>?7izhHMF|tqQVVcchZeXmVU}R}Fc|DU?eP(i5
zK~heB5(5L{=A?q0%;FLQgZlykj7-cdtZeKYoLt;IynOruf<nTAB7&l#qGIBr5|WbA
z@dCn0iOJdNMfs(9DbD#h`9)4SrKu5_$@zJ~nN_I~C8-r9AV$1^5SqH6)RZ`cP<=>c
z0Z@?$LIiA>dr@j?UUYg<W{Q7WT5)Pg1QI(kUVy(ixhOv;Cm_E#vm`S=FEXY$Bfs3U
zBsJGFFD)NvWm#rwxqksjsyHmQs2E6N=!u9-EGkOOt4~jLs*KG^OiIo1&vVKzDap?T
zDFqn^^h!WcD#$3X<-rAs$(ecS%Jv@^z(Cm{0LIXOFa#KsAq)lv4gtoHy!^aWPEKV9
zZ>S&#gEoUBgBL?ELk2@RLm$H|hGh&poEVNW++ujc@Qsm$QH)WEQJc|((U#Gk(Sy;G
z(VH=VF_19`qMeBmYK#ob4hYQ{z4<MZKjUV04t@?`ly7ci{?0s^U&N6EsGbR=WOIbb
G8fE}2f{yzD

delta 81
zcmZoMXfc=|#>B)qu~2NHo+2aL#(>?7jBJy6SY~q=Tbk%77@L|;UeDsS`3Rdc<7Nep
k)6ARMIruq%8a4}Zd}p4_FXG6-00fK-3@n=?MAk3^08!2pC;$Ke

diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c177a8163ce2d03f84990bc92bdb687a1dd55a
GIT binary patch
literal 2668
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

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index d90c2f0..5620f00 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -70,6 +70,9 @@ export const authority = () => {
 				]},
 			{menu_id: '9', path: 'RF09', name: '打印管理', sonTree: [
 				{menu_id: '1', name: '客户标签打印', path: '/pages/WarehouseManage/CustomerLabelPrint'},
+				]},
+			{menu_id: '10', path: 'RF10', name: '调度管理', sonTree: [
+				{menu_id: '1', name: '任务管理', path: '/pages/DispatchManage/TaskManage'},
 				]}
 		]
 	}
@@ -357,4 +360,29 @@ export const feedingConfirm = (row) => request({
 	data: {
 		cut_rows: row
 	}
+})
+
+/**
+ * 任务管理
+ */
+//1.1任务查询	
+export const taskTaskQuery = (search) => request({
+url:'api/pda/task/taskQuery',
+data: {
+	search: search
+}
+})
+//1.2重新下发
+export const againLssued = (row) => request({
+url:'api/pda/task/againLssued',
+data: {
+	task_rows: row
+}
+})
+//1.3强制完成	
+export const taskConfirm = (row) => request({
+url:'api/pda/task/confirm',
+data: {
+	task_rows: row
+}
 })
\ No newline at end of file