SOC

src/views/pms/qhse/certificate.vue

@@ -8,7 +8,7 @@
         <!-- 搜索工作栏 -->
         <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true">
           <el-form-item label="证书类型" prop="type">
-            <el-select v-model="queryParams.type" placeholder="请选择证书类型" style="width: 150px">
+            <el-select v-model="queryParams.type" placeholder="请选择证书类型" style="width: 120px">
               <el-option label="个人证书" value="personal" />
               <el-option label="组织证书" value="organization" />
               <el-option label="其他" value="other" />
@@ -20,7 +20,7 @@
               v-model="queryParams.classify"
               placeholder="证书类别"
               clearable
-              class="!w-180px"
+              class="!w-150px"
             >
               <el-option
                 v-for="dict in getStrDictOptions(DICT_TYPE.PERSON_CERT).concat(
@@ -33,6 +33,22 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="是否过期" prop="expired">
+            <el-select
+              v-model="queryParams.expired"
+              placeholder="请选择是否过期"
+              clearable
+              style="width: 150px"
+            >
+              <el-option
+                v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item>
             <el-button @click="handleAdd" type="primary"
               ><Icon icon="ep:plus" class="mr-5px" />新增</el-button
@@ -44,7 +60,7 @@
               ><Icon icon="ep:refresh" class="mr-5px" /> {{ t('devicePerson.reset') }}</el-button
             >
             <el-button @click="handleExport" type="success" plain :loading="exportLoading"
-              ><Icon icon="ep:download" class="mr-5px" /> 导出Excel</el-button
+              ><Icon icon="ep:download" class="mr-5px" /> 导出</el-button
             >
           </el-form-item>
         </el-form>
@@ -55,7 +71,6 @@
         <el-table
           v-loading="loading"
           :data="list"
-          :stripe="true"
           height="calc(85vh - 203px)"
           :show-overflow-tooltip="true"
           :row-style="tableRowStyle"
@@ -292,7 +307,7 @@ const deptList = ref<Tree[]>([]) // 树形结构
 const deptList2 = ref<Tree[]>([]) // 树形结构
 import { formatDate } from '@/utils/formatTime'
 import UploadImage from '@/components/UploadFile/src/UploadImg.vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions, getBoolDictOptions } from '@/utils/dict'
 import { defaultProps } from '@/utils/tree'
 import { selectedDeptsEmployee } from '@/api/system/user'
 
@@ -313,7 +328,8 @@ const queryParams = reactive({
   pageSize: 10,
   type: undefined,
   classify: undefined,
-  deptId: ''
+  deptId: '',
+  expired: undefined
 })
 const queryFormRef = ref(null) // 搜索的表单
 

src/views/pms/qhse/index.vue

@@ -14,9 +14,25 @@
               placeholder="请输入计量器具名称"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-200px"
+              class="!w-180px"
             />
           </el-form-item>
+          <el-form-item label="是否过期" prop="expired">
+            <el-select
+              v-model="queryParams.expired"
+              placeholder="请选择是否过期"
+              clearable
+              style="width: 180px"
+            >
+              <el-option
+                v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item>
             <el-button @click="handleAdd" type="primary"
               ><Icon icon="ep:plus" class="mr-5px" />新增</el-button
@@ -39,7 +55,6 @@
         <el-table
           v-loading="loading"
           :data="list"
-          :stripe="true"
           height="calc(78vh - 145px)"
           :show-overflow-tooltip="true"
           :row-style="tableRowStyle"
@@ -279,7 +294,7 @@ import { ElMessageBox } from 'element-plus'
 const deptList = ref<Tree[]>([]) // 树形结构
 const deptList2 = ref<Tree[]>([]) // 树形结构
 import { formatDate } from '@/utils/formatTime'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions, getBoolDictOptions } from '@/utils/dict'
 
 defineOptions({ name: 'IotQHSEMeasure' })
 
@@ -298,7 +313,8 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   measureName: undefined,
-  deptId: undefined
+  deptId: undefined,
+  expired: undefined
 })
 const queryFormRef = ref(null) // 搜索的表单