From b1e12bbdb5e1308d5d5af071d67a5ddd06b27ab0 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Tue, 21 May 2024 17:17:38 +0800
Subject: [PATCH] =?UTF-8?q?2024-05-21=20=E5=B7=A5=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=8C=E5=B7=A5=E6=8F=90=E7=A4=BA=EF=BC=9B=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/workScheduling/components/Detail.vue |  6 ++++--
 src/views/mes/workScheduling/index.vue             | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/mes/workScheduling/components/Detail.vue b/src/views/mes/workScheduling/components/Detail.vue
index 086250138..7e490efd8 100644
--- a/src/views/mes/workScheduling/components/Detail.vue
+++ b/src/views/mes/workScheduling/components/Detail.vue
@@ -833,8 +833,10 @@ const opensearchTable = (
 // }
 const buttonClick=(type,row)=>{
   if (type == 'pfinished') {
-   WorkSchedulingDetailApi.processFinished(row.id)
-   getList()
+    message.confirm("是否确认进行完工操作？").then (()=>{
+      WorkSchedulingDetailApi.processFinished(row.id)
+   getList()})
+  
  }else if (type == 'reprotProcess') {
    refreport.value.openDetail(row,"工序报工",  planDayCode.value)
 }else if (type == 'checkProcess') {
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index 4e2bba17f..8ca2069cd 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -192,7 +192,7 @@ const butttondata=(row) =>{ return [
 ]}
 const reportRef=ref()
 const reportFinishRef=ref()
-const qualifiedCheck=ref()
+
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
@@ -231,8 +231,16 @@ const finishReport=async(row)=>{
   }
   //console.log("workscheduling-finishReport-213",row)
   if(row.workingNode=='endNode'){
+    
+    message.confirm("是否确认进行完工操作？").then (()=>{
+      WorkSchedulingApi.completeHandle(params)})
+    
+    // if(ret =='ddd'){
+    //   WorkSchedulingApi.completeHandle(params)
+    // }
     //reportFinishRef.value.openDetail(row,"完工")
-    WorkSchedulingApi.completeHandle(params)
+   
+    
   }else{
     // let res=await WorkSchedulingApi.getNodePosition(params)
     // if(res){