فهرست منبع

feat: 更新区域检查计划管理相关字段,修改签字标识及表格配置

sunqijun 1 ماه پیش
والد
کامیت
246761f33c

+ 4 - 3
src/api/production-safety-system/index.ts

@@ -858,7 +858,7 @@ export interface AreaCheckPlanRecord {
   categoryCode?: string;
   checklistTemplateName?: string;
   needOverallDesc?: boolean;
-  needInspectedSign?: boolean;
+  needSigneeSign?: boolean;
   planStartTime?: string;
   planEndTime?: string;
   isDeleted?: number | string;
@@ -880,6 +880,7 @@ export function mapAreaCheckPlanApiRecordToUi(api: AreaCheckPlanManageApiRecord
     id: api.id,
     planName: api.areaCheckPlanName,
     checkVenue: api.checkPlace,
+    createdPersonName: api.createdPersonName,
     venueCategoryName: api.checkPlaceCategory ?? api.checkCategory,
     status: api.status as AreaCheckPlanStatus | undefined,
     primaryResponsibleDeptName: api.primaryResponsibleDeptName ?? api.responsibleDeptName ?? api.responsibleDept,
@@ -908,7 +909,7 @@ export function mapAreaCheckPlanApiRecordToUi(api: AreaCheckPlanManageApiRecord
     checklistTemplateName: api.checklistTemplateName,
     checkKeyContent: api.checkKeyContent,
     needOverallDesc: toBool(api.needOverallDesc),
-    needInspectedSign: toBool(api.needSigneeSign),
+    needSigneeSign: toBool(api.needSigneeSign),
     planStartTime: api.planStartTime,
     planEndTime: api.planEndTime,
     isDeleted: api.isDeleted,
@@ -958,7 +959,7 @@ function uiRecordToApi(ui: AreaCheckPlanRecord & { id?: number }): AreaCheckPlan
     checklistTemplateName: ui.checklistTemplateName,
     checkKeyContent: ui.checkKeyContent,
     needOverallDesc: toNum(ui.needOverallDesc),
-    needSigneeSign: toNum(ui.needInspectedSign),
+    needSigneeSign: toNum(ui.needSigneeSign),
     planStartTime: ui.planStartTime,
     planEndTime: ui.planEndTime,
     status: ui.status as number | undefined,

+ 1 - 0
src/router/routers/production-safety-router/risk-identification-and-control.ts

@@ -663,6 +663,7 @@ const riskIdentificationAndControlRoutes: RouteComponent[] = [{
       component: '/production-safety/risk-identification-and-control/key-site-sensor-manage/index',
       meta: {
         title: '重点部位传感器管理',
+        activeMenu: '/work-safety//risk-identification-and-control/key-site-sensor-manage',
         icon: 'OverviewIcon',
         isRoot: false,
         hidden: false,

+ 8 - 8
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/areaCheckPlanManagement.vue

@@ -88,8 +88,8 @@
             <template #needOverallDesc="scope">
               <span>{{ scope.row.needOverallDesc === true ? '是' : scope.row.needOverallDesc === false ? '否' : '-' }}</span>
             </template>
-            <template #needInspectedSign="scope">
-              <span>{{ scope.row.needInspectedSign === true ? '是' : scope.row.needInspectedSign === false ? '否' : '-' }}</span>
+            <template #needSigneeSign="scope">
+              <span>{{ scope.row.needSigneeSign === true ? '是' : scope.row.needSigneeSign === false ? '否' : '-' }}</span>
             </template>
             <template #action="scope">
               <div class="action-container--div" style="justify-content: left">
@@ -258,8 +258,8 @@
             <el-radio :value="false">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="是否需要被检查人签字:" prop="needInspectedSign">
-          <el-radio-group v-model="issueForm.needInspectedSign">
+        <el-form-item label="是否需要被检查人签字:" prop="needSigneeSign">
+          <el-radio-group v-model="issueForm.needSigneeSign">
             <el-radio :value="true">是</el-radio>
             <el-radio :value="false">否</el-radio>
           </el-radio-group>
@@ -321,7 +321,7 @@
     planStartTime: '',
     planEndTime: '',
     needOverallDesc: false,
-    needInspectedSign: false,
+    needSigneeSign: false,
   });
   const issueRules = {
     responsibleDeptIds: [{ required: true, message: '请选择责任部门', trigger: 'change', type: 'array', min: 1 }],
@@ -333,7 +333,7 @@
     planStartTime: [{ required: true, message: '请选择计划开始日期', trigger: 'change' }],
     planEndTime: [{ required: true, message: '请选择计划结束时间', trigger: 'change' }],
     needOverallDesc: [{ required: true, message: '请选择是否需要整体检查情况描述', trigger: 'change' }],
-    needInspectedSign: [{ required: true, message: '请选择是否需要被检查人签字', trigger: 'change' }],
+    needSigneeSign: [{ required: true, message: '请选择是否需要被检查人签字', trigger: 'change' }],
   };
   // 下发弹窗:责任部门/安全应急部门/院领导部门复用新增区域检查计划的主责部门下拉(getAllDepartments)
   const issueDeptTree = ref<DeptTree[]>([]);
@@ -415,7 +415,7 @@
     issueForm.planStartTime = '';
     issueForm.planEndTime = '';
     issueForm.needOverallDesc = false;
-    issueForm.needInspectedSign = false;
+    issueForm.needSigneeSign = false;
     issueFormRef.value?.resetFields?.();
   };
 
@@ -572,7 +572,7 @@
         planStartTime: issueForm.planStartTime,
         planEndTime: issueForm.planEndTime,
         needOverallDesc: issueForm.needOverallDesc,
-        needInspectedSign: issueForm.needInspectedSign,
+        needSigneeSign: issueForm.needSigneeSign,
       } as AreaCheckPlanRecord & { id: number } & Record<string, unknown>;
 
       await sendAreaCheckPlanToDep(payload);

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

@@ -103,7 +103,7 @@
           </div>
           <div class="col">
             <div class="label">是否需要被检查人签字:</div>
-            <div class="value">{{ viewDetail.needInspectedSign === true ? '是' : viewDetail.needInspectedSign === false ? '否' : '-' }}</div>
+            <div class="value">{{ viewDetail.needSigneeSign === true ? '是' : viewDetail.needSigneeSign === false ? '否' : '-' }}</div>
           </div>
         </div>
         <div class="row">
@@ -648,7 +648,7 @@
       categoryName: d?.categoryName ?? ruleFormData.categoryName ?? '-',
       checklistTemplateName: d?.checklistTemplateName ?? ruleFormData.checklistTemplateName ?? '-',
       needOverallDesc: d?.needOverallDesc ?? ruleFormData.needOverallDesc,
-      needInspectedSign: d?.needInspectedSign ?? ruleFormData.needInspectedSign,
+      needSigneeSign: d?.needSigneeSign ?? ruleFormData.needSigneeSign,
       planStartTime: d?.planStartTime ?? ruleFormData.planStartTime ?? '-',
       planEndTime: d?.planEndTime ?? ruleFormData.planEndTime ?? '-',
        createdPersonName: d?. createdPersonName ?? '-',

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

@@ -1,7 +1,7 @@
 // 区域检查计划状态配置(管理员与部门一致):0=未下发 1=进行中 2=已完成 3=已作废
 export const AREA_CHECK_PLAN_STATUS_OPTIONS = [
   { label: '全部', value: '' as const },
-  { label: '未下发', value: 0 },
+//   { label: '未下发', value: 0 },
   { label: '进行中', value: 1 },
   { label: '已完成', value: 2 },
   { label: '已作废', value: 3 },

+ 23 - 23
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/configs/tables.ts

@@ -29,104 +29,104 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     prop: 'status',
     slot: 'status',
     align: 'center',
-    minWidth: '90px',
+    minWidth: '120px',
   },
   {
     label: '检查场所所属类别',
     prop: 'venueCategoryName',
     align: 'left',
-    minWidth: '140px',
+    minWidth: '180px',
     showOverflowTooltip: true,
   },
   {
     label: '区域检查计划名称',
     prop: 'planName',
     align: 'left',
-    minWidth: '160px',
+    minWidth: '180px',
     showOverflowTooltip: true,
   },
   {
     label: '主责部门',
     prop: 'primaryResponsibleDeptName',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '140px',
     showOverflowTooltip: true,
   },
   {
     label: '自查频次',
     prop: 'selfCheckFrequency',
     align: 'left',
-    minWidth: '100px',
+    minWidth: '140px',
     showOverflowTooltip: true,
   },
   {
     label: '主责部门执行人所属分组名称',
     prop: 'mainDeptExecutorGroupName',
     align: 'left',
-    minWidth: '180px',
+    minWidth: '240px',
     showOverflowTooltip: true,
   },
   {
     label: '主责部门责任人',
     prop: 'mainDeptResponsiblePerson',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '160px',
     showOverflowTooltip: true,
   },
   {
     label: '安全应急部门名称',
     prop: 'safetyEmergencyDeptName',
     align: 'left',
-    minWidth: '140px',
+    minWidth: '180px',
     showOverflowTooltip: true,
   },
   {
     label: '安全应急部检查频次',
     prop: 'safetyEmergencyCheckFrequency',
     align: 'left',
-    minWidth: '150px',
+    minWidth: '180px',
     showOverflowTooltip: true,
   },
   {
     label: '安全应急部执行人所属分组名称',
     prop: 'safetyEmergencyExecutorGroupName',
     align: 'left',
-    minWidth: '200px',
+    minWidth: '260px',
     showOverflowTooltip: true,
   },
   {
     label: '安全应急部责任人',
     prop: 'safetyEmergencyResponsiblePerson',
     align: 'left',
-    minWidth: '130px',
+    minWidth: '180px',
     showOverflowTooltip: true,
   },
   {
     label: '院领导部门名称',
     prop: 'hospitalLeaderDeptName',
     align: 'left',
-    minWidth: '130px',
+    minWidth: '180px',
     showOverflowTooltip: true,
   },
   {
     label: '院领导检查频次',
     prop: 'hospitalLeaderCheckFrequency',
     align: 'left',
-    minWidth: '140px',
+    minWidth: '160px',
     showOverflowTooltip: true,
   },
   {
     label: '院领导执行人所属分组名称',
     prop: 'hospitalLeaderExecutorGroupName',
     align: 'left',
-    minWidth: '200px',
+    minWidth: '220px',
     showOverflowTooltip: true,
   },
   {
     label: '院领导责任人',
     prop: 'hospitalLeaderResponsiblePerson',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '140px',
     showOverflowTooltip: true,
   },
   {
@@ -140,14 +140,14 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     label: '检查单所属类别名称',
     prop: 'categoryName',
     align: 'left',
-    minWidth: '150px',
+    minWidth: '180px',
     showOverflowTooltip: true,
   },
   {
     label: '检查单模版名称',
     prop: 'checklistTemplateName',
     align: 'left',
-    minWidth: '140px',
+    minWidth: '160px',
     showOverflowTooltip: true,
   },
   {
@@ -155,26 +155,26 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     prop: 'needOverallDesc',
     slot: 'needOverallDesc',
     align: 'center',
-    minWidth: '180px',
+    minWidth: '240px',
   },
   {
     label: '是否需要被检查人签字',
-    prop: 'needInspectedSign',
-    slot: 'needInspectedSign',
+    prop: 'needSigneeSign',
+    slot: 'needSigneeSign',
     align: 'center',
-    minWidth: '160px',
+    minWidth: '200px',
   },
   {
     label: '计划开始时间',
     prop: 'planStartTime',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '160px',
   },
   {
     label: '计划结束时间',
     prop: 'planEndTime',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '160px',
   },
   {
     label: '操作',

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

@@ -84,8 +84,8 @@
             <template #needOverallDesc="scope">
               <span>{{ scope.row.needOverallDesc === true ? '是' : scope.row.needOverallDesc === false ? '否' : '-' }}</span>
             </template>
-            <template #needInspectedSign="scope">
-              <span>{{ scope.row.needInspectedSign === true ? '是' : scope.row.needInspectedSign === false ? '否' : '-' }}</span>
+            <template #needSigneeSign="scope">
+              <span>{{ scope.row.needSigneeSign === true ? '是' : scope.row.needSigneeSign === false ? '否' : '-' }}</span>
             </template>
             <template #action="scope">
               <div class="action-container--div" style="justify-content: left">

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

@@ -103,7 +103,7 @@
           </div>
           <div class="col">
             <div class="label">是否需要被检查人签字:</div>
-            <div class="value">{{ viewDetail.needInspectedSign === true ? '是' : viewDetail.needInspectedSign === false ? '否' : '-' }}</div>
+            <div class="value">{{ viewDetail.needSigneeSign === true ? '是' : viewDetail.needSigneeSign === false ? '否' : '-' }}</div>
           </div>
         </div>
         <div class="row">
@@ -357,6 +357,7 @@
   const viewDetail = computed(() => {
     const d = viewDetailData.value;
     const status = d?.status as number | undefined;
+    console.log(d,'d')
     return {
       ...d,
       statusName: status != null ? AREA_CHECK_PLAN_STATUS_LABEL[String(status)] ?? '-' : '-',
@@ -380,7 +381,7 @@
       categoryName: (d?.categoryName ?? d?.checklistCategoryName) ?? '-',
       checklistTemplateName: d?.checklistTemplateName ?? '-',
       needOverallDesc: d?.needOverallDesc,
-      needInspectedSign: d?.needInspectedSign,
+      needSigneeSign: d?.needSigneeSign,
       planStartTime: d?.planStartTime ?? '-',
       planEndTime: d?.planEndTime ?? '-',
       createdPersonName: (d?.createdPersonName ?? '') || '-',