Преглед изворни кода

fix:整改日期改为整改时限

sunqijun пре 2 недеља
родитељ
комит
43dca29149

+ 4 - 3
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/components/areaCheckPlanManagementDetail.vue

@@ -467,12 +467,12 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="整改日期:" prop="rectificationDeadline">
+        <el-form-item label="整改时限:" prop="rectificationDeadline">
             <el-date-picker
             v-model="sandHiddenDangerFormData.rectificationDeadline"
             type="date"
             value-format="YYYY-MM-DD"
-            placeholder="请选择整改日期"
+            placeholder="请选择整改时限"
             style="width: 450px"
             />
       </el-form-item>
@@ -1189,6 +1189,7 @@
           startDate: start || undefined,
           endDate: end || undefined,
           status: statusValue.value ?? undefined,
+          id: currentId.value,
         },
       });
       const raw = (res as { data?: { records?: Array<Record<string, unknown>>; totalRow?: number } })?.data ?? res;
@@ -1470,7 +1471,7 @@
     await loadChecklistCategoryOptions();
     await loadChecklistTemplateOptions();
     if (isEditMode.value || isViewMode.value) {
-      getDetail();
+      await getDetail();
     }
   });
 </script>

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/configs/form.ts

@@ -306,7 +306,7 @@ export const HIDDEN_DANGER_FORM_RULES = {
   reasonId: [{ required: true, message: '请选择问题主要原因', trigger: 'change' }],
   taskSource: [{ required: true, message: '请输入任务来源', trigger: 'blur' }],
   rectificationRequirement: [{ required: true, message: '请输入整改要求', trigger: 'blur' }],
-  rectificationDeadline: [{ required: true, message: '请选择整改日期', trigger: 'change' }],
+  rectificationDeadline: [{ required: true, message: '请选择整改时限', trigger: 'change' }],
   reviewDepartmentId: [{ required: true, message: '请选择复查人员所属部门', trigger: 'change' }],
   reviewPersonId: [{ required: true, message: '请选择复查人员', trigger: 'change' }],
   isDrawLessonsPush: [{ required: true, message: '请选择举一反三是否推送', trigger: 'change' }],

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanManagementDeptDetail.vue

@@ -370,12 +370,12 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="整改日期:" prop="rectificationDeadline">
+        <el-form-item label="整改时限:" prop="rectificationDeadline">
             <el-date-picker
             v-model="sandHiddenDangerFormDataDept.rectificationDeadline"
             type="date"
             value-format="YYYY-MM-DD"
-            placeholder="请选择整改日期"
+            placeholder="请选择整改时限"
             style="width: 450px"
             />
       </el-form-item>

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/configs/form.ts

@@ -243,7 +243,7 @@ export const HIDDEN_DANGER_FORM_RULES = {
   reasonId: [{ required: true, message: '请选择问题主要原因', trigger: 'change' }],
   taskSource: [{ required: true, message: '请输入任务来源', trigger: 'blur' }],
   rectificationRequirement: [{ required: true, message: '请输入整改要求', trigger: 'blur' }],
-  rectificationDeadline: [{ required: true, message: '请选择整改日期', trigger: 'change' }],
+  rectificationDeadline: [{ required: true, message: '请选择整改时限', trigger: 'change' }],
   reviewDepartmentId: [{ required: true, message: '请选择复查人员所属部门', trigger: 'change' }],
   reviewPersonId: [{ required: true, message: '请选择复查人员', trigger: 'change' }],
   isDrawLessonsPush: [{ required: true, message: '请选择举一反三是否推送', trigger: 'change' }],

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/areaCheckPlanTask.vue

@@ -229,12 +229,12 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="整改日期:" prop="rectificationDeadline">
+        <el-form-item label="整改时限:" prop="rectificationDeadline">
             <el-date-picker
             v-model="sandHiddenDangerFormDataDept.rectificationDeadline"
             type="date"
             value-format="YYYY-MM-DD"
-            placeholder="请选择整改日期"
+            placeholder="请选择整改时限"
             style="width: 450px"
             />
       </el-form-item>

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTask/configs/form.ts

@@ -315,7 +315,7 @@ export const HIDDEN_DANGER_FORM_RULES = {
   reasonId: [{ required: true, message: '请选择问题主要原因', trigger: 'change' }],
   taskSource: [{ required: true, message: '请输入任务来源', trigger: 'blur' }],
   rectificationRequirement: [{ required: true, message: '请输入整改要求', trigger: 'blur' }],
-  rectificationDeadline: [{ required: true, message: '请选择整改日期', trigger: 'change' }],
+  rectificationDeadline: [{ required: true, message: '请选择整改时限', trigger: 'change' }],
   reviewDepartmentId: [{ required: true, message: '请选择复查人员所属部门', trigger: 'change' }],
   reviewPersonId: [{ required: true, message: '请选择复查人员', trigger: 'change' }],
   isDrawLessonsPush: [{ required: true, message: '请选择举一反三是否推送', trigger: 'change' }],

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTaskDept/areaCheckPlanTaskDept.vue

@@ -234,12 +234,12 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="整改日期:" prop="rectificationDeadline">
+        <el-form-item label="整改时限:" prop="rectificationDeadline">
             <el-date-picker
             v-model="sandHiddenDangerFormDataDept.rectificationDeadline"
             type="date"
             value-format="YYYY-MM-DD"
-            placeholder="请选择整改日期"
+            placeholder="请选择整改时限"
             style="width: 450px"
             />
       </el-form-item>

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanTaskDept/configs/form.ts

@@ -315,7 +315,7 @@ export const HIDDEN_DANGER_FORM_RULES = {
   reasonId: [{ required: true, message: '请选择问题主要原因', trigger: 'change' }],
   taskSource: [{ required: true, message: '请输入任务来源', trigger: 'blur' }],
   rectificationRequirement: [{ required: true, message: '请输入整改要求', trigger: 'blur' }],
-  rectificationDeadline: [{ required: true, message: '请选择整改日期', trigger: 'change' }],
+  rectificationDeadline: [{ required: true, message: '请选择整改时限', trigger: 'change' }],
   reviewDepartmentId: [{ required: true, message: '请选择复查人员所属部门', trigger: 'change' }],
   reviewPersonId: [{ required: true, message: '请选择复查人员', trigger: 'change' }],
   isDrawLessonsPush: [{ required: true, message: '请选择举一反三是否推送', trigger: 'change' }],

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/components/hiddenTroubleAccountManagementDetail.vue

@@ -92,12 +92,12 @@
         />
       </el-form-item>
 
-      <el-form-item label="整改限:" prop="rectificationDeadline">
+      <el-form-item label="整改限:" prop="rectificationDeadline">
         <el-date-picker
           v-model="ruleFormData.rectificationDeadline"
           type="date"
           value-format="YYYY-MM-DD"
-          placeholder="请选择整改限"
+          placeholder="请选择整改限"
           :disabled="isViewMode"
           style="width: 450px"
         />

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/configs/form.ts

@@ -331,7 +331,7 @@ export const HIDDEN_DANGER_FORM_RULES = {
   reasonId: [{ required: true, message: '请选择问题主要原因', trigger: 'change' }],
   taskSource: [{ required: true, message: '请输入任务来源', trigger: 'blur' }],
   rectificationRequirement: [{ required: true, message: '请输入整改要求', trigger: 'blur' }],
-  rectificationDeadline: [{ required: true, message: '请选择整改日期', trigger: 'change' }],
+  rectificationDeadline: [{ required: true, message: '请选择整改时限', trigger: 'change' }],
   reviewDepartmentId: [{ required: true, message: '请选择复查人员所属部门', trigger: 'change' }],
   reviewPersonId: [{ required: true, message: '请选择复查人员', trigger: 'change' }],
   isDrawLessonsPush: [{ required: true, message: '请选择举一反三是否推送', trigger: 'change' }],