调整

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexBoilerTab.vue

@@ -42,13 +42,28 @@
           class="!w-200px"
         >
           <el-option
-            v-for="(item, key) in PressureCheckTypeMap"
+            v-for="(item, key) in PressureBoilerCheckTypeMap"
             :key="key"
             :label="item"
             :value="key"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="设备类别" prop="equipType">
+        <el-select
+          v-model="searchInfo.equipType"
+          placeholder="请选择设备类别"
+          clearable
+          class="!w-200px"
+        >
+          <el-option
+            v-for="(item) in equipmentTypeMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="检验时间" prop="checkDate">
         <el-date-picker
           v-model="searchInfo.checkDate"
@@ -307,7 +322,7 @@
       <el-table-column label="任务单号" align="center" prop="orderNo" min-width="150px" />
       <el-table-column label="设备注册代码" align="center" prop="equipCode" min-width="270">
         <template #default="{ row }">
-          <div class="flex items-center gap-[4px]">
+          <div>
             {{ row.equipCode }}
             <el-tag v-if="row.productNo" type="success">
               {{ row.productNo }}
@@ -329,7 +344,7 @@
       </el-table-column>
       <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">
         <template #default="scope">
-          {{ PressureCheckTypeMap[scope.row.checkType] }}
+          {{ PressureBoilerCheckTypeMap[scope.row.checkType] }}
         </template>
       </el-table-column>
       <el-table-column label="检验时间" align="center" prop="checkDate" min-width="120px">
@@ -635,7 +650,7 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import VuePdfEmbed from 'vue-pdf-embed'
-import { PressureCheckTypeMap } from '@/utils/constants'
+import {PressureBoilerCheckTypeMap} from '@/utils/constants'
 import unitContainerForm from '@/components/unitContainerForm/index.vue'
 import { formatArrayDate, formatDate } from '@/utils/formatTime'
 import { ElMessage, FormRules, ElForm, FormInstance } from 'element-plus'

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexPipeTab.vue

@@ -42,13 +42,28 @@
           class="!w-200px"
         >
           <el-option
-            v-for="(item, key) in PressureCheckTypeMap"
+            v-for="(item, key) in PressurePipeCheckTypeMap"
             :key="key"
             :label="item"
             :value="key"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="设备类别" prop="equipType">
+        <el-select
+          v-model="searchInfo.equipType"
+          placeholder="请选择设备类别"
+          clearable
+          class="!w-200px"
+        >
+          <el-option
+            v-for="(item) in equipmentTypeMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="检验时间" prop="checkDate">
         <el-date-picker
           v-model="searchInfo.checkDate"
@@ -307,7 +322,7 @@
       <el-table-column label="任务单号" align="center" prop="orderNo" min-width="150px" />
       <el-table-column label="设备注册代码" align="center" prop="equipCode" min-width="270">
         <template #default="{ row }">
-          <div class="flex items-center gap-[4px]">
+          <div>
             {{ row.equipCode }}
             <el-tag v-if="row.productNo" type="success">
               {{ row.productNo }}
@@ -329,7 +344,7 @@
       </el-table-column>
       <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">
         <template #default="scope">
-          {{ PressureCheckTypeMap[scope.row.checkType] }}
+          {{ PressurePipeCheckTypeMap[scope.row.checkType] }}
         </template>
       </el-table-column>
       <el-table-column label="检验时间" align="center" prop="checkDate" min-width="120px">
@@ -635,7 +650,7 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import VuePdfEmbed from 'vue-pdf-embed'
-import { PressureCheckTypeMap } from '@/utils/constants'
+import {PressurePipeCheckTypeMap} from '@/utils/constants'
 import unitContainerForm from '@/components/unitContainerForm/index.vue'
 import { formatArrayDate, formatDate } from '@/utils/formatTime'
 import { ElMessage, FormRules, ElForm, FormInstance } from 'element-plus'
@@ -655,7 +670,7 @@ const reportListUploadModalRef = ref<InstanceType<typeof ReportListUploadModal>>
 const unitContainerFormRef = ref<InstanceType<typeof unitContainerForm>>()
 const userStore = useUserStoreWithOut() // 用户信息缓存
 
