From ed243ffbc483c46e0f60dfe9a114a55701d91be6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 21 Mar 2024 10:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/device/deviceinspectionjob/index.vue     | 16 ++++++++--------
 src/views/eam/device/devicemaintainjob/index.vue |  1 +
 src/views/eam/mold/moldinspectionjob/index.vue   | 16 ++++++++--------
 src/views/eam/mold/moldmaintainjob/index.vue     |  1 +
 src/views/eam/mold/moldmaintenancejob/index.vue  |  4 ++--
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/views/eam/device/deviceinspectionjob/index.vue b/src/views/eam/device/deviceinspectionjob/index.vue
index d719ef2..92426fb 100644
--- a/src/views/eam/device/deviceinspectionjob/index.vue
+++ b/src/views/eam/device/deviceinspectionjob/index.vue
@@ -331,18 +331,18 @@ function handleFinishOrder(row) {
       if (response.list.length == 0) {
         message.error(t('请先填写并完成检修明细内容！'))
       } else {
-        let unFinishedList = response.list.filter(item => {
-          return item.status == 1
-        })
-        if (unFinishedList != null && unFinishedList.length > 0) {
-          message.error(t('请先完成各检修明细内容！'))
-          return
-        } else {
+        // let unFinishedList = response.list.filter(item => {
+        //   return item.status == 1
+        // })
+        // if (unFinishedList != null && unFinishedList.length > 0) {
+        //   message.error(t('请先完成各检修明细内容！'))
+        //   return
+        // } else {
           DeviceInspectionMainApi.finishInspection(row.id).then(res => {
             message.success(t('common.finishSuccess'))
             getList()
           })
-        }
+        // }
       }  
     } else {
       message.error(t('common.finishFail'))
diff --git a/src/views/eam/device/devicemaintainjob/index.vue b/src/views/eam/device/devicemaintainjob/index.vue
index a49dfa1..ffdcb12 100644
--- a/src/views/eam/device/devicemaintainjob/index.vue
+++ b/src/views/eam/device/devicemaintainjob/index.vue
@@ -82,6 +82,7 @@
     @detailOpenForm="detailOpenForm"
     :detailValidate="detailValidate"
     @detailSubmitForm="detailSubmitForm"
+    :openFormCallBack="openFormCallBack"
     :isSearchTableItem="true"
     :buttonControllFunction="buttonControllFunction"
     @detailOnChange="detailOnChange"
diff --git a/src/views/eam/mold/moldinspectionjob/index.vue b/src/views/eam/mold/moldinspectionjob/index.vue
index 2098968..f6aa70c 100644
--- a/src/views/eam/mold/moldinspectionjob/index.vue
+++ b/src/views/eam/mold/moldinspectionjob/index.vue
@@ -322,18 +322,18 @@ function handleFinishOrder(row) {
       if (response.list.length == 0) {
         message.error(t('请先填写并完成检修明细内容！'))
       } else {
-        let unFinishedList = response.list.filter(item => {
-          return item.status == 1
-        })
-        if (unFinishedList != null && unFinishedList.length > 0) {
-          message.error(t('请先完成各检修明细内容！'))
-          return
-        } else {
+        // let unFinishedList = response.list.filter(item => {
+        //   return item.status == 1
+        // })
+        // if (unFinishedList != null && unFinishedList.length > 0) {
+        //   message.error(t('请先完成各检修明细内容！'))
+        //   return
+        // } else {
           DeviceInspectionMainApi.finishInspection(row.id).then(res => {
             message.success(t('common.finishSuccess'))
             getList()
           })
-        }
+        // }
       }  
     } else {
       message.error(t('common.finishFail'))
diff --git a/src/views/eam/mold/moldmaintainjob/index.vue b/src/views/eam/mold/moldmaintainjob/index.vue
index 22dccfb..890a299 100644
--- a/src/views/eam/mold/moldmaintainjob/index.vue
+++ b/src/views/eam/mold/moldmaintainjob/index.vue
@@ -83,6 +83,7 @@
     :detailValidate="detailValidate"
     @detailSubmitForm="detailSubmitForm"
     :isSearchTableItem="true"
+    :openFormCallBack="openFormCallBack"
     :buttonControllFunction="buttonControllFunction"
     @detailOnChange="detailOnChange"
   />
diff --git a/src/views/eam/mold/moldmaintenancejob/index.vue b/src/views/eam/mold/moldmaintenancejob/index.vue
index 7092fa9..709df94 100644
--- a/src/views/eam/mold/moldmaintenancejob/index.vue
+++ b/src/views/eam/mold/moldmaintenancejob/index.vue
@@ -560,7 +560,7 @@ const detailValidate = (data) => {
   }
 }
 // 子表提交
-const detailSubmitForm= async (formType,data,getList,formRef,tableList) => {
+const detailSubmitForm= async (formType,data,formRef,tableList) => {
   try {
     let data1 = {
       id:data.id,
@@ -582,7 +582,7 @@ const detailSubmitForm= async (formType,data,getList,formRef,tableList) => {
     }
     formRef.dialogVisible = false
     // 刷新当前列表
-    await getList()
+    await detailRef.value.getList()
     detailRef.value.tableObject.tableList.forEach(item=>{
       if (item.itemNumbers?.length>0) {
         let str = ''