From 2453a589a623b2448a8cc940d8dce3da6698c50c Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 05 二月 2024 14:15:49 +0800
Subject: [PATCH] 获取设备列表、切换设备列表、开始生产接口和逻辑修改、结束任务联调、工艺信息联调、切换任务联调

---
 src/views/dashboard/components/TaskControl.vue |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index cb9d2e2..ea82cb1 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -59,7 +59,7 @@
 import { useDateFormat } from '@vueuse/core'
 import TaskControlModal from '@/views/dashboard/components/TaskControlModal.vue'
 import { CircleCloseFilled } from '@element-plus/icons-vue'
-import { apiReportWork, finishTask } from '@/api'
+import { apiReportWork, procedureUpdate } from '@/api'
 import { ElMessage } from 'element-plus'
 import ReportProductionModal from '@/views/dashboard/components/ReportProductionModal.vue'
 import { usePLCStore } from '@/stores/plc'
@@ -103,7 +103,11 @@
         return true
       }
     }
-    finishTask({ id: task!.value.Procedure.ID }).then(
+    procedureUpdate({
+      isFinish: true,
+      isProcessing: false,
+      workOrderProcedureID: Number(task!.value.Procedure.ID)
+    }).then(
       (res) => {
         ElMessage({
           message: '鎿嶄綔鎴愬姛锛�',
@@ -190,9 +194,10 @@
   // 鏈変汉鍛樻墠鍙互鎶ュ伐
   if (workers.value[0].workerId) {
     apiReportWork({
-      procedureId: task.value?.Procedure.ID,
+      workOrderProcedureID: Number(task.value?.Procedure.ID),
       reportAmount: amount,
-      workerID: workers.value[0].workerId
+      workerID: workers.value[0].workerId,
+      workerName: workers.value[0].workerName
     })
       .then((res) => {
         if (res.code === 200) {

--
Gitblit v1.8.0