From 96be887eeca4fc3da4ae5ebf9b04176b4da34850 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Mon, 1 Apr 2024 13:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=E9=97=B4,=E5=8F=96=E6=B6=88=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1,=E9=87=8D=E6=96=B0=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wcs/busFunctions/taskManagement.js | 16 +++++++++++++
 src/views/taskManagement/index.vue         | 26 +++++++++++++---------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/api/wcs/busFunctions/taskManagement.js b/src/api/wcs/busFunctions/taskManagement.js
index 69ef375..4823da0 100644
--- a/src/api/wcs/busFunctions/taskManagement.js
+++ b/src/api/wcs/busFunctions/taskManagement.js
@@ -8,4 +8,20 @@ export function queryTaskManagement(data) {
     method: 'get',
     params:data
   })
+}
+// 查询任务管理列表
+export function cancelTask(data) {
+  return request({
+    url: 'wms/datatask/cancelTask',
+    method: 'post',
+    data:data
+  })
+}
+// 查询任务管理列表
+export function reissueTask(data) {
+  return request({
+    url: 'wms/datatask/reissueTask',
+    method: 'post',
+    data:data
+  })
 }
\ No newline at end of file
diff --git a/src/views/taskManagement/index.vue b/src/views/taskManagement/index.vue
index 395f7f9..16b5dc7 100644
--- a/src/views/taskManagement/index.vue
+++ b/src/views/taskManagement/index.vue
@@ -267,7 +267,7 @@
 <script>
 import { getBasePointGroup, updatePoint, addPoint } from '@/api/wcs/base/agvPoint.js'
 import { getWcsDeviceList } from '@/api/wcs/base/wcsDevice.js'
-import { queryTaskManagement, instantlyTask } from '@/api/wcs/busFunctions/taskManagement.js'
+import { queryTaskManagement, reissueTask, cancelTask } from '@/api/wcs/busFunctions/taskManagement.js'
 import moment from 'moment'
 // import { getTableHeader } from '@/api/wms/tableHeader/table'
 export default {
@@ -588,13 +588,13 @@ export default {
     /** 查询区域列表 */
     getList() {
       this.loading = true
-      // if (this.value1 !== null && this.value1 !== 'null' && this.value1 !== undefined) {
-      //   this.queryParams.createTimeS = this.value1[0]
-      //   this.queryParams.createTimeE = this.value1[1]
-      // } else {
-      //   this.queryParams.createTimeS = null
-      //   this.queryParams.createTimeE = null
-      // }
+      if (this.value1 !== null && this.value1 !== 'null' && this.value1 !== undefined) {
+        this.queryParams.createTimeS = this.value1[0]
+        this.queryParams.createTimeE = this.value1[1]
+      } else {
+        this.queryParams.createTimeS = null
+        this.queryParams.createTimeE = null
+      }
       queryTaskManagement(this.queryParams).then((res) => {
         this.cheshiList = res.rows
         this.paging.total = res.total
@@ -646,7 +646,12 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$modal.msgSuccess('取消成功')
+        cancelTask({ taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            this.$message.success('取消成功')
+            this.reset()
+          }
+        })
       })
     },
 
@@ -659,11 +664,10 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        instantlyTask(row.taskId).then((res) => {
+        reissueTask({ taskId: row.taskId }).then((res) => {
           // console.log(res)
           if (res.code === 200) {
             this.$message.success('立即下发成功')
-            console.log(res)
             this.reset()
           }
         })