默认校核人

yudao-ui-admin-vue3/src/api/pressure2/boilertaskorder/index.ts

@@ -919,4 +919,14 @@ export const BoilerTaskOrderApi = {
     return await request.put({ url: '/pressure2/boiler-task-order-report/update', data })
   },
 
+  // 保存当前用户的默认审批配置（校核人、审核人）
+  saveDefaultApproval: async (data: any) => {
+    return await request.post({ url: '/pressure2/default-approval/save', data })
+  },
+
+  // 获取当前用户的默认审批配置
+  getDefaultApproval: async () => {
+    return await request.get({ url: '/pressure2/default-approval/get' })
+  },
+
 }

yudao-ui-admin-vue3/src/api/pressure2/pipetaskorder/index.ts

@@ -854,4 +854,14 @@ export const PipeTaskOrderApi = {
   releaseManualReport: async (data: any) => {
     return await request.put({ url: '/pressure2/pipe-task-order-item-report/update', data })
   },
+
+  // 保存当前用户的默认审批配置（校核人、审核人）
+  saveDefaultApproval: async (data: any) => {
+    return await request.post({ url: '/pressure2/default-approval/save', data })
+  },
+
+  // 获取当前用户的默认审批配置
+  getDefaultApproval: async () => {
+    return await request.get({ url: '/pressure2/default-approval/get' })
+  },
 }

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

