隐患排查调整

src/utils/dict.ts

@@ -333,7 +333,8 @@ export enum DICT_TYPE {
   QHSE_DEVICE_CERT_TYPE = 'qhse_device_cert_type',
   QHSE_DETECT_CYCLE = 'detect_cycle',
   QHSE_TRAIN_CYCLE = 'qhse_train_cycle',
-  QHSE_CHECK_TYPE = 'qhse_hazard_type'
+  QHSE_CHECK_TYPE = 'qhse_hazard_type',
+  QHSE_FIX_DATE = 'qhse_check_period'
 }
 
 export function realValue(type: any, value: string) {

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

@@ -147,8 +147,13 @@
               <dict-tag :type="DICT_TYPE.QHSE_CHECK_TYPE" :value="scope.row.checkType" />
             </template>
           </zm-table-column>
+          <zm-table-column prop="createTime" label="排查时间" align="center" min-width="150">
+            <template #default="{ row }">
+              {{ formatDate(row.checkTime) }}
+            </template>
+          </zm-table-column>
 
-          <zm-table-column label="地点" align="center" prop="address" />
+          <zm-table-column label="排查地点" align="center" prop="address" />
 
           <zm-table-column label="存在问题" align="center" prop="problem" />
 
@@ -168,6 +173,11 @@
           </zm-table-column>
           <zm-table-column label="整改人" align="center" prop="correctPersonName" />
           <zm-table-column label="整改要求" align="center" prop="correctStandard" />
+          <zm-table-column label="整改期限" align="center" min-width="90">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.QHSE_FIX_DATE" :value="scope.row.checkPeriod" />
+            </template>
+          </zm-table-column>
 
           <zm-table-column label="整改情况" align="center" prop="rectifyDesc" />
 
@@ -186,12 +196,6 @@
             </template>
           </zm-table-column>
 
-          <zm-table-column prop="createTime" label="排查时间" align="center" min-width="150">
-            <template #default="{ row }">
-              {{ formatDate(row.checkTime) }}
-            </template>
-          </zm-table-column>
-
           <zm-table-column label="状态" align="center" width="90">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.QHSE_HAZARD_STATUS" :value="scope.row.status" />
@@ -310,6 +314,16 @@
           placeholder="请选择排查时间"
           style="width: 100%" />
       </el-form-item>
+      <el-form-item label="排查地点" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入地点" />
+      </el-form-item>
+      <el-form-item label="存在问题" prop="problem">
+        <el-input
+          type="textarea"
+          :rows="2"
+          v-model="formData.problem"
+          placeholder="请输入存在问题" />
+      </el-form-item>
 
       <el-form-item label="整改要求" prop="correctStandard">
         <el-input
@@ -319,6 +333,16 @@
           placeholder="请输入整改要求" />
       </el-form-item>
 
+      <el-form-item label="整改期限" prop="checkPeriod">
+        <el-select v-model="formData.checkPeriod" placeholder="请选择整改期限" clearable>
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.QHSE_FIX_DATE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="整改人" prop="correctPerson">
         <el-select
           v-model="formData.correctPerson"
@@ -334,18 +358,6 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="地点" prop="address">
-        <el-input v-model="formData.address" placeholder="请输入地点" />
-      </el-form-item>
-
-      <el-form-item label="存在问题" prop="problem">
-        <el-input
-          type="textarea"
-          :rows="2"
-          v-model="formData.problem"
-          placeholder="请输入存在问题" />
-      </el-form-item>
-
       <el-form-item label="照片" prop="hazardFile">
         <UploadFile
           v-model="formData.hazardFile"
@@ -517,7 +529,8 @@ const formData = ref({
   checkTime: '',
   correctStandard: '',
   correctPerson: '',
-  checkType: ''
+  checkType: '',
+  checkPeriod: ''
 })
 
 // 表单验证规则
@@ -534,7 +547,8 @@ const formRules = {
   checkTime: [{ required: true, message: '检查时间不能为空', trigger: 'blur' }],
   correctStandard: [{ required: true, message: '整改标准不能为空', trigger: 'blur' }],
   correctPerson: [{ required: true, message: '整改人不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }]
+  checkType: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }],
+  checkPeriod: [{ required: true, message: '整改期限不能为空', trigger: 'blur' }]
 }
 
 /** 查询列表 */