问题调整

yudao-ui-admin-vue3/src/components/DynamicReport/SpreadViewer.vue

@@ -522,7 +522,7 @@ const hiddenPage = async () => {
   }
 }
 
-defineExpose({reloadView:initPreview});
+defineExpose({reloadView:initPreview, handleSave});
 
 const emit = defineEmits(['saveSuccess','docReady','docCreate','saveFail'])
 

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/components/StatusOperationPanel.vue

@@ -940,6 +940,11 @@ const handleBatchSubmitToRecheck = async () => {
     ElMessage.error('请完善表单数据！')
     return
   }
+
+  if (_.isEmpty(batchRecheckForm.value.recheckUser)) {
+    return ElMessage.error('请选择校核人')
+  }
+
   // 待提交的数据
   const params = {
     reportList: getCanSubmitRecheckReport.value.filter((x: any) => batchRecheckForm.value.reportIds.includes(x?.id)).map((x: any) => ({

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/taskDetail.vue

@@ -833,7 +833,7 @@ async function fetchTaskDetail(id: string, activeReportId = '') {
       if([600].includes(v.reportType as number)){
         return [200].includes(v.status)
       } else if( [500].includes(v.reportType as number)){
-        return false
+        return [200].includes(v.status)
       }
       // if([700].includes(v.reportType as number)){
       //   return [200, 400].includes(v.status)
@@ -847,7 +847,7 @@ async function fetchTaskDetail(id: string, activeReportId = '') {
       if([600].includes(v.reportType as number)){
         return [200].includes(v.status)
       } else if( [500].includes(v.reportType as number)){
-        return false
+        return [200].includes(v.status)
       }
       // if([700].includes(v.reportType as number)){
       //   return [200, 400].includes(v.status)
@@ -859,7 +859,7 @@ async function fetchTaskDetail(id: string, activeReportId = '') {
       if([600, 700].includes(v.reportType as number)){
         return [200, 400].includes(v.status)
       } else if([500].includes(v.reportType as number)){
-        return false
+        return [200, 400].includes(v.status)
       }
       return true
     })//.reverse()

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/EditWorkBookReport.vue

@@ -360,8 +360,18 @@ const handleSubmitUser = () => {
   })
 }
 
-const handleSubmitBefore = () => {
-  getGuidebookApproveList()
+const handleSubmitBefore = async () => {
+
+  try {
+    await editSpreadRecordRef.value?.handleSave()
+  } catch (error) {
+    console.error('保存数据失败:', error)
+    ElMessage.error('保存数据失败，请重试')
+    return
+  }
+
+  await getGuidebookApproveList()
+
 }
 
 

yudao-ui-admin-vue3/src/views/pressure2/pipechecker/taskDetail.vue

@@ -823,7 +823,7 @@ async function fetchTaskDetail(id: string, activeReportId = '') {
       if([600].includes(v.reportType as number)){
         return [200].includes(v.status)
       } else if( [500].includes(v.reportType as number)){
-        return false
+        return [200].includes(v.status)
       }
       // if([700].includes(v.reportType as number)){
       //   return [200, 400].includes(v.status)
@@ -837,7 +837,7 @@ async function fetchTaskDetail(id: string, activeReportId = '') {
       if([600].includes(v.reportType as number)){
         return [200].includes(v.status)
       } else if( [500].includes(v.reportType as number)){
-        return false
+        return [200].includes(v.status)
       }
       // if([700].includes(v.reportType as number)){
       //   return [200, 400].includes(v.status)
@@ -849,7 +849,7 @@ async function fetchTaskDetail(id: string, activeReportId = '') {
       if([600, 700].includes(v.reportType as number)){
         return [200, 400].includes(v.status)
       } else if([500].includes(v.reportType as number)){
-        return false
+        return [200].includes(v.status)
       }
       return true
     })//.reverse()

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/EditWorkBookReport.vue

@@ -356,8 +356,18 @@ const handleSubmitUser = () => {
   })
 }
 
-const handleSubmitBefore = () => {
-  getGuidebookApproveList()
+const handleSubmitBefore = async () => {
+
+  try {
+    await editSpreadRecordRef.value?.handleSave()
+  } catch (error) {
+    console.error('保存数据失败:', error)
+    ElMessage.error('保存数据失败，请重试')
+    return
+  }
+
+  await getGuidebookApproveList()
+
 }
 
 const editData=ref<InitParams>(