Merge branch 'feat/production-safety' of http://14.103.151.10:8888/product-group-fe/sfy-safety-group/sfy-safety into feat/production-safety

src/api/hiddenDanger/index.ts

@@ -54,6 +54,8 @@ export interface HiddenDangerItem {
   canView?: boolean;
   /** 审查不通过原因（详情/整改页展示） */
   reviewRejectReason?: string;
+  /** 整改负责人（详情/整改页展示） */
+  rectificationResponsibleIds?: string;
 }
 
 /**

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

@@ -152,9 +152,9 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="YYYY-MM-DD"
-          style="margin-right: 12px"
+          style="margin-right: 12px;max-width: 280px;"
         />
-        <el-button type="primary" @click="onRecordSearch">查询</el-button>
+        <el-button type="primary" class="view-record-toolbar-btn" @click="onRecordSearch">查询</el-button>
         <el-button @click="onRecordExport">导出</el-button>
         <el-button type="primary" @click="onAddRecord">新增检查日志</el-button>
       </div>
@@ -1002,4 +1002,9 @@
   .view-record-table {
     margin-bottom: 16px;
   }
+
+  .view-record-toolbar-btn{
+    margin-left: auto;
+  }
+
 </style>

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

@@ -874,7 +874,9 @@ const attachmentsFileList = ref([]) as any
     await queryDangerTypePage({
       pageNumber: 1,
       pageSize: 9999,
-      queryParam: {}
+      queryParam: {
+        status: 1
+      }
     }).then(res => {
       hiddenRiskCategoriesList.value = res?.records || [];
     });

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/hiddenTroubleAccountManagement.vue

@@ -92,13 +92,13 @@
                 <!-- 待整改 statusId=2：查看、整改、扣分 -->
                 <template v-else-if="scope.row.statusId === 2">
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
-                  <ActionButton text="整改" @click="handleRectify(scope.row.id)" />
+                  <ActionButton text="整改" @click="handleRectify(scope.row.id)" v-if="id === scope.row.rectificationResponsibleIds"/>
                   <ActionButton text="扣分" @click="handleOpenDeduct(scope.row.id)" />
                 </template>
                 <!-- 待复查 statusId=3：查看、复查、扣分 -->
                 <template v-else-if="scope.row.statusId === 3">
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
-                  <ActionButton text="复查" @click="handleReview(scope.row.id)" />
+                  <ActionButton text="复查" @click="handleReview(scope.row.id)" v-if="id === scope.row.reviewPersonId"/>
                   <ActionButton text="扣分" @click="handleOpenDeduct(scope.row.id)" />
                 </template>
                 <!-- 已完成 statusId=4：查看、扣分 -->
@@ -248,6 +248,8 @@
   import BatchImport from '@/components/batch-import/BatchImport.vue';
   import { useGlobSetting } from '@/hooks/setting';
   import urlJoin from 'url-join';
+  import { useUserInfoHook } from '@/hooks/useUserInfoHook'
+  const { id } = useUserInfoHook();
 
   const router = useRouter();
 
@@ -298,6 +300,8 @@
           currentNode: item.currentNode,
           statusName: item.statusName,
           statusId: item.statusId,
+          reviewPersonId: item.reviewPersonId,
+          rectificationResponsibleIds: Number(item.rectificationResponsibleIds),
         }));
         pagination.total = (res as any).totalRow ?? (res as any).total ?? 0;
       } else {

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/components/OneByOneNotifyTarget.vue

@@ -306,7 +306,6 @@
   };
 
   const handleCancel = async (row: any) => {
-    ElMessage.info('作废功能待对接接口');
     try {
       await cancellationMessagePost(row.id);
       ElMessage.success('作废成功');

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

@@ -211,6 +211,7 @@
     :visible="batchImportVisible"
     :importApiUrl="importApiUrl"
     :templateUrl="templateUrl"
+    :show-template="true"
     :templateName="'责任清单(非区域管理员)-批量导入模版'"
     @close="() => (batchImportVisible = false)"
     @update="handleUpdate"
@@ -268,7 +269,7 @@
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
   const importApiUrl = ref(urlJoin(urlPrefix, '/areaCheckList/importArea?type=2'));
-  const templateUrl = ref('');
+  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/责任清单-非公共区域导入模版.xlsx');
 
   const handleUpdate = () => {
     batchImportVisible.value = false;

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

@@ -206,6 +206,7 @@
     :visible="batchImportVisible"
     :importApiUrl="importApiUrl"
     :templateUrl="templateUrl"
+    :show-template="true"
     :templateName="'责任清单-批量导入模版'"
     @close="() => (batchImportVisible = false)"
     @update="handleUpdate"
@@ -263,7 +264,7 @@
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
   const importApiUrl = ref(urlJoin(urlPrefix, '/areaCheckList/importArea?type=1'));
-  const templateUrl = ref('');
+  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/责任清单-公共区域导入模版.xlsx');
 
   const handleUpdate = () => {
     batchImportVisible.value = false;

src/views/production-safety/safetyAssessment/inventory/inventory.vue

@@ -84,8 +84,8 @@
       :visible="batchImportVisible"
       :import-api-url="importApiUrl"
       :template-url="templateUrl"
-      template-name="下载模板"
-      :show-template="false"
+      template-name="奖品库管理导入模版"
+      :show-template="true"
       @close="batchImportVisible = false"
       @update="handleUpdate"
     />
@@ -183,7 +183,7 @@
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
   const importApiUrl = ref(urlJoin(urlPrefix, '/inventory/importInventory'));
-  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/import-inventory-template.xlsx');
+  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/奖品库导入模版.xlsx');
 
   const handleImport = () => {
     batchImportVisible.value = true;

src/views/production-safety/safetyAssessment/pointDeduction/pointDeduction.vue

@@ -82,8 +82,8 @@
       :visible="batchImportVisible"
       :import-api-url="importApiUrl"
       :template-url="templateUrl"
-      template-name="下载模板"
-      :show-template="false"
+      template-name="月度扣分管理导入模版"
+      :show-template="true"
       @close="batchImportVisible = false"
       @update="handleUpdate"
     />
@@ -181,7 +181,7 @@
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
   const importApiUrl = ref(urlJoin(urlPrefix, '/monthlyDeduction/importMonthlyDeduction'));
-  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/import-point-deduction-template.xlsx');
+  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/月度扣分管理导入模版.xlsx');
 
   const handleImport = () => {
     batchImportVisible.value = true;

src/views/production-safety/safetyAssessment/receiptRecord/receiptRecord.vue

@@ -128,8 +128,8 @@
       :visible="batchImportVisible"
       :import-api-url="importApiUrl"
       :template-url="templateUrl"
-      template-name="下载模板"
-      :show-template="false"
+      template-name="物品领取记录管理导入模版"
+      :show-template="true"
       @close="batchImportVisible = false"
       @update="handleUpdate"
     />
@@ -235,7 +235,7 @@
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
   const importApiUrl = ref(urlJoin(urlPrefix, '/claimItemsLog/importClaimItemsLog'));
-  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/import-receipt-record-template.xlsx');
+  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/物品领取记录管理导入模版.xlsx');
 
   const handleImport = () => {
     batchImportVisible.value = true;