@@ -1081,11 +1081,16 @@ const handleSelectVerfiyer = async () => {
   const canSubmit = canSubmitMainReportType('该报告存在未办结检验意见通知书，无法提交校核')
   if(!canSubmit) return
   // 获取审核人\校核人配置信息
-  let res = await UserApi.getApprovalDetail({})
+  let res = await BoilerTaskOrderApi.getDefaultApproval()
   // 如果存在多份待提交校核的报告,执行批量校核弹窗
   if(getCanSubmitRecheckReport.value.length > 1) {
     if(res && res.recheckUser) {
-      batchRecheckForm.value.recheckUser = res.recheckUser
+      // 校验默认校核人是否在校核人列表中
+      const checkList = await getRecheckUserList({ pageNo: 1, pageSize: 200, nickName: res.recheckUser.nickname })
+      const exists = (checkList?.list || []).some((item: any) => item.id === res.recheckUser.id)
+      if (exists) {
+        batchRecheckForm.value.recheckUser = res.recheckUser
+      }
     }
     batchRecheckForm.value.reportIds = getCanSubmitRecheckReport.value.map(x => x?.id)
     showBatchSubmitToRecheckDialog.value = true
@@ -1093,7 +1098,12 @@ const handleSelectVerfiyer = async () => {
   }
   // 只有一份待提交校核的报告,执行以下逻辑
   if(res && res.recheckUser) {
-    form.value.recheckUser = res.recheckUser
+    // 校验默认校核人是否在校核人列表中
+    const checkList = await getRecheckUserList({ pageNo: 1, pageSize: 200, nickName: res.recheckUser.nickname })
+    const exists = (checkList?.list || []).some((item: any) => item.id === res.recheckUser.id)
+    if (exists) {
+      form.value.recheckUser = res.recheckUser
+    }
   }
   schemaFlag.value = 'proofread'
   isShowAuditDialog.value = true
@@ -1141,6 +1151,10 @@ const handleBatchSubmitToRecheck = async () => {
   const submitResult = await BoilerTaskOrderApi.batchSubmitToRecheck(params)
 
   if (submitResult) {
+    // 保存默认校核人
+    BoilerTaskOrderApi.saveDefaultApproval({
+      recheckId: batchRecheckForm.value.recheckUser?.id
+    })
     ElMessage.success('提交校核成功！')
     showBatchSubmitToRecheckDialog.value = false
     selectNextItem(getCanSubmitRecheckReport.value.filter((x: any) => batchRecheckForm.value.reportIds.includes(x?.id)))
@@ -1175,6 +1189,10 @@ const handleAuditSelectConfirm = async () => {
       recheckId: form.value?.recheckUser?.id
     })
     if (saveResult) {
+      // 保存默认校核人
+      BoilerTaskOrderApi.saveDefaultApproval({
+        recheckId: form.value?.recheckUser?.id
+      })
       ElMessage.success('提交校核成功！')
       isShowAuditDialog.value = false
       selectNextItem([props.selectedItem])
@@ -1792,15 +1810,28 @@ const currentReportConfig = computed(() => {
 // 选择报告审核人弹窗的显示和隐藏
 const isShowReportAuditDialog = ref(false)
 
-// 弹窗打开时预加载审核人列表
-watch(isShowReportAuditDialog, (val) => {
+// 弹窗打开时预加载审核人列表和默认值
+watch(isShowReportAuditDialog, async (val) => {
   if (val) {
+    reportAuditUserCode.value = ''
     reportAuditUserLoading.value = true
-    getReviewUserList({ pageNo: 1, pageSize: 200, name: '' }).then((res) => {
-      reportAuditUserOptions.value = res || []
-    }).finally(() => {
+    // 加载审核人列表
+    const userList = await getReviewUserList({ pageNo: 1, pageSize: 200, name: '' }).finally(() => {
       reportAuditUserLoading.value = false
     })
+    reportAuditUserOptions.value = userList || []
+    // 加载默认审核人（工号），校验是否在列表中
+    try {
+      const defaultApproval = await BoilerTaskOrderApi.getDefaultApproval()
+      if (defaultApproval?.approveEmployeeNo) {
+        const exists = (userList || []).some((item: any) => item.code === defaultApproval.approveEmployeeNo)
+        if (exists) {
+          reportAuditUserCode.value = defaultApproval.approveEmployeeNo
+        }
+      }
+    } catch (e) {
+      // ignore
+    }
   }
 })
 
@@ -2136,6 +2167,10 @@ const handleReportAuditSelectConfirm = async () => {
       auditor: reportAuditUserCode.value
     })
     if (submitResult) {
+      // 保存默认审核人（工号）
+      BoilerTaskOrderApi.saveDefaultApproval({
+        approveEmployeeNo: reportAuditUserCode.value
+      })
       emit('template-confirm')
     }
     isShowReportAuditDialog.value = false

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

@@ -1064,12 +1064,17 @@ const handleSelectVerfiyer = async () => {
   const canSubmit = canSubmitMainReportType('该报告存在未办结检验意见通知书，无法提交校核')
   if(!canSubmit) return
   // 获取审核人\校核人配置信息
-  let res = await UserApi.getApprovalDetail({})
+  let res = await PipeTaskOrderApi.getDefaultApproval()
   // 如果存在多份待提交校核的报告,执行批量校核弹窗
   console.log('getCanSubmitRecheckReport', getCanSubmitRecheckReport,props.reportList,res)
   if(getCanSubmitRecheckReport.value.length > 1) {
     if(res && res.recheckUser) {
-      batchRecheckForm.value.recheckUser = res.recheckUser
+      // 校验默认校核人是否在校核人列表中
+      const checkList = await getPipeRecheckUserList({ pageNo: 1, pageSize: 200, nickName: res.recheckUser.nickname })
+      const exists = (checkList?.list || []).some((item: any) => item.id === res.recheckUser.id)
+      if (exists) {
+        batchRecheckForm.value.recheckUser = res.recheckUser
+      }
     }
     batchRecheckForm.value.reportIds = getCanSubmitRecheckReport.value.map(x => x?.id)
     showBatchSubmitToRecheckDialog.value = true
@@ -1077,7 +1082,12 @@ const handleSelectVerfiyer = async () => {
   }
   // 只有一份待提交校核的报告,执行以下逻辑
   if(res && res.recheckUser) {
-    form.value.recheckUser = res.recheckUser
+    // 校验默认校核人是否在校核人列表中
+    const checkList = await getPipeRecheckUserList({ pageNo: 1, pageSize: 200, nickName: res.recheckUser.nickname })
+    const exists = (checkList?.list || []).some((item: any) => item.id === res.recheckUser.id)
+    if (exists) {
+      form.value.recheckUser = res.recheckUser
+    }
   }
   schemaFlag.value = 'proofread'
   isShowAuditDialog.value = true
@@ -1110,6 +1120,10 @@ const handleBatchSubmitToRecheck = async () => {
   const submitResult = await PipeTaskOrderApi.batchSubmitToRecheck(params)
 
   if (submitResult) {
+    // 保存默认校核人
+    PipeTaskOrderApi.saveDefaultApproval({
+      recheckId: batchRecheckForm.value.recheckUser?.id
+    })
     ElMessage.success('提交校核成功！')
     showBatchSubmitToRecheckDialog.value = false
     selectNextItem(getCanSubmitRecheckReport.value.filter((x: any) => batchRecheckForm.value.reportIds.includes(x?.id)))
@@ -1144,6 +1158,10 @@ const handleAuditSelectConfirm = async () => {
       recheckId: form.value?.recheckUser?.id
     })
     if (saveResult) {
+      // 保存默认校核人
+      PipeTaskOrderApi.saveDefaultApproval({
+        recheckId: form.value?.recheckUser?.id
+      })
       ElMessage.success('提交校核成功！')
       isShowAuditDialog.value = false
       selectNextItem([props.selectedItem])
@@ -2010,6 +2028,10 @@ const handleReportAuditSelectConfirm = async () => {
       auditor: reportAuditUserCode.value
     })
     if (submitResult) {
+      // 保存默认审核人（工号）
+      PipeTaskOrderApi.saveDefaultApproval({
+        approveEmployeeNo: reportAuditUserCode.value
+      })
       emit('template-confirm')
     }
     isShowReportAuditDialog.value = false
@@ -2018,12 +2040,24 @@ const handleReportAuditSelectConfirm = async () => {
   }
 }
 
-// 监听报告审核对话框打开，预加载审核人选项
-watch(isShowReportAuditDialog, (val) => {
+// 监听报告审核对话框打开，预加载审核人选项和默认值
+watch(isShowReportAuditDialog, async (val) => {
   if (val) {
-    getPipeReviewUserList({ pageNo: 1, pageSize: 200, name: '' }).then((res) => {
-      reportAuditUserOptions.value = res || []
-    })
+    reportAuditUserCode.value = ''
+    const userList = await getPipeReviewUserList({ pageNo: 1, pageSize: 200, name: '' })
+    reportAuditUserOptions.value = userList || []
+    // 加载默认审核人（工号），校验是否在列表中
+    try {
+      const defaultApproval = await PipeTaskOrderApi.getDefaultApproval()
+      if (defaultApproval?.approveEmployeeNo) {
+        const exists = (userList || []).some((item: any) => item.code === defaultApproval.approveEmployeeNo)
+        if (exists) {
+          reportAuditUserCode.value = defaultApproval.approveEmployeeNo
+        }
+      }
+    } catch (e) {
+      // ignore
+    }
   }
 })
 /**** 葡萄城：报告编制的显示和隐藏 end ****/