From 5de5c63c78226c066963b5bb6a1daa20dfd6a478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 26 Aug 2025 14:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TPM=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=20=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/eam.js                            |  1 +
 .../modules/eam/eamWorkOrderForDefect.vue     | 22 ++++++++++++++++++
 .../modules/eam/eamWorkOrderForDefect2.vue    | 23 +++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index e7d358a..b476955 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -217,6 +217,7 @@ export const saveTrans= data => createAPI(`/pms/eam/saveTrans`,'post',data)
 export const saveCoreComponent= data => createAPI(`/pms/eam/saveCoreComponent`,'post',data)
 export const deleteCoreComponents= data => createAPI(`/pms/eam/deleteCoreComponents`,'post',data)
 export const confirmDefectOrder= data => createAPI(`/pms/eam/confirmDefectOrder`,'post',data)
+export const cancelDefectOrder= data => createAPI(`/pms/eam/cancelDefectOrder`,'post',data)
 export const getSparPartImages= data => createAPI(`/pms/eam/getSparPartImages`,'post',data)
 export const getRoleByUserName= data => createAPI(`/pms/eam/getRoleByUserName`,'post',data)
 export const eamWorkOrderSearch2 = data => createAPI(`/pms/eam/eamWorkOrderSearch2`,'post',data)
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index ff8e737..35c81cc 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -686,6 +686,7 @@
       <el-footer style="height:30px;margin-top: 50px;text-align:center">
         <el-button style="margin-left: -12px" type="primary" @click="confirmDefectOrder()">保存</el-button>
         <el-button type="primary" @click="confirmDefectModal = false">关闭</el-button>
+        <el-button type="primary" @click="cancelDefectOrder()">取消工单</el-button>
       </el-footer>
     </el-dialog>
 
@@ -751,6 +752,7 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/user
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import {isAuth} from '../../../utils'
 import excel from "@/utils/excel-util.js";
+import {cancelDefectOrder} from "../../../api/eam/eam";
 export default {
   components: {
     Chooselist
@@ -2391,6 +2393,26 @@ export default {
         }
       })
     },
+    //取消工单按钮
+    cancelDefectOrder(){
+      this.$confirm('确定取消该工单吗？',{
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=>{
+        cancelDefectOrder(this.confirmData).then(({data})=>{
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.getDataList()
+            this.confirmDefectModal = false
+          } else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      })
+    },
 
     // 查看故障图片
     checkFaultImageModal() {
diff --git a/src/views/modules/eam/eamWorkOrderForDefect2.vue b/src/views/modules/eam/eamWorkOrderForDefect2.vue
index fcc9a0c..e08ced9 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect2.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect2.vue
@@ -687,6 +687,7 @@
       <el-footer style="height:30px;margin-top: 50px;text-align:center">
         <el-button style="margin-left: -12px" type="primary" @click="confirmDefectOrder()">保存</el-button>
         <el-button type="primary" @click="confirmDefectModal = false">关闭</el-button>
+        <el-button type="primary" @click="cancelDefectOrder()">取消工单</el-button>
       </el-footer>
     </el-dialog>
 
@@ -731,6 +732,7 @@ import {
   updateReportResult, // 修改执行结果
   getSiteAndBuByUserName,
   confirmDefectOrder, // 维修确认
+  cancelDefectOrder, // 维修确认-取消工单
   submitDefects, // 批量审核
   getFeedBackImages, // 获取故障图片
   queryHistoryRecord, // 查看维修历史
@@ -752,6 +754,7 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/user
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import {isAuth} from '../../../utils'
 import excel from "@/utils/excel-util.js";
+import {deleteSchedulingRecord} from "../../../api/scheduling/scheduling";
 export default {
   components: {
     Chooselist
@@ -2391,6 +2394,26 @@ export default {
         }
       })
     },
+    //取消工单按钮
+    cancelDefectOrder(){
+      this.$confirm('确定取消该工单吗？',{
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=>{
+        cancelDefectOrder(this.confirmData).then(({data})=>{
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.getDataList()
+            this.confirmDefectModal = false
+          } else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      })
+    },
 
     // 查看故障图片
     checkFaultImageModal() {