-const equipmentTypeMap = getStrDictOptions(DICT_TYPE.SYSTEM_EQUIP_BOILER_TYPE)
+const equipmentTypeMap = getStrDictOptions(DICT_TYPE.PIPE_TYPE)
 
 import dayJs from 'dayjs'
 

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/reportIndexBoilerTab.vue

@@ -43,13 +43,28 @@
           class="!w-200px"
         >
           <el-option
-            v-for="(item, key) in PressureCheckTypeMap"
+            v-for="(item, key) in PressureBoilerCheckTypeMap"
             :key="key"
             :label="item"
             :value="key"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="设备类别" prop="equipType">
+        <el-select
+          v-model="searchInfo.equipType"
+          placeholder="请选择设备类别"
+          clearable
+          class="!w-200px"
+        >
+          <el-option
+            v-for="(item) in equipmentTypeMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="检验时间" prop="checkDate">
         <el-date-picker
           v-model="searchInfo.checkDate"
@@ -418,7 +433,7 @@
       <el-table-column label="任务单号" align="center" prop="orderNo" min-width="150px" />
       <el-table-column label="设备注册代码" align="center" prop="equipCode" min-width="270">
         <template #default="{ row }">
-          <div class="flex items-center gap-[4px]">
+          <div class="flex">
             {{ row.equipCode }}
             <el-tag v-if="row.productNo" type="success">
               {{ row.productNo }}
@@ -439,7 +454,7 @@
       </el-table-column>
       <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">
         <template #default="scope">
-          {{ PressureCheckTypeMap[scope.row.checkType] }}
+          {{ PressureBoilerCheckTypeMap[scope.row.checkType] }}
         </template>
       </el-table-column>
       <!-- 检验项目 -->
@@ -708,7 +723,7 @@ import VuePdfEmbed from 'vue-pdf-embed'
 import unitContainerForm from '@/components/unitContainerForm/index.vue'
 import ReportListUploadModal from '@/views/pressure/checker/components/reportListUploadModal.vue'
 import {
-  PressureCheckTypeMap,
+  PressureBoilerCheckTypeMap,
   PressureCheckerMyTaskStatusMap,
   PressureTaskOrderTaskStatus
 } from '@/utils/constants'

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/reportIndexPipeTab.vue

@@ -43,13 +43,28 @@
           class="!w-200px"
         >
           <el-option
-            v-for="(item, key) in PressureCheckTypeMap"
+            v-for="(item, key) in PressurePipeCheckTypeMap"
             :key="key"
             :label="item"
             :value="key"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="设备类别" prop="equipType">
+        <el-select
+          v-model="searchInfo.equipType"
+          placeholder="请选择设备类别"
+          clearable
+          class="!w-200px"
+        >
+          <el-option
+            v-for="(item) in equipmentTypeMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="检验时间" prop="checkDate">
         <el-date-picker
           v-model="searchInfo.checkDate"
@@ -418,7 +433,7 @@
       <el-table-column label="任务单号" align="center" prop="orderNo" min-width="150px" />
       <el-table-column label="设备注册代码" align="center" prop="equipCode" min-width="270">
         <template #default="{ row }">
-          <div class="flex items-center gap-[4px]">
+          <div class="flex">
             {{ row.equipCode }}
             <el-tag v-if="row.productNo" type="success">
               {{ row.productNo }}
@@ -439,7 +454,7 @@
       </el-table-column>
       <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">
         <template #default="scope">
-          {{ PressureCheckTypeMap[scope.row.checkType] }}
+          {{ PressurePipeCheckTypeMap[scope.row.checkType] }}
         </template>
       </el-table-column>
       <!-- 检验项目 -->
@@ -708,7 +723,7 @@ import VuePdfEmbed from 'vue-pdf-embed'
 import unitContainerForm from '@/components/unitContainerForm/index.vue'
 import ReportListUploadModal from '@/views/pressure/checker/components/reportListUploadModal.vue'
 import {
-  PressureCheckTypeMap,
+  PressurePipeCheckTypeMap,
   PressureCheckerMyTaskStatusMap,
   PressureTaskOrderTaskStatus
 } from '@/utils/constants'