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

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

@@ -153,6 +153,7 @@
     associationOneThree?: string;
     attachments?: string;
     attachmentList?: Array<{ fileName?: string; fileUrl?: string; fileNameOrUrl?: string; url?: string }>;
+    issueId?: number;
   } | null>(null);
 
   const showRejectDialog = ref(false);
@@ -220,6 +221,7 @@
           associationOneThree: data.associationOneThree,
           attachments: data.attachments,
           attachmentList: data.attachmentList,
+          issueId: data.issueId,
         };
       }
     } catch (e) {
@@ -267,7 +269,7 @@
     submitting.value = true;
     try {
       await approveDrawLessons({
-        id: id.value,
+        id: detailData.value.issueId ?? '',
         statusId: 5,
         statusName: '已完成',
       });

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

@@ -98,6 +98,10 @@
             </template>
             <template #action="scope">
               <div class="action-container--div" style="justify-content: left">
+                <ActionButton
+                  text="查看"
+                  @click="handleView(scope.row)"
+                />
                 <ActionButton
                   v-if="scope.row.statusName === '待反馈'"
                   text="作废"
@@ -312,17 +316,28 @@
     }
   };
 
-  const handleApprove = () => {
+  const handleApprove = (row) => {
     if (!id.value) return;
     router.push({
       name: 'oneByOneManagementItem',
       query: {
-        id: String(id.value),
+        id: String(row.id),
         operate: 'one-by-one-audit-detail',
       },
     });
   };
 
+  const handleView = (row) => {
+    if (!id.value) return;
+    router.push({
+      name: 'oneByOneManagementItem',
+      query: {
+        id: String(row.id),
+        operate: 'one-by-one-view',
+      },
+    });
+  };
+
   onMounted(() => {
     getDetail();
   });

src/views/production-safety/safety-culture/safetyPublicityBoardManagement/configs/tables.ts

@@ -34,13 +34,13 @@ export const INVENTORY_TABLE_COLUMNS: TableColumnProps[] = [
     align: 'left',
     minWidth: '120px',
   },
-  {
-    label: '资料描述',
-    prop: 'fileCode',
-    align: 'left',
-    minWidth: '120px',
-    // showOverflowTooltip: true,
-  },
+  // {
+  //   label: '资料描述',
+  //   prop: 'fileCode',
+  //   align: 'left',
+  //   minWidth: '120px',
+  //   showOverflowTooltip: true,
+  // },
   {
     label: '上传时间',
     prop: 'fileVersion',

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

@@ -8,12 +8,12 @@
         <header>
           <div style="position: relative">
             <el-button type="primary" class="search-table-container--button" @click="handleCreate"> 添加 </el-button>
-            <!-- <el-button plain class="search-table-container--button" @click="handleImport">
+            <el-button plain class="search-table-container--button" @click="handleImport">
               导入
             </el-button>
             <el-button plain class="search-table-container--button" @click="handleDownload">
               导出
-            </el-button> -->
+            </el-button>
           </div>
 
           <div class="act-search">

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

@@ -10,12 +10,12 @@
             <el-button type="primary" class="search-table-container--button" @click="handleCreate">
               奖励申请
             </el-button>
-            <!-- <el-button plain class="search-table-container--button" @click="handleImport">
+            <el-button plain class="search-table-container--button" @click="handleImport">
               导入
             </el-button>
             <el-button plain class="search-table-container--button" @click="handleDownload">
               导出
-            </el-button> -->
+            </el-button>
           </div>
 
           <div class="act-search">

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

@@ -6,14 +6,14 @@
     <main class="safety-platform-container__main">
       <div class="search-table-container">
         <header>
-          <div style="position: relative">
-            <!-- <el-button plain class="search-table-container--button" @click="handleImport">
+          <!-- <div style="position: relative">
+            <el-button plain class="search-table-container--button" @click="handleImport">
               导入
             </el-button>
             <el-button plain class="search-table-container--button" @click="handleDownload">
               导出
-            </el-button> -->
-          </div>
+            </el-button>
+          </div> -->
 
           <div class="act-search">
             <section class="select-box">