Merge remote-tracking branch 'origin/stable' into stable

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

@@ -895,6 +895,15 @@ const canSubmitMainReportType = (tipsText: string)=>{
 const showBatchSubmitToRecheckDialog = ref(false)
 const isShowAuditDialog = ref(false)
 const handleSelectVerfiyer = async () => {
+
+  try {
+    await spreadRef.value?.handleSave()
+  } catch (error) {
+    console.error('保存数据失败:', error)
+    ElMessage.error('保存数据失败，请重试')
+    return
+  }
+
   const canSubmit = canSubmitMainReportType('该报告存在未办结检验意见通知书，无法提交校核')
   if(!canSubmit) return
   // 获取审核人\校核人配置信息
@@ -1358,6 +1367,15 @@ const currentReportConfig = computed(() => {
 const isShowReportAuditDialog = ref(false)
 // 提交报告审核
 const handleSubmitAudit = async () => {
+
+  try {
+    await spreadRef.value?.handleSave()
+  } catch (error) {
+    console.error('保存数据失败:', error)
+    ElMessage.error('保存数据失败，请重试')
+    return
+  }
+
   if([PressureReportType.SUGGUESTION, PressureReportType.MAINQUESTION].includes(props?.selectedItem?.reportType) && !props?.selectedItem?.reportUrl) {
     // 【重大问题线索告知表，检验意见通知书】必须先填写记录，才能提交审核
     ElMessage.warning('请先“填写记录”！再提交审核！')

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

@@ -353,6 +353,7 @@ const getGuidebookApproveList = async () => {
 const handleSubmitUser = () => {
   formRef.value?.validate(async (valid) => {
     if (valid) {
+      confirmSaveParams.value.auditUserIds = [formValueData.value.workInstructionAuditId]
       approvalUserVisible.value = false
       //await handleSaveNew()
       await handleConfirmSave()

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

@@ -893,6 +893,15 @@ const canSubmitMainReportType = (tipsText: string)=>{
 const showBatchSubmitToRecheckDialog = ref(false)
 const isShowAuditDialog = ref(false)
 const handleSelectVerfiyer = async () => {
+
+  try {
+    await spreadRef.value?.handleSave()
+  } catch (error) {
+    console.error('保存数据失败:', error)
+    ElMessage.error('保存数据失败，请重试')
+    return
+  }
+
   const canSubmit = canSubmitMainReportType('该报告存在未办结检验意见通知书，无法提交校核')
   if(!canSubmit) return
   // 获取审核人\校核人配置信息
@@ -1344,6 +1353,15 @@ const currentReportConfig = computed(() => {
 const isShowReportAuditDialog = ref(false)
 // 提交报告审核
 const handleSubmitAudit = async () => {
+
+  try {
+    await spreadRef.value?.handleSave()
+  } catch (error) {
+    console.error('保存数据失败:', error)
+    ElMessage.error('保存数据失败，请重试')
+    return
+  }
+
   if([PressureReportType.SUGGUESTION, PressureReportType.MAINQUESTION].includes(props?.selectedItem?.reportType) && !props?.selectedItem?.reportUrl) {
     // 【重大问题线索告知表，检验意见通知书】必须先填写记录，才能提交审核
     ElMessage.warning('请先“填写记录”！再提交审核！')

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

@@ -349,6 +349,7 @@ const getGuidebookApproveList = async () => {
 const handleSubmitUser = () => {
   formRef.value?.validate(async (valid) => {
     if (valid) {
+      confirmSaveParams.value.auditUserIds = [formValueData.value.workInstructionAuditId]
       approvalUserVisible.value = false
       //await handleSaveNew()
       await handleConfirmSave()