应检设备添加检测类型

src/utils/dict.ts

@@ -327,7 +327,8 @@ export enum DICT_TYPE {
   QHSE_HAZARD_STATUS = 'qhse_hazard_status',
   QHSE_PTW_TYPE = 'qhse_ptw_type',
   QHSE_PTW_GRADE = 'qhse_ptw_grade',
-  QHSE_HAZARD_SOURCE = 'hazard_soure'
+  QHSE_HAZARD_SOURCE = 'hazard_soure',
+  QHSE_DEVICE_CERT_TYPE = 'qhse_device_cert_type'
 }
 
 export function realValue(type: any, value: string) {

src/views/pms/qhse/deviceCert/DeviceCertForm.vue

@@ -34,11 +34,6 @@
       </el-row>
 
       <el-row :gutter="20">
-        <!-- <el-col :span="12">
-          <el-form-item label="设备编码" prop="deviceCode">
-            <el-input v-model="formData.deviceCode" placeholder="请输入设备编码" />
-          </el-form-item>
-        </el-col> -->
         <el-col :span="12">
           <el-form-item label="设备名称" prop="deviceName">
             <el-input v-model="formData.deviceName" placeholder="请输入设备名称" />
@@ -46,19 +41,34 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="证书编号" prop="certNo">
-            <el-input v-model="formData.certNo" placeholder="请输入证书编号" />
+          <el-form-item label="检测类型" prop="certType">
+            <!-- <el-input v-model="formData.certType" placeholder="请输入设备名称" /> -->
+
+            <el-select v-model="formData.certType" placeholder="请选择检测类型" clearable>
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.QHSE_DEVICE_CERT_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="证书编号" prop="certNo">
+            <el-input v-model="formData.certNo" placeholder="请输入证书编号" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="检测单位" prop="certOrg">
             <el-input v-model="formData.certOrg" placeholder="请输入检测单位" />
           </el-form-item>
         </el-col>
+      </el-row>
 
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="检测日期" prop="certTime">
             <el-date-picker
@@ -69,9 +79,6 @@
               style="width: 100%" />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="有效期至" prop="certExpire">
             <el-date-picker
@@ -82,7 +89,9 @@
               style="width: 100%" />
           </el-form-item>
         </el-col>
+      </el-row>
 
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="部门" prop="deptId">
             <el-tree-select
@@ -97,9 +106,6 @@
               style="width: 100%" />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="附件" prop="file">
             <UploadFile
@@ -223,6 +229,7 @@ import { defaultProps, handleTree } from '@/utils/tree'
 import { onMounted, reactive, ref } from 'vue'
 import * as DeptApi from '@/api/system/dept'
 import { useUserStore } from '@/store/modules/user'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 defineOptions({ name: 'QHSEDeviceCertForm' })
 
 const { t } = useI18n()
@@ -246,7 +253,8 @@ const createDefaultFormData = () => ({
   certExpire: undefined,
   file: '',
   remark: '',
-  deviceCode: ''
+  deviceCode: '',
+  certType: ''
 })
 
 const formData = ref(createDefaultFormData())
@@ -260,7 +268,8 @@ const formRules = reactive({
   certTime: [{ required: true, message: '检测日期不能为空', trigger: 'blur' }],
   certExpire: [{ required: true, message: '有效期不能为空', trigger: 'blur' }],
   file: [{ required: true, message: '请上传附件', trigger: 'blur' }],
-  deptId: [{ required: true, message: '所在部门不能为空', trigger: 'blur' }]
+  deptId: [{ required: true, message: '所在部门不能为空', trigger: 'blur' }],
+  certType: [{ required: true, message: '证书类型不能为空', trigger: 'blur' }]
 })
 
 const emit = defineEmits(['success'])

src/views/pms/qhse/deviceCert/index.vue

@@ -24,6 +24,20 @@
               clearable
               class="!w-150px" />
           </el-form-item>
+
+          <el-form-item label="检测类型" prop="certType">
+            <el-select
+              v-model="queryParams.certType"
+              placeholder="请选择检测类型"
+              clearable
+              style="width: 150px">
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.QHSE_DEVICE_CERT_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
           <el-form-item label="证书编号" prop="certNo">
             <el-input
               v-model="queryParams.certNo"
@@ -107,6 +121,11 @@
                 </template>
               </zm-table-column>
               <zm-table-column label="设备名称" align="center" prop="deviceName" />
+              <zm-table-column label="检测类型" align="center" width="100">
+                <template #default="scope">
+                  <dict-tag :type="DICT_TYPE.QHSE_DEVICE_CERT_TYPE" :value="scope.row.certType" />
+                </template>
+              </zm-table-column>
               <zm-table-column label="证书编号" align="center" prop="certNo" />
               <zm-table-column label="检测日期" align="center" prop="certTime" width="140">
                 <template #default="scope">
@@ -218,6 +237,7 @@ import DeptTreeSelect from '@/components/DeptTreeSelect/index.vue'
 import { useTableComponents } from '@/components/ZmTable/useTableComponents'
 const { ZmTable, ZmTableColumn } = useTableComponents()
 import { useUserStore } from '@/store/modules/user'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 /** 应检设备证书 列表 */
 defineOptions({ name: 'QHSEDeviceCert' })
@@ -241,7 +261,8 @@ const queryParams = reactive({
   certTime: [],
   certExpire: undefined,
   createTime: [],
-  deptId: undefined
+  deptId: undefined,
+  certType: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中