From 02efe6762f279628b4c7bb5d53c3664e9e4675bd Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Wed, 14 Jan 2026 17:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/heli/service/taskreport/TaskReportServiceImpl.java | 4 +++-
 mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java
index 567a1275..eef99eee 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java
@@ -64,8 +64,10 @@ public class TaskReportServiceImpl implements TaskReportService {
         if (ObjectUtil.isNotEmpty(taskReportDO)){
             TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskReportDO.getDispatchDetailId());
             if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){
-                if (taskDispatchDetailDO.getProcedureStatus() == 2) return CommonResult.error(400,"该派工单已报工完成，不允许删除！");
+                if (taskDispatchDetailDO.getProcedureStatus() == 2) return CommonResult.error(400,"该报工已完成，不允许删除，请确认");
             }
+            taskDispatchDetailDO.setProcedureStatus(0);
+            taskDispatchDetailMapper.updateById(taskDispatchDetailDO);
         }
         // 删除
         taskReportMapper.deleteByIds(id);
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
index 6e195f67..b633498e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
@@ -113,7 +113,7 @@
         <template #default="scope">
           <el-tag v-if="scope.row.procedureStatus === '1'" type="warning">已报工</el-tag>
           <el-tag v-else-if="scope.row.procedureStatus === '2'" type="success">报工完成</el-tag>
-          <el-tag v-else>未知</el-tag>
+          <el-tag v-else>未报工</el-tag>
         </template>
       </el-table-column>
       <!--      <el-table-column-->