fix:修复安全责任清单、区域显示问题

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

@@ -143,6 +143,7 @@ export const AREA_CHECK_PLAN_FORM_RULES = {
   checkVenue: [{ required: true, message: '请输入检查场所', trigger: 'blur' }],
   primaryResponsibleDeptName: [{ required: true, message: '请选择主责部门', trigger: 'change' }],
   selfCheckFrequency: [{ required: true, message: '请选择自查频次', trigger: 'change' }],
+  safetyEmergencyCheckFrequency: [{ required: true, message: '请选择安全应急部检查频次', trigger: 'change' }],
   safetyEmergencyDeptName: [{ required: true, message: '请选择安全应急部门', trigger: 'change' }],
   hospitalLeaderDeptName: [{ required: true, message: '请选择院领导部门', trigger: 'change' }],
   hospitalLeaderCheckFrequency: [{ required: true, message: '请选择院领导检查频次', trigger: 'change' }],

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/checkTemplateManagement/configs/form.ts

@@ -17,7 +17,7 @@ export const CHECK_TEMPLATE_FORM_DATA = {
 export const CHECK_TEMPLATE_FORM_RULES = {
   templateName: [{ required: true, message: '请输入检查单模版名称', trigger: 'blur' }],
   categoryName: [{ required: true, message: '请选择类别名称', trigger: 'change' }],
-  businessWork: [{ required: true, message: '请输入业务工作', trigger: 'blur' }],
-  fillInstruction: [{ required: true, message: '请输入填写说明', trigger: 'blur' }],
+//   businessWork: [{ required: true, message: '请输入业务工作', trigger: 'blur' }],
+//   fillInstruction: [{ required: true, message: '请输入填写说明', trigger: 'blur' }],
   status: [{ required: true, message: '请选择状态', trigger: 'change' }],
 };

src/views/production-safety/implement-safety-duty/non-public-area-responsibilities/change.vue

@@ -280,6 +280,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('获取详情失败');

src/views/production-safety/implement-safety-duty/non-public-area-responsibilities/edit.vue

@@ -254,6 +254,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('详情获取失败');

src/views/production-safety/implement-safety-duty/non-public-area-responsibilities/list.vue

@@ -163,7 +163,7 @@
         </div>
         <div class="table-content">
             <h4>历史记录（变更前）</h4>
-            <el-table :data="changedListData.historiesRecords">
+            <el-table :data="changedListData.historiesRecords.records">
                 <el-table-column type="index" label="编号" width="80" />
                 <el-table-column label="变更时间" prop="createdAt" width="180" />
                 <el-table-column label="变更人" prop="safetySpecificPersonName" width="180" />

src/views/production-safety/implement-safety-duty/non-public-area-responsibilities/view.vue

@@ -117,7 +117,7 @@
     firstLevelDepts.value = formatDeptTree(res);
   };
 
-  const getUserData = (optionList: any, deptName: string) => {
+  const getUserData = (optionList: any, deptName) => {
     return queryAvailableUserList({
       pageNumber: 1,
       pageSize: 200,
@@ -162,6 +162,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('获取详情失败');

src/views/production-safety/implement-safety-duty/non-public-list-responsibilities/change.vue

@@ -281,6 +281,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('获取详情失败');

src/views/production-safety/implement-safety-duty/non-public-list-responsibilities/edit.vue

@@ -254,6 +254,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('详情获取失败');

src/views/production-safety/implement-safety-duty/non-public-list-responsibilities/list.vue

@@ -117,7 +117,7 @@
                   >变更</el-button
                 >
               </template>
-              <template v-if="scope.row.canChange === true">
+             <template v-if="scope.row.status === 2 && scope.row.safetySpecificPersonTodo === id">
                 <el-button type="primary" link @click="handleAreaCheckListApprove(scope, 1)">确认</el-button>
                 <el-button type="primary" link @click="handleAreaCheckListApprove(scope, 0)">拒绝</el-button>
               </template>
@@ -187,7 +187,7 @@
         </div>
         <div class="table-content">
             <h4>历史记录（变更前）</h4>
-            <el-table :data="changedListData.historiesRecords">
+            <el-table :data="changedListData.historiesRecords.records">
                 <el-table-column type="index" label="序号" width="80" />
                 <el-table-column label="变更时间" prop="createdAt" width="180" />
                 <el-table-column label="变更人" prop="safetySpecificPersonName" width="180" />

src/views/production-safety/implement-safety-duty/non-public-list-responsibilities/view.vue

@@ -117,7 +117,7 @@
     firstLevelDepts.value = formatDeptTree(res);
   };
 
-  const getUserData = (optionList: any, deptName: string) => {
+  const getUserData = (optionList: any, deptName) => {
     return queryAvailableUserList({
       pageNumber: 1,
       pageSize: 200,
@@ -163,6 +163,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('获取详情失败');

src/views/production-safety/implement-safety-duty/public-area-responsibilities/change.vue

@@ -281,6 +281,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('获取详情失败');

src/views/production-safety/implement-safety-duty/public-area-responsibilities/edit.vue

@@ -254,6 +254,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('详情获取失败');

src/views/production-safety/implement-safety-duty/public-area-responsibilities/view.vue

@@ -117,7 +117,7 @@
     firstLevelDepts.value = formatDeptTree(res);
   };
 
-  const getUserData = (optionList: any, deptName: string) => {
+  const getUserData = (optionList, deptName) => {
     return queryAvailableUserList({
       pageNumber: 1,
       pageSize: 200,
@@ -163,6 +163,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('获取详情失败');

src/views/production-safety/implement-safety-duty/public-list-responsibilities/change.vue

@@ -281,6 +281,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('获取详情失败');

src/views/production-safety/implement-safety-duty/public-list-responsibilities/edit.vue

@@ -254,6 +254,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('详情获取失败');

src/views/production-safety/implement-safety-duty/public-list-responsibilities/list.vue

@@ -115,7 +115,7 @@
                   >变更</el-button
                 >
               </template>
-              <template v-if="scope.row.canChange === true">
+              <template v-if="scope.row.status === 2 && scope.row.safetySpecificPersonTodo === id">
                 <el-button type="primary" link @click="handleAreaCheckListApprove(scope, 1)">确认</el-button>
                 <el-button type="primary" link @click="handleAreaCheckListApprove(scope, 0)">拒绝</el-button>
               </template>
@@ -182,7 +182,7 @@
         </div>
         <div class="table-content">
             <h4>历史记录（变更前）</h4>
-            <el-table :data="changedListData.historiesRecords">
+            <el-table :data="changedListData.historiesRecords.records">
                 <el-table-column type="index" label="编号" width="80" />
                 <el-table-column label="变更时间" prop="createdAt" width="180" />
                 <el-table-column label="变更人" prop="safetySpecificPersonName" width="180" />

src/views/production-safety/implement-safety-duty/public-list-responsibilities/view.vue

@@ -117,7 +117,7 @@
     firstLevelDepts.value = formatDeptTree(res);
   };
 
-  const getUserData = (optionList: any, deptName: string) => {
+  const getUserData = (optionList, deptName) => {
     return queryAvailableUserList({
       pageNumber: 1,
       pageSize: 200,
@@ -163,6 +163,9 @@
         if (formValue.safetyResponsibleDepartment) {
           getUserData(userOptions, formValue.safetyResponsibleDepartment);
         }
+        if(formValue.safetySpecificPerson) {
+            getUserData(userOptions, undefined);
+        }
       }
     } catch (err) {
       ElMessage.error('获取详情失败');