更新

yudao-ui-admin-vue3/src/api/pressure/acceptorder/index.ts

@@ -42,7 +42,7 @@ export interface AcceptOrderVO {
 export const AcceptOrderApi = {
   // 查询受理单分页
   getAcceptOrderPage: async (params: any) => {
-    return await request.get({ url: `/pressure/accept-order/page`, params })
+    return await request.get({ url: `/pressure2/accept-order/page`, params })
   },
 
   // 查询受理单详情
@@ -119,4 +119,4 @@ export const AcceptOrderApi = {
   printAcceptOrderPdf: async (params) => {
     return await request.download({ url: `/pressure/accept-order/print`, params })
   }
-}
+}

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

@@ -755,6 +755,10 @@ export const BoilerTaskOrderApi = {
   // 获取OA待办事项审批链接
   getAffairLink: async (summaryId: string) => {
     return await request.get({ url: '/pressure2/external-oa/getAffairLink', params: { summaryId } })
+  }, 
+  // 获取OA待办事项
+  getAffairSummaryList: async () => {
+    return await request.get({ url: '/pressure2/external-oa/getAffairSummaryList'})
   },
 
   // 根据summaryId更新单个报告状态

yudao-ui-admin-vue3/src/views/pressure/acceptorder/index.vue

@@ -85,6 +85,7 @@
   import { usePageLoading } from '@/hooks/web/usePageLoading'
   import { SmartInstanceExpose, SmartTableColumn, SmartSearchFormOptionItem } from '@/types/table'
   import { getDeptList } from '@/api/laboratory/dept'
+import { PressureEquipMainTypeMap } from '@/utils/constants'
   const dictStore = useDictStore()
   const userStore = useUserStore()
   const getCurrentUserRoles = computed(() => userStore.getRoles)
@@ -188,6 +189,20 @@
     }
   },
     {
+      label: '设备类型',
+      prop: 'equipMainType',
+      width: 100,
+      search: {
+        type: 'select',  // 改为select类型
+        options: Object.entries(PressureEquipMainTypeMap).map(([value, label]) => ({
+          label,
+          value: parseInt(value)  // 确保值是数字类型
+        }))
+      },
+      render: (row, value) => {
+        return !value ? '-' : PressureEquipMainTypeMap[value]
+      }
+    },{
       label: '检验性质',
       prop: 'checkType',
       width: 100,

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

@@ -1580,23 +1580,24 @@ const handleCancelFlow = async () => {
     }
   }).catch(() => {})
 }
-
+const oaSummaryList = ref([])
 // 判断"OA审核"按钮是否显示：报告审核或审批阶段，且有OA流程ID，且当前用户是对应阶段的审核人/审批人
 const isCanOAAudit = computed(() => {
   if (!props.selectedItem) return false
-  const { taskStatus, summaryId, approvalId, ratifyId } = props.selectedItem
-  const currentUserId = userStore?.user?.id
-  
+  // const { taskStatus, summaryId, approvalId, ratifyId } = props.selectedItem
+  const {summaryId} = props.selectedItem
+  // const currentUserId = userStore?.user?.id
+
   // 审核阶段：只有审核人才能点击
-  if (taskStatus === PressureCheckerMyTaskStatus['REPORT_AUDIT']) {
-    return !!summaryId && approvalId === currentUserId
-  }
-  
   // 审批阶段：只有审批人才能点击
-  if (taskStatus === PressureCheckerMyTaskStatus['REPORT_APPROVE']) {
-    return !!summaryId && ratifyId === currentUserId
+  if (taskStatus === PressureCheckerMyTaskStatus['REPORT_AUDIT'] || taskStatus === PressureCheckerMyTaskStatus['REPORT_APPROVE']) {
+
+    // 检查是否在OA待办事项中
+    const isOaSummary = oaSummaryList.value.some(item => item == summaryId)
+    if (!isOaSummary) return false
+
+    return true
   }
-  
   return false
 })
 
@@ -1621,6 +1622,9 @@ const handleOpenOAAudit = async () => {
           clearInterval(oaAuditTimer.value!)
           oaAuditTimer.value = null
           BoilerTaskOrderApi.updateReportBySummaryId(props.selectedItem.summaryId).finally(() => emit('refresh'))
+            BoilerTaskOrderApi.getAffairSummaryList().then((res) => {
+              oaSummaryList.value = res || []
+            })
         }
       }, 500)
     } else if (!win) {
@@ -2345,7 +2349,9 @@ const handleShowAssociationOperationManual = () => {
 onMounted(() => {
   console.log(props)
   //initPreview()
-
+  BoilerTaskOrderApi.getAffairSummaryList().then((res) => {
+    oaSummaryList.value = res || []
+  })
 })
 
 const initPreview=()=>{

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

@@ -1552,23 +1552,21 @@ const handleCancelFlow = async () => {
     }
   }).catch(() => {})
 }
