检验方案审核调整

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

@@ -569,4 +569,11 @@ export const BoilerTaskOrderApi = {
   handleCompletion: async (id: string) => {
     return await request.post({ url: `/pressure2/boiler-task-order-item-report/handleCompletion/`+id })
   },
+
+  // 获取主任部长列表
+  getAuditList : async (params) => {
+    // roleCode: Pipeline Director 管道主任 Minister_Pipelines 管道部长
+    // roleCode: Boiler Director 锅炉主任  Boiler_Department_Head 锅炉部长
+    return request.get({ url: '/system/user/get-by-role', params })
+  }
 }

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

@@ -576,4 +576,11 @@ export const PipeTaskOrderApi = {
   handleCompletion: async (id: string) => {
     return await request.post({ url: `/pressure2/pipe-task-order-item-report/handleCompletion/`+id })
   },
+
+  // 获取主任部长列表
+  getAuditList : async (params) => {
+    // roleCode: Pipeline Director 管道主任 Minister_Pipelines 管道部长
+    // roleCode: Boiler Director 锅炉主任  Boiler_Department_Head 锅炉部长
+    return request.get({ url: '/system/user/get-by-role', params })
+  }
 }

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

@@ -83,7 +83,7 @@
       <el-form-item label="检验方案审核人" prop="inspectionAuditId">
         <el-select v-model="formData.inspectionAuditId" clearable placeholder="请选择">
           <el-option
-            v-for="item in optionList.schemeReviewerList"
+            v-for="item in optionList.schemeReviewerList.list"
             :key="item.id"
             :label="item.nickname"
             :value="item.id"
@@ -94,7 +94,7 @@
       <el-form-item label="检验方案批准人" prop="inspectionApproveId">
         <el-select v-model="formData.inspectionApproveId" clearable placeholder="请选择">
           <el-option
-            v-for="item in optionList.schemeApproveList"
+            v-for="item in optionList.schemeApproveList.list"
             :key="item.id"
             :label="item.nickname"
             :value="item.id"
@@ -132,6 +132,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 props = defineProps({
   taskOrderDetail: {
@@ -175,19 +176,19 @@ const approvalUserVisible = ref(false)
 // 获取审核人信息
 const getSchemeReviewerList = async () => {
   try {
-    const { inspectionAuditId, inspectionApproveId } = await UserApi.getApprovalDetail({})
-    formData.value = {
-      inspectionAuditId,
-      inspectionApproveId
-    }
-    optionList.schemeReviewerList = await UserGroupApi.getUserGroupUserList({
-      category: 600,
-      status: 0
+    // const { inspectionAuditId, inspectionApproveId } = await UserApi.getApprovalDetail({})
+    // formData.value = {
+    //   inspectionAuditId,
+    //   inspectionApproveId
+    // }
+
+    optionList.schemeReviewerList = await BoilerTaskOrderApi.getAuditList({
+      roleCode: 'Boiler Director'
     })
-    optionList.schemeApproveList = await UserGroupApi.getUserGroupUserList({
-      category: 700,
-      status: 0
+    optionList.schemeApproveList = await BoilerTaskOrderApi.getAuditList({
+      roleCode: 'Boiler_Department_Head'
     })
+
     approvalUserVisible.value = true
   } catch (error) {}
 }

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

@@ -85,7 +85,7 @@
       <el-form-item label="检验方案审核人" prop="inspectionAuditId">
         <el-select v-model="formData.inspectionAuditId" clearable placeholder="请选择">
           <el-option
-            v-for="item in optionList.schemeReviewerList"
+            v-for="item in optionList.schemeReviewerList.list"
             :key="item.id"
             :label="item.nickname"
             :value="item.id"
@@ -96,7 +96,7 @@
       <el-form-item label="检验方案批准人" prop="inspectionApproveId">
         <el-select v-model="formData.inspectionApproveId" clearable placeholder="请选择">
           <el-option
-            v-for="item in optionList.schemeApproveList"
+            v-for="item in optionList.schemeApproveList.list"
             :key="item.id"
             :label="item.nickname"
             :value="item.id"
@@ -177,19 +177,18 @@ const approvalUserVisible = ref(false)
 // 获取审核人信息
 const getSchemeReviewerList = async () => {
   try {
-    const { inspectionAuditId, inspectionApproveId } = await UserApi.getApprovalDetail({})
-    formData.value = {
-      inspectionAuditId,
-      inspectionApproveId
-    }
-    optionList.schemeReviewerList = await UserGroupApi.getUserGroupUserList({
-      category: 600,
-      status: 0
+    // const { inspectionAuditId, inspectionApproveId } = await UserApi.getApprovalDetail({})
+    // formData.value = {
+    //   inspectionAuditId,
+    //   inspectionApproveId
+    // }
+    optionList.schemeReviewerList = await PipeTaskOrderApi.getAuditList({
+      roleCode: 'Pipeline Director'
     })
-    optionList.schemeApproveList = await UserGroupApi.getUserGroupUserList({
-      category: 700,
-      status: 0
+    optionList.schemeApproveList = await PipeTaskOrderApi.getAuditList({
+      roleCode: 'Minister_Pipelines'
     })
+
     approvalUserVisible.value = true
   } catch (error) {}
 }