feat(pressure): 优化压力容器管理系统界面和功能

- 在多个搜索输入框中添加搜索按钮图标，提升用户体验
- 重构设备预约模块API接口，分离锅炉和管道的待约检接口
- 添加容器、锅炉、管道的独立分页和数据处理逻辑
- 集成字典标签转换功能，优化数据展示
- 调整页面路由路径，统一导航地址
- 优化检验性质管理模块的查询逻辑和分页处理
- 添加动态表格编辑权限控制，禁用状态数据不可编辑
- 修复设备详情页面参数传递和初始化逻辑

yudao-ui-admin-vue3/src/components/SmartTable/components/selectUserModal.vue

@@ -33,7 +33,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -210,7 +210,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

yudao-ui-admin-vue3/src/views/pressure/checker/myTask.vue

@@ -533,7 +533,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

yudao-ui-admin-vue3/src/views/pressure/checker/recordCheck.vue

@@ -352,7 +352,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

yudao-ui-admin-vue3/src/views/pressure/checker/reportCheck.vue

@@ -334,7 +334,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -1,14 +1,19 @@
 import request from '@/config/axios'
 
 export default {
-  // 容器待约检接口（pressure1模块）
+  // 容器待约检接口（pressure模块）
   getContainerPage: (data: any) => {
     return request.post({ url: '/pressure/equip-container/pending-inspection-page', data })
   },
-  // 锅炉和管道待约检接口（pressure2模块）
-  getPage: (data: any) => {
-    return request.get({ url: '/pressure2/plan-scheduling/frontDeskPage', params: data })
+  // 锅炉待约检接口（pressure2模块）
+  getBoilerPage: (data: any) => {
+    return request.get({ url: '/pressure2/plan-scheduling/pending-inspection-page/boiler', params: data })
   },
+  // 管道待约检接口（pressure2模块）
+  getPipePage: (data: any) => {
+    return request.get({ url: '/pressure2/plan-scheduling/pending-inspection-page/pipe', params: data })
+  },
+  // 容器导出Excel（pressure模块）
   downloadExportEquipsExcelApi: async (data) => {
     const timeout = 1000 * 60 * 5 // 5min
     return await request.download2({ url: `/pressure/equip-container/pending-inspection-export-excel`, data, timeout })

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

@@ -172,7 +172,7 @@ import EquipContainerForm from '@/components/EquipContainerForm/index.vue'
 import EquipBoilerForm from '@/components/EquipBoilerForm/index.vue'
 import EquipPipeForm from '@/components/EquipPipeForm/index.vue'
 import AreaSelect from '@/views/system/equipcontainer/components/AreaSelect.vue'
-import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getStrDictOptions, getDictLabel, DICT_TYPE } from '@/utils/dict'
 import FetchApis from './index.api'
 import { cloneDeep } from 'lodash-es'
 import { isEmpty } from '@/utils/is'
@@ -230,83 +230,100 @@ const pageSize = ref(10)
 const total = ref(0)
 const loading = ref(false)
 
-// 转换前端设备类型到后端设备类型
-const getBackendEquipMainType = (type: string) => {
-  switch (type) {
-    case 'container':
-      return 100
-    case 'boiler':
-      return 200
-    case 'pipe':
-      return 300
-    default:
-      return 200
-  }
-}
-
 // 设备类型变化处理
 const handleEquipTypeChange = (value: string) => {
-  selectedEquipMainType.value = value // 同步更新显示的设备类型
+  selectedEquipMainType.value = value
   searchFormData.value.equipTypeList = []
   pageNo.value = 1
   getListPageFn()
 }
 
-const getListPageFn = async () => {
-  loading.value = true
-  try {
-    const baseParams = cloneDeep(searchFormDataTable.value)
-    // 清理空值
-    for (const key in baseParams) {
-      if (isEmpty(baseParams[key])) {
-        delete baseParams[key]
-      }
+// 构建通用请求参数（匹配后端 PendingInspectionEquipReqVO）
+const buildCommonRequestParams = (baseParams: any) => {
+  const data: any = {
+    ...cloneDeep(baseParams),
+    ...searchFormData.value,
+    equipMainType: selectedEquipMainType.value,
+    flag: Number(isClaim.value),
+    pageNo: pageNo.value,
+    pageSize: pageSize.value
+  }
+
+  // 清理空值
+  for (const key in data) {
+    if (isEmpty(data[key])) {
+      delete data[key]
     }
+  }
 
-    const equipMainType = selectedEquipMainType.value
-    const backendEquipMainType = getBackendEquipMainType(equipMainType)
-
-    // 构建请求参数
-    const requestParams: any = {
-      ...baseParams,
-      scene: 0, // 前台约检场景
-      equipMainType: backendEquipMainType,
-      pageNo: pageNo.value,
-      pageSize: pageSize.value
+  // 处理检验日期范围：checkDate 数组 → checkDateStart / checkDateEnd
+  if (data?.checkDate) {
+    if (Array.isArray(data.checkDate) && data.checkDate.length === 2) {
+      data.checkDateStart = data.checkDate[0]
+      data.checkDateEnd = data.checkDate[1]
     }
+    delete data.checkDate
+  }
+
+  // 处理拒检设备筛选：'flag'→不筛选, 'true'/'false'→布尔
+  if (data.isRefused === 'flag') {
+    delete data.isRefused
+  } else if (data.isRefused !== undefined) {
+    data.isRefused = data.isRefused === 'true'
+  }
+
+  return data
+}
 
-    // 根据设备类型调用不同的接口
+// 将后端返回的设备数据映射为表格列所需的字段名
+const mapEquipDataForTable = (item: any) => {
+  const mapped = { ...item }
+  // 检验性质：后端 checkTypeStr → 前端 checkNature（如果后端未设置，根据 checkType 推导）
+  if (mapped.checkTypeStr !== undefined && mapped.checkTypeStr !== null && mapped.checkTypeStr !== '') {
+    mapped.checkNature = mapped.checkTypeStr
+  } else if (mapped.checkType !== undefined && mapped.checkType !== null) {
+    // checkType: 100=定检, 200=年检, 300=超年限
+    const checkTypeMap: Record<number, string> = { 100: '定检', 200: '年检', 300: '超年限' }
+    mapped.checkNature = checkTypeMap[mapped.checkType] || ''
+  }
+  // 设备分类：后端 equipType(dict ID) → 前端 equipTypeName(dict label)
+  if (mapped.equipType !== undefined && mapped.equipType !== null) {
+    if (selectedEquipMainType.value === 'boiler') {
+      mapped.equipTypeName = getDictLabel(DICT_TYPE.SYSTEM_EQUIP_BOILER_TYPE, mapped.equipType)
+    } else if (selectedEquipMainType.value === 'pipe') {
+      mapped.equipTypeName = getDictLabel(DICT_TYPE.PIPE_TYPE, mapped.equipType)
+    }
+  }
+  // 管道特殊映射：后端 equipCode → 前端 projectNo，equipName → projectName
+  if (selectedEquipMainType.value === 'pipe') {
+    mapped.projectNo = mapped.equipCode
+    mapped.projectName = mapped.equipName
+  }
+  return mapped
+}
+
+const getListPageFn = async () => {
+  loading.value = true
+  try {
+    const equipMainType = selectedEquipMainType.value
+    const data = buildCommonRequestParams(searchFormDataTable.value)
     let result
-    if (equipMainType === 'container') {
-      // 容器使用pressure1模块的接口
-      const data: any = {
-        ...requestParams,
-        ...searchFormData.value,
-        flag: Number(isClaim.value)
-      }
-      // 处理日期
-      if (data?.checkDate) {
-        if (Array.isArray(data.checkDate) && data.checkDate.length === 2) {
-          data.checkDateStart = data.checkDate[0]
-          data.checkDateEnd = data.checkDate[1]
-        }
-        delete data.checkDate
-      }
-      // 处理拒检设备筛选参数
-      if (data.isRefused === 'flag') {
-        delete data.isRefused
-      } else {
-        data.isRefused = data.isRefused === 'true'
-      }
 
+    if (equipMainType === 'container') {
+      // 容器使用 pressure 模块的 POST 接口
       result = await FetchApis.getContainerPage(data)
-    } else {
-      // 锅炉和管道使用pressure2模块的接口
-      result = await FetchApis.getPage(requestParams)
+    } else if (equipMainType === 'boiler') {
+      // 锅炉使用 pressure2 模块的 GET 接口
+      result = await FetchApis.getBoilerPage(data)
+    } else if (equipMainType === 'pipe') {
+      // 管道使用 pressure2 模块的 GET 接口
+      result = await FetchApis.getPipePage(data)
     }
 
     if (result) {
-      tableData.value = result.list || []
+      const list = result.list || []
+      // 将后端字段映射为前端表格列所需的字段名
+      tableData.value = list.map(mapEquipDataForTable)
       total.value = result.total || 0
     }
   } catch (error) {
@@ -334,36 +351,18 @@ const handleReset = () => {
 }
 
 const handleExportFn = async () => {
+  const equipMainType = selectedEquipMainType.value
+  if (equipMainType !== 'container') {
+    ElMessage.warning('锅炉和管道的导出功能暂未开放，请使用容器设备导出')
+    return
+  }
   loading.value = true
   try {
-    const data: any = {
-      ...cloneDeep(searchFormDataTable.value),
-      ...searchFormData.value,
-      flag: Number(isClaim.value),
-      pageNo: pageNo.value,
-      pageSize: selectedRows.value.length ? pageSize.value : total.value,
-      ids: selectedRows.value.map((item: any) => item.id)
-    }
-
-    // 清理空值
-    for (const key in data) {
-      if (isEmpty(data[key])) {
-        delete data[key]
-      }
-    }
-
-    if (data?.checkDate) {
-      if (Array.isArray(data.checkDate) && data.checkDate.length === 2) {
-        data.checkDateStart = data.checkDate[0]
-        data.checkDateEnd = data.checkDate[1]
-      }
-      delete data.checkDate
-    }
-
-    if (data.isRefused === 'flag') {
-      delete data.isRefused
-    } else {
-      data.isRefused = data.isRefused === 'true'
+    const data = buildCommonRequestParams(searchFormDataTable.value)
+    data.ids = selectedRows.value.map((item: any) => item.id)
+    // 导出时如果没有选中行，则导出全部
+    if (!selectedRows.value.length) {
+      data.pageSize = total.value
     }
 
     const response = await FetchApis.downloadExportEquipsExcelApi(data)
@@ -408,7 +407,7 @@ const handleAppointment = (row: any) => {
   } else if (selectedEquipMainType.value === 'boiler') {
     // 锅炉使用pressure2模块的锅炉详情页
     router.push({
-      path: '/pressure2/planNew/boilerDetail',
+      path: '/ywgl/planNew/boilerDetail',
       query: {
         id: row.id || row.taskId,
         equipCode: row.equipCode
@@ -417,7 +416,7 @@ const handleAppointment = (row: any) => {
   } else if (selectedEquipMainType.value === 'pipe') {
     // 管道使用pressure2模块的管道详情页
     router.push({
-      path: '/pressure2/planNew/pipeDetail',
+      path: '/ywgl/planNew/pipeDetail',
       query: {
         id: row.id || row.taskId,
         equipCode: row.equipCode

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

@@ -217,7 +217,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -352,7 +352,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -302,7 +302,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -209,7 +209,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -303,7 +303,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -307,7 +307,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -300,7 +300,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -509,7 +509,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -323,7 +323,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -258,7 +258,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -165,14 +165,13 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            >
-            <!-- :disabled="scope.row.status == 200"
-          > -->
+            :disabled="scope.row.status == 200"
+          >
             编辑
           </el-button>
           <router-link :to="'/cybggl/dynamic-tb-col/'+scope.row.id">
-            <el-button link type="primary" >数据</el-button>
-            <!-- <el-button link type="primary"  :disabled="scope.row.status == 200">数据</el-button> -->
+            <!-- <el-button link type="primary" >数据</el-button> -->
+            <el-button link type="primary"  :disabled="scope.row.status == 200">数据</el-button>
           </router-link>
           <el-button
             link

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

@@ -336,14 +336,15 @@ const pageSize = ref(10)
 const total = ref(0)
 const searchForm = ref<any>({})
 const selectedRows = ref<any[]>([])
+const currentEquipmentCategory = ref<string | null>(null)
 const getTemplateNames = computed(() => inspectionNatureForm.value.templateSaveReqVOList.map(x => x.name))
 
 // 获取检验性质列表
-const fetchInspectionNatureList = async (equipmentCategory?: string) => {
+const fetchInspectionNatureList = async () => {
   const params: any = {
     pageNo: pageNo.value,
     pageSize: pageSize.value,
-    equipmentCategory,
+    equipmentCategory: currentEquipmentCategory.value,
     ...searchForm.value
   }
   const result = await getPressure2InspectionNatureList(params)
@@ -367,7 +368,9 @@ const handleSelectionChange = (rows: any[]) => {
 // 设备类型查询
 const handleNodeClick = (data) => {
   const equipmentCategory = data.value === '-1' ? null : data.value
-  fetchInspectionNatureList(equipmentCategory)
+  currentEquipmentCategory.value = equipmentCategory
+  pageNo.value = 1
+  fetchInspectionNatureList()
   // 更新检验性质字典
   if (data.value === '-1') {
     pressureInspectionNature.value = [...getPressureInspectionNatureType.value['200'], ...getPressureInspectionNatureType.value['300']]

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

@@ -223,7 +223,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -350,7 +350,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -360,7 +360,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -322,7 +322,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -527,7 +527,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -332,7 +332,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

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

@@ -253,7 +253,13 @@
       placeholder="请输入名称"
       @keyup.enter="handleFetchUserList"
       style="margin-bottom: 14px"
-    />
+    >
+      <template #append>
+        <el-button @click="handleFetchUserList">
+          <Icon icon="ep:search" />
+        </el-button>
+      </template>
+    </el-input>
 
     <SmartTable
       ref="userTableRef"

yudao-ui-admin-vue3/src/views/pressure2/planNew/boilerDetail.vue

@@ -812,7 +812,12 @@ watch(datePickerType, (newVal) => {
 const { getPlanNewData } = usePlanNewStore()
 const currentCheckData = ref<PlanNewPageVO>()
 onMounted(() => {
-  const { id } = (router.currentRoute.value.query || {}) as unknown as { id: string }
+  const { id,equipCode } = (router.currentRoute.value.query || {}) as unknown as { id: string }
+  if (equipCode){
+    queryParams.value.equipCode = equipCode
+    queryParams.value.useStatus = []
+    handleQuery()
+  }
   const data = getPlanNewData(id)
   if (data) {
     currentCheckData.value = data