调整待办事项列表查询接口

src/api/ApiRouter/index.ts

@@ -3,7 +3,26 @@ import {
   getBoilerPreClaimNumberApi,
   getPipePreClaimNumberApi,
   getpreClaimNumberApi,
+  getTaskEquipmentList,
+  getMajorIssuesAuditList,
 } from '@/api/task'
+import { getPendingVerificationListApi } from '@/api/pendingVerification'
+import { getPendingPreparationListApi } from '@/api/pendingPreparation'
+import { getApprovalListApi } from '@/api/pendingApproval'
+import { getRatifyListApi } from '@/api/pendingRatify'
+
+import {
+  getPipeTaskEquipmentList,
+  getPipePendingVerificationListApi,
+  getPipePendingPreparationListApi,
+  getPipeMajorIssuesAuditList,
+} from '@/api/pipe/pipeTaskOrder'
+import {
+  getBoilerTaskEquipmentList,
+  getBoilerPendingVerificationListApi,
+  getBoilerPendingPreparationListApi,
+  getBoilerMajorIssuesAuditList,
+} from '@/api/boiler/boilerTaskOrder'
 
 type Adapter = {
   inputAdapter: (data: any) => any
@@ -13,6 +32,12 @@ type Adapter = {
 
 export enum IndexFuncName {
   PreClaimNumberApi,
+  TaskEquipNumberApi,
+  PendingVerificationNumberApi,
+  PendingPreparationNumberApi,
+  ApprovalNumberApi,
+  RatifyNumberApi,
+  MajorIssuesAuditNumberApi,
 }
 
 const map = {
@@ -33,6 +58,120 @@ const map = {
       outputAdapter: null,
     },
   },
+  [IndexFuncName.TaskEquipNumberApi]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: null,
+      reqFunction: getBoilerTaskEquipmentList,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: null,
+      reqFunction: getPipeTaskEquipmentList,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getTaskEquipmentList,
+      outputAdapter: null,
+    },
+  },
+  [IndexFuncName.PendingVerificationNumberApi]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: null,
+      reqFunction: getBoilerPendingVerificationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: null,
+      reqFunction: getPipePendingVerificationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getPendingVerificationListApi,
+      outputAdapter: null,
+    },
+  },
+  [IndexFuncName.PendingPreparationNumberApi]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: null,
+      reqFunction: getBoilerPendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: null,
+      reqFunction: getPipePendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getPendingPreparationListApi,
+      outputAdapter: null,
+    },
+  },
+  [IndexFuncName.ApprovalNumberApi]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 600 }
+      },
+      reqFunction: getBoilerPendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 600 }
+      },
+      reqFunction: getPipePendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getApprovalListApi,
+      outputAdapter: null,
+    },
+  },
+  [IndexFuncName.RatifyNumberApi]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 700 }
+      },
+      reqFunction: getBoilerPendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 700 }
+      },
+      reqFunction: getPipePendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getRatifyListApi,
+      outputAdapter: null,
+    },
+  },
+  [IndexFuncName.MajorIssuesAuditNumberApi]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 700 }
+      },
+      reqFunction: getBoilerMajorIssuesAuditList,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 700 }
+      },
+      reqFunction: getPipeMajorIssuesAuditList,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getMajorIssuesAuditList,
+      outputAdapter: null,
+    },
+  },
 }
 
 export const requestFunc = (funcName: IndexFuncName, equipType: EquipmentType, params: any) => {
@@ -47,7 +186,7 @@ export const requestFunc = (funcName: IndexFuncName, equipType: EquipmentType, p
     throw new Error('api for send is not exists')
   }
   // 2. send req
-  const respData = adapter.reqFunction(params)
+  const respData = adapter.reqFunction(reqParams)
   // 3. output adapter
   let adaptedRespData = respData
   if (adapter.outputAdapter) {

src/api/ApiRouter/taskOrder.ts

@@ -8,7 +8,12 @@ import {
   cancelClaim,
   getUserGroupUserList,
   recheckApi,
+  getMajorIssuesAuditList,
 } from '@/api/task'
+import { getPendingVerificationListApi } from '@/api/pendingVerification'
+import { getPendingPreparationListApi } from '@/api/pendingPreparation'
+import { getApprovalListApi } from '@/api/pendingApproval'
+import { getRatifyListApi } from '@/api/pendingRatify'
 import {
   getPipeTaskConfirmPage,
   getPipeTaskEquipmentList,
@@ -18,6 +23,9 @@ import {
   cancelPipeEquipmentClaim,
   getPipeRecheckUserPage,
   submitPipeRecheck,
+  getPipePendingVerificationListApi,
+  getPipePendingPreparationListApi,
+  getPipeMajorIssuesAuditList,
 } from '@/api/pipe/pipeTaskOrder'
 import {
   getBoilerTaskConfirmPage,
@@ -29,6 +37,9 @@ import {
   getBoilerTaskItemListByOrderId,
   getBoilerRecheckUserPage,
   submitBoilerRecheck,
+  getBoilerPendingVerificationListApi,
+  getBoilerPendingPreparationListApi,
+  getBoilerMajorIssuesAuditList,
 } from '@/api/boiler/boilerTaskOrder'
 
 type Adapter = {
@@ -47,6 +58,11 @@ export enum TaskOrderFuncName {
   EquipmentCancelClaim,
   RecheckUserList,
   SubmitRecheck,
+  PendingVerificationList,
+  PendingPreparationList,
+  ApprovalList,
+  RatifyList,
+  MajorIssuesAuditList,
 }
 
 // 接口注册表（按接口、设备类型调用对应接口）
@@ -204,6 +220,103 @@ const map = {
       outputAdapter: null,
     },
   },
+  [TaskOrderFuncName.PendingVerificationList]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: null,
+      reqFunction: getBoilerPendingVerificationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: null,
+      reqFunction: getPipePendingVerificationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getPendingVerificationListApi,
+      outputAdapter: null,
+    },
+  },
+  [TaskOrderFuncName.PendingPreparationList]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: null,
+      reqFunction: getBoilerPendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: null,
+      reqFunction: getPipePendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getPendingPreparationListApi,
+      outputAdapter: null,
+    },
+  },
+  [TaskOrderFuncName.ApprovalList]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 600 }
+      },
+      reqFunction: getBoilerPendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 600 }
+      },
+      reqFunction: getPipePendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getApprovalListApi,
+      outputAdapter: null,
+    },
+  },
+  [TaskOrderFuncName.RatifyList]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 700 }
+      },
+      reqFunction: getBoilerPendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 700 }
+      },
+      reqFunction: getPipePendingPreparationListApi,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getRatifyListApi,
+      outputAdapter: null,
+    },
+  },
+  [TaskOrderFuncName.MajorIssuesAuditList]: {
+    [EquipmentType.BOILER]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 700 }
+      },
+      reqFunction: getBoilerMajorIssuesAuditList,
+      outputAdapter: null,
+    },
+    [EquipmentType.PIPE]: {
+      inputAdapter: (params: any) => {
+        return { ...params, taskStatus: 700 }
+      },
+      reqFunction: getPipeMajorIssuesAuditList,
+      outputAdapter: null,
+    },
+    [EquipmentType.CONTAINER]: {
+      inputAdapter: null,
+      reqFunction: getMajorIssuesAuditList,
+      outputAdapter: null,
+    },
+  },
 }
 
 export const requestFunc = (funcName: TaskOrderFuncName, equipType: EquipmentType, params: any) => {
@@ -218,7 +331,7 @@ export const requestFunc = (funcName: TaskOrderFuncName, equipType: EquipmentTyp
     throw new Error('api for send is not exists')
   }
   // 2. send req
-  const respData = adapter.reqFunction(params)
+  const respData = adapter.reqFunction(reqParams)
   // 3. output adapter
   let adaptedRespData = respData
   if (adapter.outputAdapter != null) {

src/api/boiler/boilerTaskOrder.ts

@@ -59,3 +59,18 @@ export const getBoilerRecheckUserPage = (params: any) => {
 export const submitBoilerRecheck = (data: any) => {
   return httpPUT('/pressure2/boiler-task-order/order-item/choice/recheck', data)
 }
+
+// 获取待校核分页
+export const getBoilerPendingVerificationListApi = (params: any) => {
+  return httpGet('/pressure2/boiler-task-order/order-item/recheck/page', params)
+}
+
+// 获取待编制分页
+export const getBoilerPendingPreparationListApi = (params: any) => {
+  return httpGet('/pressure2/boiler-task-order/order-item/prepare-report/page', params)
+}
+
+// 查询任务单详情，审核列表
+export const getBoilerMajorIssuesAuditList = (params: any) => {
+  return httpGet('/pressure2/boiler-task-order/order-item/major-issues/page', params)
+}

src/api/pendingRatify.ts

@@ -2,7 +2,7 @@ import { httpGet, httpPUT } from '@/utils/http'
 
 // 待批准列表
 export const getRatifyListApi = (params: any) => {
-  return httpGet('pressure/task-order/order-item/report/ratify/page', params)
+  return httpGet('/pressure/task-order/order-item/report/ratify/page', params)
 }
 
 // 退回

src/api/pipe/pipeTaskOrder.ts

@@ -54,3 +54,18 @@ export const getPipeRecheckUserPage = (params: any) => {
 export const submitPipeRecheck = (data: any) => {
   return httpPUT('/pressure2/pipe-task-order/order-item/choice/recheck', data)
 }
+
+// 获取待校核分页
+export const getPipePendingVerificationListApi = (params: any) => {
+  return httpGet('/pressure2/pipe-task-order/order-item/recheck/page', params)
+}
+
+// 获取待编制分页
+export const getPipePendingPreparationListApi = (params: any) => {
+  return httpGet('/pressure2/pipe-task-order/order-item/prepare-report/page', params)
+}
+
+// 查询任务单详情，审核列表
+export const getPipeMajorIssuesAuditList = (params: any) => {
+  return httpGet('/pressure2/pipe-task-order/order-item/major-issues/page', params)
+}

src/pages/home/index.vue

@@ -95,11 +95,7 @@ import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
 import { useUserStore } from '@/store/user'
 import { useConfigStore } from '@/store/config'
 import { EquipmentType } from '@/utils/dictMap'
-import { getMajorIssuesAuditList, getTaskEquipmentList, getTaskOrder } from '@/api/task'
-import { getPendingVerificationListApi } from '@/api/pendingVerification'
-import { getPendingPreparationListApi } from '@/api/pendingPreparation'
-import { getApprovalListApi } from '@/api/pendingApproval'
-import { getRatifyListApi } from '@/api/pendingRatify'
+import { getTaskOrder } from '@/api/task'
 import iconMap from '@/utils/imagesMap'
 import CardItem, { type CardObj } from './components/CardItem.vue'
 import { requestFunc, IndexFuncName } from '@/api/ApiRouter/index'
@@ -246,7 +242,7 @@ const getUnEnterNum = async (userId: string) => {
 
 // 获取分配项目数量
 const getCheckerOwnTaskNum = async () => {
-  const result = await getTaskEquipmentList({
+  const result = await requestFunc(IndexFuncName.TaskEquipNumberApi, equipType.value, {
     pageNo: 1,
     pageSize: 10,
     taskStatusList: [400, 500, 510],
@@ -264,7 +260,7 @@ const getCheckerOwnTaskNum = async () => {
 const getVerificationListNum = async () => {
   if (!userInfo.value || !userInfo.value.id) return 0
 
-  const result = await getPendingVerificationListApi({
+  const result = await requestFunc(IndexFuncName.PendingVerificationNumberApi, equipType.value, {
     pageNo: 1,
     pageSize: 10,
     recheckStrIds: userInfo.value.id,
@@ -280,7 +276,7 @@ const getVerificationListNum = async () => {
 const getPendingPreparationListNum = async () => {
   if (!userInfo.value || !userInfo.value.id) return 0
 
-  const result = await getPendingPreparationListApi({
+  const result = await requestFunc(IndexFuncName.PendingPreparationNumberApi, equipType.value, {
     pageNo: 1,
     pageSize: 10,
     mainCheckerStrIds: userInfo.value.id,
@@ -296,7 +292,7 @@ const getPendingPreparationListNum = async () => {
 const getApprovalListNum = async () => {
   if (!userInfo.value || !userInfo.value.id) return 0
 
-  const result = await getApprovalListApi({
+  const result = await requestFunc(IndexFuncName.ApprovalNumberApi, equipType.value, {
     pageNo: 1,
     pageSize: 10,
     approveStrIds: userInfo.value.id,
@@ -312,7 +308,7 @@ const getApprovalListNum = async () => {
 const getRatifyListNum = async () => {
   if (!userInfo.value || !userInfo.value.id) return 0
 
-  const result = await getRatifyListApi({
+  const result = await requestFunc(IndexFuncName.RatifyNumberApi, equipType.value, {
     pageNo: 1,
     pageSize: 10,
     ratifyStrIds: userInfo.value.id,
@@ -328,7 +324,7 @@ const getRatifyListNum = async () => {
 const getInspectionPlanAuditListNum = async (params: Record<string, any>) => {
   if (!userInfo.value || !userInfo.value.id) return 0
 
-  const result = await getMajorIssuesAuditList({
+  const result = await requestFunc(IndexFuncName.MajorIssuesAuditNumberApi, equipType.value, {
     pageNo: 1,
     pageSize: 10,
     ...params,

src/pages/inspectionApproval/list/inspectionApprovalList.vue

@@ -50,9 +50,10 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
 import { useUserStore } from '@/store/user'
-import { getMajorIssuesAuditList } from '@/api/task'
+import { useConfigStore } from '@/store/config'
 import Item from '@/pages/inspectionPlanAudit/components/Item.vue'
 import NavBar from '@/components/NavBar/NavBar.vue'
+import { requestFunc, TaskOrderFuncName } from '@/api/ApiRouter/taskOrder'
 
 defineOptions({
   name: 'InspectionApprovalList',
@@ -74,6 +75,7 @@ const params = reactive({
 const userStore = useUserStore()
 const userInfo = computed(() => userStore.userInfo)
 params.bpmUserId = userInfo.value?.id || ''
+const equipType = useConfigStore().getEquipType()
 
 const rightType = ref('100')
 const rightTypeList = [
@@ -88,7 +90,7 @@ const fetchList = async (refresh = false) => {
   params.pageNo = refresh ? 1 : params.pageNo + 1
   loading.value = true
   try {
-    const result: any = await getMajorIssuesAuditList(params)
+    const result: any = await requestFunc(TaskOrderFuncName.MajorIssuesAuditList, equipType, params)
     const newList = result?.data?.list || []
     if (refresh) {
       listData.value = newList
@@ -220,8 +222,8 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   padding: 60px 0;
-  color: #999;
   font-size: 14px;
+  color: #999;
 }
 
 .item-box {

src/pages/inspectionPlanAudit/list/InspectionPlanAuditList.vue

@@ -35,11 +35,7 @@
     <!-- 列表 -->
     <scroll-view class="list-scroll" scroll-y @scrolltolower="loadMore">
       <view v-for="item in listData" :key="item.id" class="item-box">
-        <Item
-          :item="item"
-          :operate-text="'审核'"
-          @handle-operation="pushAction"
-        />
+        <Item :item="item" :operate-text="'审核'" @handle-operation="pushAction" />
       </view>
 
       <view v-if="loading" class="loading-text">加载中...</view>
@@ -54,9 +50,10 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
 import { useUserStore } from '@/store/user'
-import { getMajorIssuesAuditList } from '@/api/task'
+import { useConfigStore } from '@/store/config'
 import Item from '@/pages/inspectionPlanAudit/components/Item.vue'
 import NavBar from '@/components/NavBar/NavBar.vue'
+import { requestFunc, TaskOrderFuncName } from '@/api/ApiRouter/taskOrder'
 
 defineOptions({
   name: 'InspectionPlanAuditList',
@@ -76,6 +73,7 @@ const params = reactive({
 
 const userStore = useUserStore()
 const userInfo = computed(() => userStore.userInfo)
+const equipType = useConfigStore().getEquipType()
 
 // 初始化参数
 params.bpmUserId = userInfo.value?.id || ''
@@ -96,7 +94,7 @@ const fetchList = async (refresh = false) => {
 
   loading.value = true
   try {
-    const result: any = await getMajorIssuesAuditList(params)
+    const result: any = await requestFunc(TaskOrderFuncName.MajorIssuesAuditList, equipType, params)
     const newList = result?.data?.list || []
 
     if (refresh) {
@@ -165,8 +163,8 @@ onUnmounted(() => {
 
 .navigate-view {
   display: flex;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
   height: 44px;
   background-color: #fff;
   border-bottom: 1px solid #eee;
@@ -200,19 +198,19 @@ onUnmounted(() => {
 }
 
 .checkbox {
-  width: 18px;
-  height: 18px;
-  border-radius: 100%;
-  border: 1px solid #bbb;
   display: flex;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
+  width: 18px;
+  height: 18px;
   margin-right: 6px;
+  border: 1px solid #bbb;
+  border-radius: 100%;
 }
 
 .checkbox.checked {
-  border-width: 0;
   background-color: #2f8eff;
+  border-width: 0;
 }
 
 .checkbox-text {
@@ -227,10 +225,10 @@ onUnmounted(() => {
 
 .loading-text,
 .no-more-text {
-  text-align: center;
   padding: 15px;
-  color: #999;
   font-size: 14px;
+  color: #999;
+  text-align: center;
 }
 
 .empty-text {
@@ -239,8 +237,8 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   padding: 60px 0;
-  color: #999;
   font-size: 14px;
+  color: #999;
 }
 
 .item-box {

src/pages/pendingApproval/list/PendingApprovalList.vue

@@ -43,10 +43,11 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
 import { useUserStore } from '@/store/user'
-import { getApprovalListApi } from '@/api/pendingApproval'
+import { useConfigStore } from '@/store/config'
 import QueryView from '@/pages/pendingVerification/components/query/QueryView.vue'
 import Item from '@/pages/pendingVerification/list/Item.vue'
 import NavBar from '@/components/NavBar/NavBar.vue'
+import { requestFunc, TaskOrderFuncName } from '@/api/ApiRouter/taskOrder'
 
 defineOptions({
   name: 'PendingApprovalList',
@@ -64,6 +65,7 @@ const params = reactive({
 
 const userStore = useUserStore()
 const userInfo = computed(() => userStore.userInfo)
+const equipType = useConfigStore().getEquipType()
 
 // 初始化参数
 params.approveStrIds = userInfo.value?.id || ''
@@ -72,15 +74,17 @@ const queryType = { value: '审核人', id: 'approveStrIds' }
 
 // 生成报告列表
 const reportDOList = (item: any) => {
-  return [{
-    id: item.id,
-    reportId: item.reportId,
-    reportType: Number(item.reportType),
-    reportName: item.reportName,
-    image: item.image,
-    video: item.video,
-    attachment: item.attachment,
-  }]
+  return [
+    {
+      id: item.id,
+      reportId: item.reportId,
+      reportType: Number(item.reportType),
+      reportName: item.reportName,
+      image: item.image,
+      video: item.video,
+      attachment: item.attachment,
+    },
+  ]
 }
 
 // 获取列表数据
@@ -91,7 +95,7 @@ const fetchList = async (refresh = false) => {
 
   loading.value = true
   try {
-    const result: any = await getApprovalListApi(params)
+    const result: any = await requestFunc(TaskOrderFuncName.ApprovalList, equipType, params)
     const newList = result?.data?.list || []
 
     if (refresh) {
@@ -172,8 +176,8 @@ onUnmounted(() => {
 
 .navigate-view {
   display: flex;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
   height: 44px;
   background-color: #fff;
   border-bottom: 1px solid #eee;
@@ -192,10 +196,10 @@ onUnmounted(() => {
 
 .loading-text,
 .no-more-text {
-  text-align: center;
   padding: 15px;
-  color: #999;
   font-size: 14px;
+  color: #999;
+  text-align: center;
 }
 
 .empty-text {
@@ -204,8 +208,8 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   padding: 60px 0;
-  color: #999;
   font-size: 14px;
+  color: #999;
 }
 
 .item-box {

src/pages/pendingPreparation/list/PendingPreparationList.vue

@@ -43,10 +43,11 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted } from 'vue'
 import { useUserStore } from '@/store/user'
-import { getPendingPreparationListApi } from '@/api/pendingPreparation'
+import { useConfigStore } from '@/store/config'
 import QueryView from '@/pages/pendingVerification/components/query/QueryView.vue'
 import Item from '@/pages/pendingVerification/list/Item.vue'
 import NavBar from '@/components/NavBar/NavBar.vue'
+import { requestFunc, TaskOrderFuncName } from '@/api/ApiRouter/taskOrder'
 
 defineOptions({
   name: 'PendingPreparationList',
@@ -64,6 +65,7 @@ const params = reactive({
 
 const userStore = useUserStore()
 const userInfo = computed(() => userStore.userInfo)
+const equipType = useConfigStore().getEquipType()
 
 // 初始化参数
 params.mainCheckerStrIds = userInfo.value?.id || ''
@@ -78,7 +80,11 @@ const fetchList = async (refresh = false) => {
 
   loading.value = true
   try {
-    const result: any = await getPendingPreparationListApi(params)
+    const result: any = await requestFunc(
+      TaskOrderFuncName.PendingPreparationList,
+      equipType,
+      params,
+    )
     const newList = result?.data?.list || []
 
     if (refresh) {
@@ -146,8 +152,8 @@ onMounted(() => {
 
 .navigate-view {
   display: flex;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
   height: 44px;
   background-color: #fff;
   border-bottom: 1px solid #eee;
@@ -166,10 +172,10 @@ onMounted(() => {
 
 .loading-text,
 .no-more-text {
-  text-align: center;
   padding: 15px;
-  color: #999;
   font-size: 14px;
+  color: #999;
+  text-align: center;
 }
 
 .empty-text {
@@ -178,8 +184,8 @@ onMounted(() => {
   align-items: center;
   justify-content: center;
   padding: 60px 0;
-  color: #999;
   font-size: 14px;
+  color: #999;
 }
 
 .item-box {

src/pages/pendingRatify/list/PendingRatifyList.vue

@@ -43,10 +43,12 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted } from 'vue'
 import { useUserStore } from '@/store/user'
+import { useConfigStore } from '@/store/config'
 import { getRatifyListApi } from '@/api/pendingRatify'
 import QueryView from '@/pages/pendingVerification/components/query/QueryView.vue'
 import Item from '@/pages/pendingVerification/list/Item.vue'
 import NavBar from '@/components/NavBar/NavBar.vue'
+import { requestFunc, TaskOrderFuncName } from '@/api/ApiRouter/taskOrder'
 
 defineOptions({
   name: 'PendingRatifyList',
@@ -64,6 +66,7 @@ const params = reactive({
 
 const userStore = useUserStore()
 const userInfo = computed(() => userStore.userInfo)
+const equipType = useConfigStore().getEquipType()
 
 // 初始化参数
 params.ratifyStrIds = userInfo.value?.id || ''
@@ -72,15 +75,17 @@ const queryType = { value: '审批人', id: 'ratifyStrIds' }
 
 // 生成报告列表
 const reportDOList = (item: any) => {
-  return [{
-    id: item.id,
-    reportId: item.reportId,
-    reportName: item.reportName,
-    reportType: Number(item.reportType),
-    image: item.image,
-    video: item.video,
-    attachment: item.attachment,
-  }]
+  return [
+    {
+      id: item.id,
+      reportId: item.reportId,
+      reportName: item.reportName,
+      reportType: Number(item.reportType),
+      image: item.image,
+      video: item.video,
+      attachment: item.attachment,
+    },
+  ]
 }
 
 // 获取列表数据
@@ -91,7 +96,7 @@ const fetchList = async (refresh = false) => {
 
   loading.value = true
   try {
-    const result: any = await getRatifyListApi(params)
+    const result: any = await requestFunc(TaskOrderFuncName.RatifyList, equipType, params)
     const newList = result?.data?.list || []
 
     if (refresh) {
@@ -159,8 +164,8 @@ onMounted(() => {
 
 .navigate-view {
   display: flex;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
   height: 44px;
   background-color: #fff;
   border-bottom: 1px solid #eee;
@@ -179,10 +184,10 @@ onMounted(() => {
 
 .loading-text,
 .no-more-text {
-  text-align: center;
   padding: 15px;
-  color: #999;
   font-size: 14px;
+  color: #999;
+  text-align: center;
 }
 
 .empty-text {
@@ -191,8 +196,8 @@ onMounted(() => {
   align-items: center;
   justify-content: center;
   padding: 60px 0;
-  color: #999;
   font-size: 14px;
+  color: #999;
 }
 
 .item-box {

src/pages/pendingVerification/list/PendingVerificationList.vue

@@ -43,10 +43,11 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
 import { useUserStore } from '@/store/user'
-import { getPendingVerificationListApi } from '@/api/pendingVerification'
+import { useConfigStore } from '@/store/config'
 import QueryView from '@/pages/pendingVerification/components/query/QueryView.vue'
 import Item from '@/pages/pendingVerification/list/Item.vue'
 import NavBar from '@/components/NavBar/NavBar.vue'
+import { requestFunc, TaskOrderFuncName } from '@/api/ApiRouter/taskOrder'
 
 defineOptions({
   name: 'PendingVerificationList',
@@ -64,6 +65,7 @@ const params = reactive({
 
 const userStore = useUserStore()
 const userInfo = computed(() => userStore.userInfo)
+const equipType = useConfigStore().getEquipType()
 
 // 初始化参数
 params.recheckStrIds = userInfo.value?.id || ''
@@ -78,7 +80,7 @@ const fetchList = async (refresh = false) => {
 
   loading.value = true
   try {
-    const result = await getPendingVerificationListApi(params)
+    const result = await requestFunc(TaskOrderFuncName.PendingVerificationList, equipType, params)
     const newList = result?.data?.list || []
 
     if (refresh) {
@@ -126,15 +128,17 @@ const reportDOList = (item: any) => {
   if (recheckList.length) {
     return recheckList
   }
-  return [{
-    id: item.id,
-    reportId: item.reportId,
-    reportName: item.reportName,
-    reportType: item.reportType,
-    image: item.image,
-    video: item.video,
-    attachment: item.attachment,
-  }]
+  return [
+    {
+      id: item.id,
+      reportId: item.reportId,
+      reportName: item.reportName,
+      reportType: item.reportType,
+      image: item.image,
+      video: item.video,
+      attachment: item.attachment,
+    },
+  ]
 }
 
 // 跳转操作
@@ -173,8 +177,8 @@ onUnmounted(() => {
 
 .navigate-view {
   display: flex;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
   height: 44px;
   background-color: #fff;
   border-bottom: 1px solid #eee;
@@ -193,10 +197,10 @@ onUnmounted(() => {
 
 .loading-text,
 .no-more-text {
-  text-align: center;
   padding: 15px;
-  color: #999;
   font-size: 14px;
+  color: #999;
+  text-align: center;
 }
 
 .empty-text {
@@ -205,8 +209,8 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   padding: 60px 0;
-  color: #999;
   font-size: 14px;
+  color: #999;
 }
 
 .item-box {

src/pages/workInstructionAudit/list/WorkInstructionAuditList.vue

@@ -47,9 +47,10 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
 import { useUserStore } from '@/store/user'
-import { getMajorIssuesAuditList } from '@/api/task'
+import { useConfigStore } from '@/store/config'
 import Item from '@/pages/inspectionPlanAudit/components/Item.vue'
 import NavBar from '@/components/NavBar/NavBar.vue'
+import { requestFunc, TaskOrderFuncName } from '@/api/ApiRouter/taskOrder'
 
 defineOptions({ name: 'WorkInstructionAuditList' })
 
@@ -67,6 +68,7 @@ const params = reactive({
 const userStore = useUserStore()
 const userInfo = computed(() => userStore.userInfo)
 params.bpmUserId = userInfo.value?.id || ''
+const equipType = useConfigStore().getEquipType()
 
 const rightType = ref('100')
 const rightTypeList = [
@@ -81,7 +83,7 @@ const fetchList = async (refresh = false) => {
   params.pageNo = refresh ? 1 : params.pageNo + 1
   loading.value = true
   try {
-    const result: any = await getMajorIssuesAuditList(params)
+    const result: any = await requestFunc(TaskOrderFuncName.MajorIssuesAuditList, equipType, params)
     const newList = result?.data?.list || []
     if (refresh) {
       listData.value = newList
@@ -212,8 +214,8 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   padding: 60px 0;
-  color: #999;
   font-size: 14px;
+  color: #999;
 }
 
 .item-box {