Merge branch 'qhse_file' of shuzhihua/pms-iot-vue into master

src/utils/dict.ts

@@ -330,7 +330,8 @@ export enum DICT_TYPE {
   QHSE_PTW_GRADE = 'qhse_ptw_grade',
   QHSE_HAZARD_SOURCE = 'hazard_soure',
   QHSE_DEVICE_CERT_TYPE = 'qhse_device_cert_type',
-  QHSE_DETECT_CYCLE = 'detect_cycle'
+  QHSE_DETECT_CYCLE = 'detect_cycle',
+  QHSE_TRAIN_CYCLE = 'qhse_train_cycle'
 }
 
 export function realValue(type: any, value: string) {

src/views/pms/qhse/certificate.vue

@@ -187,12 +187,19 @@
                   <dict-tag v-else :type="DICT_TYPE.PERSON_CERT" :value="scope.row.classify" />
                 </template>
               </zm-table-column>
+
               <zm-table-column
                 label="证书名称"
                 align="center"
                 prop="certName"
                 show-overflow-tooltip />
 
+              <zm-table-column label="培训周期" align="center" width="100">
+                <template #default="scope">
+                  <dict-tag :type="DICT_TYPE.QHSE_TRAIN_CYCLE" :value="scope.row.trainCycle" />
+                </template>
+              </zm-table-column>
+
               <zm-table-column label="所属人" align="center" prop="userName" />
               <zm-table-column label="所在部门" align="center" prop="deptName" />
 
@@ -305,6 +312,16 @@
         <el-input v-model="formData.certName" placeholder="请输入证书名称" />
       </el-form-item>
 
+      <el-form-item label="培训周期" prop="trainCycle">
+        <el-select v-model="formData.trainCycle" placeholder="培训周期" clearable>
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.QHSE_TRAIN_CYCLE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="所在部门" prop="deptId">
         <el-tree-select
           clearable
@@ -408,7 +425,6 @@
 
 <script setup lang="ts">
 import { IotMeasureCertApi } from '@/api/pms/qhse/index'
-import DeptTree from '@/views/system/user/DeptTree2.vue'
 import { handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import { ElMessageBox, ElMessage } from 'element-plus'
@@ -430,7 +446,6 @@ const loading = ref(true) // 列表的加载中
 const formLoading = ref(false) // 表单加载中
 const submitLoading = ref(false) // 提交按钮加载中
 const exportLoading = ref(false) // 导出按钮加载中
-const isLeftContentCollapsed = ref(false)
 
 const { t } = useI18n()
 
@@ -454,7 +469,6 @@ const isEdit = ref(false)
 
 // 图片查看对话框
 const dialogFileView = ref(false)
-const imagePreviewUrl = ref('')
 
 // 表单相关
 const formRef = ref()
@@ -470,7 +484,8 @@ const formData = ref({
   noticeBefore: '', // 到期前提醒
   certPic: '', // 证书图片上传
   remark: '', // 备注
-  deptId: '' // 部门id
+  deptId: '', // 部门id
+  trainCycle: ''
 })
 
 // 获取证书类型文本
@@ -523,7 +538,8 @@ const formRules = {
   certOrg: [{ required: true, message: '颁发机构不能为空', trigger: 'blur' }],
   certIssue: [{ required: true, message: '颁发时间不能为空', trigger: 'blur' }],
   certExpire: [{ required: true, message: '有效期不能为空', trigger: 'blur' }],
-  certPic: [{ required: true, message: '证书图片不能为空', trigger: 'blur' }]
+  certPic: [{ required: true, message: '证书图片不能为空', trigger: 'blur' }],
+  trainCycle: [{ required: true, message: '培训周期不能为空', trigger: 'blur' }]
 }
 
 /** 查询列表 */