调整

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

@@ -62,7 +62,7 @@ const total = ref(0)
 const searchFormData = ref<Record<string, any>>({})
 const selectRow = ref<AppointmentConfirmOrderRefuseItemVO[]>([]) // table选中的checked
 const equipCategoryList = ref([])
-
+const equipMainTypeList = dictStore.getDictMap[DICT_TYPE.PRESSURE2_EQUIP_MAIN_TYPE]
 const boilerStatusTypeOptions = getStrDictOptions(DICT_TYPE.SYSTEM_EQUIP_BOILER_STATUS)
 const pipeStatusTypeOptions = getStrDictOptions(DICT_TYPE.PIPE_USE_STATUS)
 const boilerCheckTypeOptions = getStrDictOptions(DICT_TYPE.BOILER_CHECK_TYPE)
@@ -122,6 +122,22 @@ const columns = ref<SmartTableColumn[]>([
       }
     }
   },
+  {
+    label: '设备类型',
+    prop: 'equipMainType',
+    fieldProps: {
+      align: 'center',
+      minWidth: 180
+    },
+    search: {
+      sort: 0,
+      type: 'select',
+      options: equipMainTypeList
+    },
+    render: (_row: Recordable, value) => {
+      return <>{equipMainTypeList.find((x) => x.value == value)?.label || '-'}</>
+    },
+  },
   {
     label: '设备注册代码',
     prop: 'equipCode',

yudao-ui-admin-vue3/src/views/pressure2/terminationInspectionReturnRecord/TerminationInspectionReturnRecord.vue

@@ -160,6 +160,11 @@ const tableColumns = ref<SmartTableColumn[]>([
       align: 'center',
       minWidth: 180
     },
+    search: {
+      sort: 0,
+      type: 'select',
+      options: equipMainTypeList
+    },
     render: (_row: Recordable, value) => {
       return <>{equipMainTypeList.find((x) => x.value == value)?.label || '-'}</>
     },