From 1ee38eeed8a5f219eee7479f4c6bbc84829c8a87 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Fri, 10 May 2024 11:04:07 +0800
Subject: [PATCH] =?UTF-8?q?2024-05-10=20=E5=B7=A5=E5=8D=95=E6=9A=82?=
 =?UTF-8?q?=E5=81=9C=E6=97=B6=E4=B8=8D=E8=83=BD=E8=BF=9B=E8=A1=8C=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E5=AE=8C=E5=B7=A5=E6=93=8D=E4=BD=9C=E7=9A=84=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mes/workScheduling/components/Detail.vue b/src/views/mes/workScheduling/components/Detail.vue
index 63620192e..dc9f96206 100644
--- a/src/views/mes/workScheduling/components/Detail.vue
+++ b/src/views/mes/workScheduling/components/Detail.vue
@@ -104,9 +104,9 @@
             :countScopeType="countScopeType"
             :key="updateKey"
           >
-            <template #actionDetail="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata"
+            <template #action="{ row }">
+              <ButtonBase v-if="row.status == '0'"
+                :Butttondata="buttondata" 
                 @button-base-click="buttonTableClick($event, row)"
               />
               
@@ -603,7 +603,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     tableObjectRef.value.params = {
       schedulingCode: row.schedulingCode
     }
-    console.log(tableObjectRef.value.params)
+    //console.log(tableObjectRef.value.params)
     await getList()
   }
   isShowDrawer.value = true
@@ -658,7 +658,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
           })
         ]
       }
-      
+     
+      if(row.status == '1'){
+        props.buttondataTable[0].hide = false
+      }else{
+        props.buttondataTable[0].hide = true
+      }
       buttondata.value = [...detailButtonEdit, ...detailButtonDelete, ...props.buttondataTable]
     } finally {
       detailLoading.value = false
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index 1ce8ac437..748959db6 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -191,7 +191,8 @@ const butttondata=(row) =>{ return [
   defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
   defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}),
   defaultButtons.mainListHandleBtn({label:"开工",name:'start',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}),
-  defaultButtons.mainListHandleBtn({label:"报工",name:'report',hide: isShowMainButton(row,['1'] ),hasPermi:'mes:workScheduling:update'}),
+  defaultButtons.mainListHandleBtn({label:"报工",name:'report',hide: isShowMainButton(row,['4'] ),hasPermi:'mes:workScheduling:update'}),
+  defaultButtons.mainListHandleBtn({label:"质检",name:'check',hide: isShowMainButton(row,['5'] ),hasPermi:'mes:workScheduling:update'}),
   defaultButtons.mainListHandleBtn({label:"完工",name:'finish',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
   //defaultButtons.mainListHandleBtn({label:"叫料",name:'callMaterial',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
 
@@ -212,6 +213,8 @@ const buttonTableClick = async (val, row) => {
     changeBillStatus(row,"1")
   }else if(val=='report'){
     reportRef.value.openDetail(row,"报工")
+  }else if(val=='check'){
+    //reportRef.value.openDetail(row,"报工")
   }else if(val=='finish'){
     finishReport(row)
   } else if(val=='callMaterial'){