Przeglądaj źródła

refactor(pressure): 调整约检预约页面的接口和筛选逻辑

1. 将分页请求接口地址从pressure改为pressure2
2. 替换isClaim状态为checkType,根据设备类型展示不同检验单选选项
3. 调整请求参数中flag为checkType
4. 移除根据checkType推导检验性质的逻辑,直接使用后端返回的checkTypeStr
5. 修正搜索表单默认deptId的获取逻辑
xuzhancheng 3 dni temu
rodzic
commit
f43f6ac54c

+ 1 - 1
yudao-ui-admin-vue3/src/api/pressure/appointmentconfirmorder/index.ts

@@ -82,7 +82,7 @@ export const AppointmentConfirmOrderApi = {
   // 查询约检确认分页
   getAppointmentConfirmOrderPage: async (params: any) => {
     // return await request.get({ url: `/pressure/appointment-confirm-order/page`, params, data })
-    return await request.post({ url: `/pressure/appointment-confirm-order/page`, data: params })
+    return await request.post({ url: `/pressure2/appointment-confirm-order/page`, data: params })
   },
 
   // 查询约检确认详情

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

@@ -48,9 +48,16 @@
     <!-- 工具栏区域 -->
     <div class="toolbar">
       <div class="toolbar-left">
-        <el-radio-group v-model="isClaim" @change="handleQuery">
-          <el-radio-button label="定检、超年限" value="0" />
-          <el-radio-button label="年度" value="1" />
+        <el-radio-group v-model="checkType" @change="handleQuery">
+          <template v-if="selectedEquipMainType === 'boiler'">
+            <el-radio-button label="内部检验" :value="100" />
+            <el-radio-button label="外部检验" :value="200" />
+            <el-radio-button label="耐压检验" :value="300" />
+          </template>
+          <template v-else-if="selectedEquipMainType === 'pipe'">
+            <el-radio-button label="定期检验" :value="100" />
+            <el-radio-button label="年度检查" :value="200" />
+          </template>
         </el-radio-group>
         <el-checkbox v-model="searchFormData.showNoCheckDate" @change="getListPageFn">显示无下次检验日期的设备</el-checkbox>
         <el-checkbox v-model="searchFormData.showNoDistrict" @change="getListPageFn">显示无区域的设备</el-checkbox>
@@ -202,7 +209,7 @@ const getDefaultDate = () => {
 
 // 搜索表单数据
 const searchFormDataTable = ref({
-  deptId: userStore?.getUser?.appointmentDept || userStore?.user?.deptId,
+  deptId: userStore?.user?.deptId,
   checkDate: getDefaultDate(),
   equipMainType: 'boiler', // 默认锅炉
   unitName: '',
@@ -234,6 +241,7 @@ const loading = ref(false)
 const handleEquipTypeChange = (value: string) => {
   selectedEquipMainType.value = value
   searchFormData.value.equipTypeList = []
+  checkType.value = 100
   pageNo.value = 1
   getListPageFn()
 }
@@ -244,7 +252,7 @@ const buildCommonRequestParams = (baseParams: any) => {
     ...cloneDeep(baseParams),
     ...searchFormData.value,
     equipMainType: selectedEquipMainType.value,
-    flag: Number(isClaim.value),
+    checkType: checkType.value,
     pageNo: pageNo.value,
     pageSize: pageSize.value
   }
@@ -278,13 +286,9 @@ const buildCommonRequestParams = (baseParams: any) => {
 // 将后端返回的设备数据映射为表格列所需的字段名
 const mapEquipDataForTable = (item: any) => {
   const mapped = { ...item }
-  // 检验性质:后端 checkTypeStr → 前端 checkNature(如果后端未设置,根据 checkType 推导)
+  // 检验性质:后端直接返回 checkTypeStr
   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) {
@@ -339,7 +343,7 @@ const handleReset = () => {
   searchFormData.value.equipTypeList = []
   pageNo.value = 1
   searchFormDataTable.value = {
-    deptId: userStore?.getUser?.appointmentDept || userStore?.user?.deptId,
+    deptId: userStore?.user?.deptId,
     checkDate: [...savedCheckDate.value],
     equipMainType: selectedEquipMainType.value,
     unitName: '',
@@ -455,7 +459,7 @@ const handleQuery = () => {
 }
 
 const selectedRows = ref([])
-const isClaim = ref('0')
+const checkType = ref(100)
 
 onMounted(() => {
   getListPageFn()