维修工单恢复修改

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtRepairOrderServiceImpl.java

@@ -481,8 +481,8 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
         // 记录恢复流转信息
         if (result > 0) {
             GxtRepairOrderFlow flow = new GxtRepairOrderFlow();
-            flow.setOrderId(gxtRepairOrder.getId());
-            flow.setOrderCode(gxtRepairOrder.getWorkOrderProjectNo());
+            flow.setOrderId(oldOrder.getId());
+            flow.setOrderCode(oldOrder.getWorkOrderProjectNo());
             flow.setActionType("resume");
             flow.setFromStatus(oldOrder.getWorkOrderStatus());
             flow.setToStatus(gxtRepairOrder.getWorkOrderStatus());

ygtx-ui/src/views/gxt/repairOrder/index.vue

@@ -259,7 +259,7 @@
               v-if="scope.row.workOrderStatus === 'suspended'"
               type="primary"
               link
-              @click="handleStart(scope.row)"
+              @click="handleResume(scope.row)"
               v-hasPermi="['gxt:repairOrder:resume']"
           ><i class="fa fa-play"></i>恢复</el-button>
           <el-button
@@ -2608,21 +2608,35 @@ async function handlePause(row) {
 
 /** 恢复工单 */
 async function handleResume(row) {
-  proxy.$modal.confirm('是否确认恢复该工单？').then(async function() {
-    try {
-      const updateData = {
-        id: row.id,
-        workOrderStatus: "processing"
-      };
-
-      await resumeRepairOrder(updateData);
-
-      proxy.$modal.msgSuccess("工单已恢复");
-      getList();
-    } catch (error) {
-      proxy.$modal.msgError("操作失败: " + error.message);
-    }
-  }).catch(() => {});
+  // proxy.$modal.confirm('是否确认恢复该工单？').then(async function() {
+  //   try {
+  //     const updateData = {
+  //       id: row.id,
+  //       workOrderStatus: "processing"
+  //     };
+  //
+  //     await resumeRepairOrder(updateData);
+  //
+  //     proxy.$modal.msgSuccess("工单已恢复");
+  //     getList();
+  //   } catch (error) {
+  //     proxy.$modal.msgError("操作失败: " + error.message);
+  //   }
+  // }).catch(() => {});
+  ElMessageBox.confirm('确定要恢复工单"' + row.workOrderProjectNo + '"吗？', '提示', {
+    confirmButtonText: '确认恢复',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(function() {
+    const updateData = {
+      id: row.id,
+      workOrderStatus: "to_finish"
+    };
+    resumeRepairOrder(updateData);
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("恢复成功")
+  }).catch(() => {})
 }
 
 /** 驳回工单 */