作业指导书审核调整

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

@@ -43,7 +43,7 @@
       <el-form-item label="批准人" prop="workInstructionAuditId">
         <el-select v-model="formValueData.workInstructionAuditId" clearable placeholder="请选择">
           <el-option
-            v-for="item in optionList.guidebookApproveList"
+            v-for="item in optionList.guidebookApproveList.list"
             :key="item.id"
             :label="item.nickname"
             :value="item.id"
@@ -87,6 +87,7 @@ import {editReport} from "@/utils/reportUtil";
 import {DynamicTbColApi} from "@/api/pressure2/dynamictbcol";
 import {SpreadViewer} from "@/components/DynamicReport";
 import {InitParams} from "@/components/DynamicReport/SpreadInterface";
+import {PipeTaskOrderApi} from "@/api/pressure2/pipetaskorder";
 
 const { submitOpinionNoticeApproval } = BoilerTaskOrderApi
 const userStore = useUserStore()
@@ -339,14 +340,19 @@ const approvalUserVisible = ref(false)
 // 获取审核人信息
 const getGuidebookApproveList = async () => {
   try {
-    const { workInstructionAuditId } = await UserApi.getApprovalDetail({})
-    formValueData.value = {
-      workInstructionAuditId
-    }
-    optionList.guidebookApproveList = await UserGroupApi.getUserGroupUserList({
-      category: 500,
-      status: 0
+    // const { workInstructionAuditId } = await UserApi.getApprovalDetail({})
+    // formValueData.value = {
+    //   workInstructionAuditId
+    // }
+    // optionList.guidebookApproveList = await UserGroupApi.getUserGroupUserList({
+    //   category: 500,
+    //   status: 0
+    // })
+
+    optionList.guidebookApproveList = await BoilerTaskOrderApi.getAuditList({
+      roleCode: 'WorkBookApprover'
     })
+
     approvalUserVisible.value = true
   } catch (error) {}
 }

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

@@ -43,7 +43,7 @@
       <el-form-item label="批准人" prop="workInstructionAuditId">
         <el-select v-model="formValueData.workInstructionAuditId" clearable placeholder="请选择">
           <el-option
-            v-for="item in optionList.guidebookApproveList"
+            v-for="item in optionList.guidebookApproveList.list"
             :key="item.id"
             :label="item.nickname"
             :value="item.id"
@@ -335,14 +335,19 @@ const approvalUserVisible = ref(false)
 // 获取审核人信息
 const getGuidebookApproveList = async () => {
   try {
-    const { workInstructionAuditId } = await UserApi.getApprovalDetail({})
-    formValueData.value = {
-      workInstructionAuditId
-    }
-    optionList.guidebookApproveList = await UserGroupApi.getUserGroupUserList({
-      category: 500,
-      status: 0
+    // const { workInstructionAuditId } = await UserApi.getApprovalDetail({})
+    // formValueData.value = {
+    //   workInstructionAuditId
+    // }
+    // optionList.guidebookApproveList = await UserGroupApi.getUserGroupUserList({
+    //   category: 500,
+    //   status: 0
+    // })
+
+    optionList.guidebookApproveList = await PipeTaskOrderApi.getAuditList({
+      roleCode: 'WorkBookApprover'
     })
+
     approvalUserVisible.value = true
   } catch (error) {}
 }