-
+const oaSummaryList = ref([])
 // 判断"OA审核"按钮是否显示：报告审核或审批阶段，且有OA流程ID，且当前用户是对应阶段的审核人/审批人
 const isCanOAAudit = computed(() => {
   if (!props.selectedItem) return false
-  const { taskStatus, summaryId, approvalId, ratifyId } = props.selectedItem
-  const currentUserId = userStore?.user?.id
-  
+  // const { taskStatus, summaryId, approvalId, ratifyId } = props.selectedItem
+  const {summaryId} = props.selectedItem
+  // const currentUserId = userStore?.user?.id
+
   // 审核阶段：只有审核人才能点击
-  if (taskStatus === PressureCheckerMyTaskStatus['REPORT_AUDIT']) {
-    return !!summaryId && approvalId === currentUserId
-  }
-  
   // 审批阶段：只有审批人才能点击
-  if (taskStatus === PressureCheckerMyTaskStatus['REPORT_APPROVE']) {
-    return !!summaryId && ratifyId === currentUserId
+  if (taskStatus === PressureCheckerMyTaskStatus['REPORT_AUDIT'] || taskStatus === PressureCheckerMyTaskStatus['REPORT_APPROVE']) {
+    const isOaSummary = oaSummaryList.value.some(item => item == summaryId)
+    if (!isOaSummary) return false
+    return true
   }
-  
   return false
 })
 
@@ -1593,6 +1591,9 @@ const handleOpenOAAudit = async () => {
           clearInterval(oaAuditTimer.value!)
           oaAuditTimer.value = null
           PipeTaskOrderApi.updateReportBySummaryId(props.selectedItem.summaryId).finally(() => handleRefresh())
+            BoilerTaskOrderApi.getAffairSummaryList().then((res) => {
+              oaSummaryList.value = res || []
+            })
         }
       }, 500)
     } else if (!win) {
@@ -2420,6 +2421,10 @@ const handleWindowResize = debounce(async () => {
 onMounted(() => {
   handleWindowResize()
   window.addEventListener('resize', handleWindowResize)
+
+  BoilerTaskOrderApi.getAffairSummaryList().then((res) => {
+    oaSummaryList.value = res || []
+  })
 })
 onUnmounted(() => {
   window.removeEventListener('resize', handleWindowResize)

yudao-ui-admin-vue3/src/views/pressure2/pipeequipment/index.vue

@@ -134,13 +134,13 @@
           <Icon icon="ep:document-copy" class="mr-5px" /> 复制管道
         </el-button> -->
         <!-- 同步市局 -->
-        <el-button
-          type="primary"
-          plain
-          @click="handleSyncCity"
-        >
-          <Icon icon="ep:refresh" class="mr-5px" /> 同步市局
-        </el-button>
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          @click="handleSyncCity"-->
+<!--        >-->
+<!--          <Icon icon="ep:refresh" class="mr-5px" /> 同步市局-->
+<!--        </el-button>-->
                 <el-button
           type="success"
           plain