上报管理调整

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

@@ -82,11 +82,6 @@ const selectRow = ref<AppointmentConfirmOrderRefuseItemVO[]>([]) // table选中
 const smartTableRef = ref<SmartInstanceExpose>()
 const equipCategoryList = ref([])
 
-const checkTypeMap = {
-  '100': '定期检验',
-  '200': '年度检查'
-}
-
 const equipMainTypeList = dictStore.getDictMap[DICT_TYPE.PRESSURE2_EQUIP_MAIN_TYPE]
 
 const boilerStatusTypeOptions = getStrDictOptions(DICT_TYPE.SYSTEM_EQUIP_BOILER_STATUS)

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

@@ -42,7 +42,7 @@
                   clearable
                 >
                   <el-option
-                    v-for="(item) in allEquipTypeOptions"
+                    v-for="(item) in allCheckTypeOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -241,7 +241,7 @@
         </el-table-column>
         <el-table-column label="状态" align="center" prop="processStatus" min-width="120">
           <template #default="{ row }">
-            {{ processStatusMap[row.processStatus] || '-' }}
+            <el-tag>{{ processStatusMap[row.processStatus] || '-' }}</el-tag>
           </template>
         </el-table-column>
          <el-table-column label="运行状态" align="center" prop="equipStatusName" min-width="120">

yudao-ui-admin-vue3/src/views/pressure2/rejectionInquiry/RefuseRegularCheckTab.vue

@@ -132,6 +132,23 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col v-bind="ElColSpanConfig">
+                <el-form-item class="w-full" label="检验性质" prop="checkTypeName">
+                  <el-select
+                    class="w-full"
+                    v-model="queryParams.checkTypeName"
+                    placeholder="请选择"
+                    clearable
+                  >
+                    <el-option
+                      v-for="(item) in allCheckTypeOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col v-bind="ElColSpanConfig">
                 <el-form-item class="w-full" label="提交时间" prop="submitTime">
                   <el-date-picker
@@ -234,6 +251,12 @@
             {{ equipMainTypeList.find((x) => x.value == row.equipMainType)?.label || '-' }}
           </template>
         </el-table-column>
+        <!-- 检验性质 -->
+        <el-table-column label="检验性质" align="center" prop="checkTypeName" min-width="120">
+          <template #default="{ row }">
+            {{ row.checkTypeName }}
+          </template>
+        </el-table-column>
         <el-table-column label="区域" align="center" prop="equipDistrictName" min-width="130" />
         <el-table-column label="使用证编号" align="center" prop="useRegisterNo" min-width="130" />
         <!-- <el-table-column label="检验性质" align="center" prop="checkType" min-width="120">
@@ -341,7 +364,7 @@ import {
   AppointmentConfirmOrderRefuseItemApi,
   AppointmentConfirmOrderRefuseItemVO
 } from '@/api/pressure2/appointmentconfirmorderrefuseitem'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getStrDictOptions, mergeDictOptionsWithValueAsLabel} from '@/utils/dict'
 import { ElTable, ElMessage } from 'element-plus'
 import AreaSelect from '@/views/pressure/appointmentconfirmorderrefuseitem/components/AreaSelect.vue'
 import { ArrowDown, ArrowUp } from '@element-plus/icons-vue'
@@ -374,6 +397,11 @@ const queryParams = reactive<Recordable>({
   checkTypes: ['100', '300']
 })
 
+const boilerCheckTypeOptions = getStrDictOptions(DICT_TYPE.BOILER_CHECK_TYPE)
+const pipeCheckTypeOptions = getStrDictOptions(DICT_TYPE.PIPE_CHECK_TYPE)
+// 合并字典选项并去除重复 label 项，同时将 value 改为 label
+const allCheckTypeOptions = mergeDictOptionsWithValueAsLabel(boilerCheckTypeOptions, pipeCheckTypeOptions)
+
 const queryFormRef = ref() // 搜索的表单
 const tableRef = ref<InstanceType<typeof ElTable>>()
 

yudao-ui-admin-vue3/src/views/pressure2/rejectionInquiry/RefuseYearCheckTab.vue

@@ -234,6 +234,12 @@
             {{ equipMainTypeList.find((x) => x.value == row.equipMainType)?.label || '-' }}
           </template>
         </el-table-column>
+        <!-- 检验性质 -->
+        <el-table-column label="检验性质" align="center" prop="checkTypeName" min-width="120">
+          <template #default="{ row }">
+            {{ row.checkTypeName }}
+          </template>
+        </el-table-column>
         <el-table-column label="区域" align="center" prop="equipDistrictName" min-width="130" />
         <el-table-column label="使用证编号" align="center" prop="useRegisterNo" min-width="130" />
         <!-- <el-table-column label="检验性质" align="center" prop="checkType" min-width="120">