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/production-education-training-plan-dept/index.ts

@@ -160,6 +160,29 @@ export function queryEducationAndTrainingProgramDetail(id: string | number) {
   });
 }
 
+/**
+ * 教育培训计划管理（部门）-签到部门名单
+ */
+export function querySignInDepartmentList(data) {
+  return http.request({
+    url: `/educationTrainingPlanIssuance/querySignInDepartmentList`,
+    method: 'post',
+    data,
+  });
+}
+
+/**
+ * 教育培训计划管理（部门）-导出签到部门名单
+ */
+export function exportSignInDepartmentList(data) {
+  return http.request({
+    url: `/educationTrainingPlanIssuance/exportSignInDepartmentList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  }, { isTransformResponse: false });
+}
+
 /**
  * @description: 导出
  * @param {ProductionSafetyFileQuery} params
@@ -172,7 +195,7 @@ export function exportTableData(params: ProductionSafetyFileQuery){
         method: 'post',
         responseType: 'blob',
         params,
-        },
+    },
         { isTransformResponse: false },
     );
 }

src/api/production-education-training-plan/index.ts

@@ -87,8 +87,9 @@ export function cancelEducationAndTrainingProgram(data: any) {
  */
 export function deleteEducationAndTrainingProgram(data) {
   return http.request({
-    url: `/educationTrainingPlan/delete?detid=${data.detid}&mid=${data.mid}`,
+    url: `/educationTrainingPlan/delete`, 
     method: 'delete',
+    data,
   });
 }
 

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

@@ -140,7 +140,7 @@
       </el-form-item>
 
       <section v-if="ruleFormData.isDrawLessonsPush === 1">
-        <el-form-item label="举一反三内容" prop="drawLessonsContent">
+        <el-form-item label="举一反三内容：" prop="drawLessonsContent">
           <el-input
             v-model="ruleFormData.drawLessonsContent"
             placeholder="请输入举一反三内容（选填）"
@@ -209,7 +209,7 @@
                 />
                 <div class="file-list" v-if="detailStatusOrder>=3">
                     <div class="file-item" v-for="file in attachmentsFileList" :key="file.fileId">
-                        <span class="file-item--name">{{ file.fileName }}</span>
+                        <span class="file-item--name">{{ file.fileName ||file.file_name }}</span>
                         <div class="file-item--footer">
                             <el-button link type="primary" @click="previewOnline(file.fileUrl, file.fileType)">
                                 预览

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

@@ -10,7 +10,7 @@
             <!-- <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>
+            <!-- <el-button plain class="search-table-container--button" @click="handleImport"> 导入 </el-button> -->
           </div>
 
           <div class="act-search">

src/views/production-safety/implement-safety-duty/create-responsibility-agree.vue

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        {{ $route?.meta?.title }}
+        创建安全责任书
       </div>
     </header>
     <main class="safety-platform-container__main">

src/views/production-safety/implement-safety-duty/edit-responsibility-agree.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="safety-platform-container">
     <header class="safety-platform-container__header">
-      <div class="breadcrumb-title"> <BreadcrumbBack /> {{ $route?.meta?.title }} </div>
+      <div class="breadcrumb-title"> <BreadcrumbBack /> 编辑安全责任书 </div>
     </header>
     <main class="safety-platform-container__main">
       <el-form ref="formRef" label-width="auto" :model="formValue" :rules="rules">

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

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        创建非公共区域责任清单
+        新增安全责任清单
       </div>
     </header>
     <main class="safety-platform-container__main">

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

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        变更非公共区域责任清单
+        变更安全责任清单
       </div>
     </header>
     <main class="safety-platform-container__main">

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

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        编辑非公共区域责任清单
+        编辑安全责任清单
       </div>
     </header>
     <main class="safety-platform-container__main">

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

@@ -1,7 +1,7 @@
 <template>
   <div class="safety-platform-container">
     <header class="safety-platform-container__header">
-      <div class="breadcrumb-title">{{ $route.meta.title }}</div>
+      <div class="breadcrumb-title">安全责任清单</div>
       <el-tabs v-model="activeTab" @tab-change="handleTabChange">
         <el-tab-pane label="公共区域" :name="1" />
         <el-tab-pane label="非公共区域" :name="2" />
@@ -166,7 +166,7 @@
       </div>
     </main>
     <!-- 变更记录 -->
-    <el-dialog width="70%" v-model="changedVisible" title="非公共区域变更记录">
+    <el-dialog width="70%" v-model="changedVisible" title="安全责任清单变更记录">
         <div class="table-content">
             <h4>当前信息（变更后）</h4>
             <el-table :data="changedListData.currentRecord">

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

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        查看非公共区域责任清单
+        查看安全责任清单
       </div>
     </header>
     <main class="safety-platform-container__main">
@@ -74,7 +74,7 @@
       </el-form>
     </main>
     <footer class="safety-platform-container__footer">
-      <el-button type="primary" @click="$router.push({ name: 'listResponsibilities:nonPublic' })">返回</el-button>
+      <el-button @click="$router.push({ name: 'listResponsibilities:nonPublic' })">返回</el-button>
     </footer>
   </div>
 </template>

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

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        创建公共区域责任清单
+        新增安全责任清单
       </div>
     </header>
     <main class="safety-platform-container__main">

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

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        变更公共区域责任清单
+        变更安全责任清单
       </div>
     </header>
     <main class="safety-platform-container__main">

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

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        编辑公共区域责任清单
+        编辑安全责任清单
       </div>
     </header>
     <main class="safety-platform-container__main">

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

@@ -1,7 +1,7 @@
 <template>
   <div class="safety-platform-container">
     <header class="safety-platform-container__header">
-      <div class="breadcrumb-title">{{ $route.meta.title }}</div>
+      <div class="breadcrumb-title">安全责任清单</div>
       <el-tabs v-model="activeTab" @tab-change="handleTabChange">
         <el-tab-pane label="公共区域" :name="1" />
         <el-tab-pane label="非公共区域" :name="2" />
@@ -161,7 +161,7 @@
       </div>
     </main>
     <!-- 变更记录 -->
-    <el-dialog width="70%" v-model="changedVisible" title="公共区域变更记录">
+    <el-dialog width="70%" v-model="changedVisible" title="安全责任清单变更记录">
         <div class="table-content">
             <h4>当前信息（变更后）</h4>
             <el-table :data="changedListData.currentRecord">

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

@@ -3,7 +3,7 @@
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">
         <BreadcrumbBack />
-        查看公共区域责任清单
+        查看安全责任清单
       </div>
     </header>
     <main class="safety-platform-container__main">
@@ -74,7 +74,7 @@
       </el-form>
     </main>
     <footer class="safety-platform-container__footer">
-      <el-button type="primary" @click="$router.push({ name: 'listResponsibilities:public' })">返回</el-button>
+      <el-button @click="$router.push({ name: 'listResponsibilities:public' })">返回</el-button>
     </footer>
   </div>
 </template>

src/views/production-safety/implement-safety-duty/responsibility-agree-manage-dept.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="safety-platform-container">
     <header class="safety-platform-container__header">
-      <div class="breadcrumb-title"> 安全责任书管理 (部门侧)</div>
+      <div class="breadcrumb-title"> 安全责任书签署</div>
       <!-- <el-tabs v-model="activeTab">
         <el-tab-pane label="全部" name="" />
         <el-tab-pane label="院领导" name="院领导" />

src/views/production-safety/implement-safety-duty/responsibility-feedback.vue

@@ -1,8 +1,10 @@
 <template>
   <div class="safety-platform-container">
+      <div class="breadcrumb-title"><BreadcrumbBack /> {{$route.query.mode !== 'view' ? '反馈安全责任书' : '查看安全责任书'}}</div>
     <header class="safety-platform-container__header">
-      <div class="breadcrumb-title"><BreadcrumbBack /> {{ formData?.responsibilityName }} </div>
+      <h4>{{ formData?.responsibilityName }}</h4>
       <div class="detail-content">
+        
         <span>类别名称：{{ formData?.departmentName }} </span>
         <span>创建人：{{ formData?.createdByName }} </span>
         <span>创建时间：{{ formData?.createdAt }} </span>
@@ -500,7 +502,17 @@
       }
     }
   }
-
+  .breadcrumb-title {
+    display: flex;
+    justify-content: flex-start;
+    gap: 16px;
+    padding: 16px 22px;
+    flex-shrink: 0;
+    background-color: white;
+    font-size: 20px;
+    font-weight: 600;
+    color: rgba(0, 0, 0, 0.85);
+  }
   // :deep(.breadcrumb .title) {
   //   margin-left: 0;
   // }

src/views/production-safety/implement-safety-duty/sign-agree-dept.vue

@@ -5,7 +5,7 @@
       title="您提交的反馈材料审核不通过，请尽快查看并修改，再次提交进行审核，谢谢！"
       type="warning"
     />
-    <div class="back"><BreadcrumbBack /> 安全责任书签署 </div>
+    <div class="back"><BreadcrumbBack /> 签署安全责任书 </div>
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title">{{ formData?.responsibilityName }} </div>
       <div class="detail-content">

src/views/production-safety/implement-safety-duty/view-recipients.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="safety-platform-container">
-    <div class="breadcrumb-title back"> <BreadcrumbBack /> {{ $route.meta.title }} </div>
+    <div class="breadcrumb-title back"> <BreadcrumbBack /> 查看下发对象 </div>
     <header class="safety-platform-container__header">
       <div class="detail-content">
         <span>类别名称：{{ detailData?.departmentName }} </span>

src/views/production-safety/productionSafetySystem/safetySystemConstructionWorkPlanManagement/components/safetySystemConstructionWorkPlanManagementDetail.vue

@@ -20,7 +20,11 @@
 
       <el-form-item label="责任部门：" prop="responsibleDeptIds" required>
         <!-- 新需求，增加全选功能 -->
+        <template v-if="isReviewMode || isViewMode">
+            <el-input type="textarea" resize="none"  v-model="deptName.responsibleDeptNames" disabled />
+        </template>
         <el-select
+          v-else
           v-model="form.responsibleDeptIds"
           multiple
           :disabled="isViewMode"
@@ -45,7 +49,11 @@
       </el-form-item>
 
       <el-form-item label="配合部门：" prop="cooperateDeptIds" required>
+        <template v-if="isReviewMode || isViewMode">
+            <el-input type="textarea" resize="none"  v-model="deptName.cooperateDeptNames" disabled />
+        </template>
         <el-cascader
+          v-else
           v-model="form.cooperateDeptIds"
           :options="deptTree"
           :props="cascaderProp"
@@ -139,6 +147,7 @@
 
   const isCreateMode = computed(() => operate.value === 'work-plan-create');
   const isEditMode = computed(() => operate.value === 'work-plan-edit');
+  const isReviewMode = computed(() => operate.value === 'work-plan-review');
   const isViewMode = computed(() => operate.value === 'work-plan-view' || operate.value === 'view-work-content-of-sender');
   const isViewWorkContentOfSender = computed(() => operate.value === 'view-work-content-of-sender');
   const form = reactive<SaveWorkPlanRequest>({
@@ -151,7 +160,10 @@
     plannedComplateTime: '',
     fileUrl: '',
   });
-
+  const deptName = reactive({
+    responsibleDeptNames: '',
+    cooperateDeptNames: '',
+  });
   // 分类名称选项
   const classifyNameOptions = ref<Array<{ label: string; value: string }>>([
     { label: '安全综合工作', value: '安全综合工作' },
@@ -278,6 +290,8 @@
           responsibleDeptIds: responsibleDeptIdsArray,
           fileUrl: JSON.parse(res.fileUrl || '[]'),
         });
+        deptName.cooperateDeptNames = res.cooperateDeptNames as string;
+        deptName.responsibleDeptNames = res.responsibleDeptName as string;
       }
     } catch (e) {
       console.error('获取详情失败:', e);
@@ -298,6 +312,8 @@
           responsibleDeptIds: responsibleDeptIdsArray,
           fileUrl: JSON.parse(res.fileUrl || '[]'),
         });
+        deptName.cooperateDeptNames = res.cooperateDeptNames as string;
+        deptName.responsibleDeptNames = res.responsibleDeptNames as string;
       }
     } catch (e) {
       console.error('获取详情失败:', e);
@@ -341,13 +357,6 @@
       ElMessage.error('保存失败，请重试');
     }
   };
-  // 强制触发组件重新匹配label, 解决视图无法匹配label问题
-watch(deptTree, () => {
-    if (isEditMode.value || isViewMode.value) {
-        form.cooperateDeptIds = [...parseDeptIds(form.cooperateDeptIds)];
-        form.responsibleDeptIds = [...parseDeptIds(form.responsibleDeptIds)];
-    }
-});
   onMounted(async () => {
    await loadDeptTreeData();
 

src/views/production-safety/productionSafetySystem/safetySystemConstructionWorkPlanManagementDept/components/safetySystemConstructionWorkPlanManagementDeptDetail.vue

@@ -26,7 +26,11 @@
       </el-form-item>
 
       <el-form-item label="责任部门：" prop="responsibleDeptIds" required>
+        <template v-if="isEditMode || isViewMode">
+            <el-input type="textarea" resize="none"  v-model="deptName.responsibleDeptNames" disabled />
+        </template>
         <el-cascader
+          v-else
           v-model="form.responsibleDeptIds"
           :options="deptTree"
           :props="cascaderProp"
@@ -36,12 +40,16 @@
           :max-collapse-tags="3"
           placeholder="请选择责任部门"
           style="width: 100%"
-          :disabled="true"
+          :disabled="isEditMode || isViewMode"
         />
       </el-form-item>
 
       <el-form-item label="配合部门：" prop="cooperateDeptIds" required>
+         <template v-if="isEditMode || isViewMode">
+            <el-input type="textarea" resize="none" v-model="deptName.cooperateDeptNames" disabled />
+        </template>
         <el-cascader
+          v-else
           v-model="form.cooperateDeptIds"
           :options="deptTree"
           :props="cascaderProp"
@@ -52,7 +60,7 @@
           popper-class="cascader-popper--custom"
           placeholder="请选择配合部门"
           style="width: 100%"
-          :disabled="true"
+          :disabled="isEditMode || isViewMode"
         />
       </el-form-item>
 
@@ -134,7 +142,6 @@
 
 
   const currentId = computed(() => Number(route.query.id));
-  const currentPlanId = computed(() => Number(route.query.planId));
 
   const operate = computed(() => (route.query.operate as string) || 'work-plan-dept-view');
   const isEditMode = computed(() => operate.value === 'work-plan-dept-issue');
@@ -150,6 +157,10 @@
     plannedComplateTime: '',
     fileUrl: '',
   });
+  const deptName = reactive({
+    responsibleDeptNames: '',
+    cooperateDeptNames: '',
+  });
 
   // 分类名称选项
   const classifyNameOptions = ref<Array<{ label: string; value: string }>>([
@@ -198,7 +209,7 @@
     }
   }
 
-  const attachmentFileList = computed(() => convertAttachmentJsonToFileItems(form.fileUrl || ''));
+  const attachmentFileList = ref([]) //computed(() => convertAttachmentJsonToFileItems(form.fileUrl || ''));
 
   async function handleAttachmentUploadSuccess(files: FileItem[]) {
     if (!files?.length) {
@@ -236,14 +247,6 @@
     }
   };
 
-  //  时间格式化
-  const formatDate = (date) => {
-    if (!date) return '';
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, '0');
-    const day = String(date.getDate()).padStart(2, '0');
-    return `${year}-${month}-${day}`; // 输出：****-**-**
-  };
   //转部门格式 “2,3“ -> [2,3]
   const parseDeptIds = (ids: string | string[] | number[] | undefined | null): number[] => {
     if (!ids) {
@@ -287,8 +290,12 @@
           responsibleDeptIds: responsibleDeptIdsArray,
           fileUrl: JSON.parse(res.fileUrl || '[]'),
         });
+        deptName.cooperateDeptNames = res.cooperateDeptNames as string;
+        deptName.responsibleDeptNames = res.responsibleDeptName as string;
+        if(res.fileUrl) {
+          attachmentFileList.value = JSON.parse(res.fileUrl || '[]');
+        }
       }
-      // cloneRuleFormData();
     } catch (e) {
       console.error('获取物品库存详情失败:', e);
       ElMessage.error('获取详情失败');
@@ -319,13 +326,6 @@
       ElMessage.error('保存失败，请重试');
     }
   };
-  // 强制触发组件重新匹配label, 解决视图无法匹配label问题
-watch(deptTree, () => {
-    if (isEditMode.value || isViewMode.value) {
-        form.cooperateDeptIds = [...parseDeptIds(form.cooperateDeptIds)];
-        form.responsibleDeptIds = [...parseDeptIds(form.responsibleDeptIds)];
-    }
-});
   onMounted(async () => {
     await loadDeptTreeData();
     if (isEditMode.value || isViewMode.value) {

src/views/production-safety/safety-culture/accidentCaseManagement/configs/form.ts

@@ -1,4 +1,3 @@
-
 import { FileItem } from '@/components/UploadFiles/types';
 import { FormConfig } from '@/types/basic-form';
 
@@ -8,7 +7,7 @@ export const ACADEMY_FILE_FORM_CONFIG: FormConfig[] = [
     label: '事故案例名称：',
     component: 'ElInput',
     componentProps: {
-      placeholder: '请输入文件名称',
+      placeholder: '请输入案例名称',
       style:'width:45%',
     },
   },

src/views/production-safety/safety-culture/safetyCultureActivityManagement/safetyCultureActivityManagement.vue

@@ -337,7 +337,7 @@
   };
 
   const normalizeCooperateDeptName = (row: any): string => {
-    const rawName = row?.cooperateDeptName || row?.specificDeptName;
+    const rawName = row?.cooperateDeptNames;
     if (rawName) {
       return normalizeListText(rawName);
     }

src/views/production-safety/safety-culture/safetyCultureActivityManagementExecutor/safetyCultureActivityManagementExecutor.vue

@@ -312,7 +312,7 @@ const loadDeptNameMap = async () => {
 };
 
 const normalizeCooperateDeptName = (row: any): string => {
-  const rawName = row?.cooperateDeptName || row?.specificDeptName;
+  const rawName = row?.cooperateDeptNames;
   if (rawName) {
     return normalizeListText(rawName);
   }

src/views/production-safety/safetyAssessment/receiptRecord/configs/status.ts

@@ -1,6 +1,7 @@
 // 物品领取记录状态配置
-// 0 待审核, 1 审核通过, -1 审核不通过, 2 已领取
+// 0 待审核, 1 审核通过, -1 审核不通过, 2 已领取, 3 待提交
 export const RECEIPT_RECORD_STATUS_OPTIONS = [
+  { label: '待提交', value: 3 },
   { label: '待审核', value: 0 },
   { label: '审核通过', value: 1 },
   { label: '审核不通过', value: -1 },
@@ -12,6 +13,7 @@ export const RECEIPT_RECORD_STATUS_LABEL: Record<string, string> = {
   '1': '审核通过',
   '-1': '审核不通过',
   '2': '已领取',
+  '3': '待提交',
 };
 
 // 管理员审核页状态选项（含已领取）

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

@@ -13,9 +13,7 @@
             <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>
 
           <div class="act-search">
@@ -51,6 +49,9 @@
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button @click="handleReset">重置</el-button>
+              <el-button plain @click="handleDownload">
+              导出
+            </el-button>
             </section>
           </div>
         </header>

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagement/educationTrainingPlanManagement.vue

@@ -87,7 +87,7 @@
                     :popconfirm="{
                       title: '确定要删除?',
                     }"
-                    @confirm="handleDelete(scope.row.mid)"
+                    @confirm="handleDelete(scope.row)"
                   />
                   <ActionButton text="下发" @click="handleIssue(scope.row)" />
                 </template>

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/components/addTrainingInformation.vue

@@ -1,5 +1,9 @@
 <script lang="ts" setup>
-  import { saveTrainingInformation, updateTrainingInformation, queryEducationTrainingPlanCourseDetail } from '@/api/production-education-training-plan-dept';
+  import {
+    saveTrainingInformation,
+    updateTrainingInformation,
+    queryEducationTrainingPlanCourseDetail,
+  } from '@/api/production-education-training-plan-dept';
   import { ref, reactive, onMounted, watch, shallowRef, computed, nextTick } from 'vue';
   import { UploadFilled, Plus, Delete, Download, ZoomIn } from '@element-plus/icons-vue';
   import { TRAINING_FORM_RULES } from '../configs/form';
@@ -29,7 +33,7 @@
       default: null,
     },
   });
-  
+
   const isViewMode = computed(() => props.state === 'view');
   const isEditMode = computed(() => props.state === 'edit');
   const isCreateMode = computed(() => props.state === 'add');
@@ -37,7 +41,7 @@
   const emit = defineEmits(['update:visible', 'refreshList', 'saveSuccess']);
   const formRef = ref();
   const rules = ref(TRAINING_FORM_RULES);
-   // 富文本编辑器
+  // 富文本编辑器
   const editorRef = shallowRef();
   const form = reactive({
     courseType: '',
@@ -63,21 +67,21 @@
     { label: '特种作业复训考核', value: 4 },
   ]);
 
-   // 上传文件
- const formatAttachment = async (data: any) => {
+  // 上传文件
+  const formatAttachment = async (data: any) => {
     if (!data) return data;
     const uuid = Math.random().toString(36).substring(2, 9);
     const timestamp = Date.now().toString();
     const random = Math.random().toString(36).substring(2, 4);
     const fileName = data.name;
     const res = await uploadFileApi({
-        bizType: UPLOAD_BIZ_TYPE.ATTACHMENT,
-        fileName: `${uuid}-${timestamp}-${random}`,
-        file: data,
+      bizType: UPLOAD_BIZ_TYPE.ATTACHMENT,
+      fileName: `${uuid}-${timestamp}-${random}`,
+      file: data,
     });
     return res;
-};
-const openState = ref(false)
+  };
+  const openState = ref(false);
   // 打开抽屉时的事件
   const openDrawerFn = async () => {
     await nextTick();
@@ -87,49 +91,49 @@ const openState = ref(false)
       await queryEducationTrainingPlanCourseDetail(props.currentId).then((res) => {
         // console.log(res, '课程详情',);
         Object.assign(form, {
-            courseType: res.courseType,
-            courseName: res.courseName,
-            trainingMethod: res.trainingMethod,
-            trainingTeacher: res.trainingTeacher,
-            planNumOfParticipants: res.planNumOfParticipants,
-            startDate: res.startDate ? new Date(res.startDate) : '',
-            endDate: res.endDate ? new Date(res.endDate) : '',
-            courseIntroduction: res.courseIntroduction,
-            isSign: res.isSign,
-        }); 
+          courseType: res.courseType,
+          courseName: res.courseName,
+          trainingMethod: res.trainingMethod,
+          trainingTeacher: res.trainingTeacher,
+          planNumOfParticipants: res.planNumOfParticipants,
+          startDate: res.startDate ? new Date(res.startDate) : '',
+          endDate: res.endDate ? new Date(res.endDate) : '',
+          courseIntroduction: res.courseIntroduction,
+          isSign: res.isSign,
+        });
         form.groupOfParticipants = res.groupOfParticipants ? res.groupOfParticipants.split(',').map(Number) : [];
         // 编辑和查看时 没有回显
-        if(res.courseImg){
-            form.courseImg = JSON.parse(res.courseImg)
-            courseImgList.value = JSON.parse(res.courseImg) || []
+        if (res.courseImg) {
+          form.courseImg = JSON.parse(res.courseImg);
+          courseImgList.value = JSON.parse(res.courseImg) || [];
         }
-        if(res.courseContent){
-            fileList.value =  JSON.parse(res.courseContent) || [];
-            form.courseContent = JSON.parse(res.courseContent)
+        if (res.courseContent) {
+          fileList.value = JSON.parse(res.courseContent) || [];
+          form.courseContent = JSON.parse(res.courseContent);
         }
       });
     } else if (props.state === 'add') {
-        // 新增模式，重置表单
-        fileList.value = [];
-        Object.assign(form, {
-          courseType: '',
-          courseName: '',
-          trainingMethod: '',
-          trainingTeacher: '',
-          planNumOfParticipants: '',
-          groupOfParticipants: [],
-          startDate: '',
-          endDate: '',
-          courseIntroduction: '',
-          courseContent: '', // [] as FileItem[],
-          isSign: 0,
-          courseImg: [] as FileItem[],
-        });
-        courseContentUpload.value?.clearFiles();
-        courseImgRef.value?.clearFiles();
+      // 新增模式，重置表单
+      fileList.value = [];
+      Object.assign(form, {
+        courseType: '',
+        courseName: '',
+        trainingMethod: '',
+        trainingTeacher: '',
+        planNumOfParticipants: '',
+        groupOfParticipants: [],
+        startDate: '',
+        endDate: '',
+        courseIntroduction: '',
+        courseContent: '', // [] as FileItem[],
+        isSign: 0,
+        courseImg: [] as FileItem[],
+      });
+      courseContentUpload.value?.clearFiles();
+      courseImgRef.value?.clearFiles();
     }
   };
-  
+
   const editorConfig = computed(() => ({
     placeholder: '请输入培训课程简述',
   }));
@@ -143,37 +147,37 @@ const openState = ref(false)
 
   //  上传图片
   const handleImageUploadChange = async (file: any, fileLists: any) => {
-    if(file.raw){
-        try {
-            const res = await formatAttachment(file.raw);
-            
-            const targetFile = fileLists.find(f => f.uid === file.uid);
-            if (targetFile) {
-                targetFile.url = res.url; 
-                targetFile.contentType = res.contentType
-            }
-            courseImgList.value = fileLists; 
-            form.courseImg = JSON.stringify(fileLists);
-            ElMessage.success('上传成功');
-        } catch (error) {
-            ElMessage.error('上传失败，请重试');
-            // 上传失败时，可以从 fileLists 中移除该文件
-            courseImgList.value = fileLists.filter(f => f.uid !== file.uid);
+    if (file.raw) {
+      try {
+        const res = await formatAttachment(file.raw);
+
+        const targetFile = fileLists.find((f) => f.uid === file.uid);
+        if (targetFile) {
+          targetFile.url = res.url;
+          targetFile.contentType = res.contentType;
         }
+        courseImgList.value = fileLists;
+        form.courseImg = JSON.stringify(fileLists);
+        ElMessage.success('上传成功');
+      } catch (error) {
+        ElMessage.error('上传失败，请重试');
+        // 上传失败时，可以从 fileLists 中移除该文件
+        courseImgList.value = fileLists.filter((f) => f.uid !== file.uid);
+      }
     }
   };
   // 替换图片
   const courseImgRef = ref();
   const handleImageExceed = (files) => {
-    courseImgRef.value!.clearFiles(); 
+    courseImgRef.value!.clearFiles();
     const file = files[0] as UploadRawFile;
-    console.log(file)
+    console.log(file);
     if (!validateImage(file)) {
       return;
     }
-    courseImgRef.value!.handleStart(file); 
+    courseImgRef.value!.handleStart(file);
   };
-// 图片预览
+  // 图片预览
   const dialogVisible = ref(false);
   const dialogImageUrl = ref('');
   const handlePictureCardPreview = (file: any) => {
@@ -181,13 +185,13 @@ const openState = ref(false)
     dialogVisible.value = true;
   };
 
-  const handlePictureCardDelete = (file, fileLists)=>{
-    courseImgRef.value = fileLists.filter(f => f.uid !== file.uid);
-    console.log(courseImgRef.value)
+  const handlePictureCardDelete = (file, fileLists) => {
+    courseImgRef.value = fileLists.filter((f) => f.uid !== file.uid);
+    console.log(courseImgRef.value);
     form.courseImg = JSON.stringify(courseImgRef.value);
-  }
+  };
 
-// 图片格式校验
+  // 图片格式校验
   const validateImage = (file) => {
     const validMIME = [
       'image/jpeg',
@@ -223,14 +227,15 @@ const openState = ref(false)
   };
 
   // 验证文件类型
-    const allowedTypes = [
-      'application/rar',
-      'application/zip',
-      'application/msword',
-      'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-      'application/pdf',
-      'video/mp4',
-    ];
+  const allowedTypes = [
+    'application/rar',
+    'application/zip',
+    'application/msword',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    'application/pdf',
+    'video/mp4',
+  ];
 
   const beforeUpload = (file) => {
     const isAllowedType = allowedTypes.includes(file.type);
@@ -256,60 +261,56 @@ const openState = ref(false)
     courseContentUpload.value!.handleStart(file); // 手动触发上传
   };
 
-
-
   // 课程内容文件上传
   const handleFileChange = async (file, fileLists) => {
-    
+    // console.log(file, fileLists, '文件列表')
 
-    if (!allowedTypes.includes(file.raw.type)) {
-      ElMessage.error('不支持的文件格式');
-      return;
-    }
+    // if (!allowedTypes.includes(file.raw.type)) {
+    //   ElMessage.error('不支持的文件格式');
+    //   return;
+    // }
 
     if (file.raw.size > 20 * 1024 * 1024) {
       ElMessage.error('文件大小不能超过20MB');
       return;
     }
-    if(file.raw){
-        try {
-            const res = await formatAttachment(file.raw);
-            
-            const targetFile = fileLists.find(f => f.uid === file.uid);
-            if (targetFile) {
-                targetFile.url = res.url; 
-                targetFile.contentType = res.contentType
-            }
-            fileList.value = fileLists; 
-            form.courseContent = JSON.stringify(fileList.value); 
-            ElMessage.success('上传成功');
-        } catch (error) {
-            ElMessage.error('上传失败，请重试');
-            // 上传失败时，可以从 fileLists 中移除该文件
-            fileList.value = fileLists.filter(f => f.uid !== file.uid);
+    if (file.raw) {
+      try {
+        const res = await formatAttachment(file.raw);
+
+        const targetFile = fileLists.find((f) => f.uid === file.uid);
+        if (targetFile) {
+          targetFile.url = res.url;
+          targetFile.contentType = res.contentType;
         }
+        fileList.value = fileLists;
+        form.courseContent = JSON.stringify(fileList.value);
+        ElMessage.success('上传成功');
+      } catch (error) {
+        ElMessage.error('上传失败，请重试');
+        // 上传失败时，可以从 fileLists 中移除该文件
+        fileList.value = fileLists.filter((f) => f.uid !== file.uid);
+      }
     }
-
   };
   // 移除事件
-  const handleFileRemove = (file, fileLists)=>{
-    fileList.value = fileLists.filter(f => f.uid !== file.uid);
-    form.courseContent = JSON.stringify(fileList.value); 
-  }
+  const handleFileRemove = (file, fileLists) => {
+    fileList.value = fileLists.filter((f) => f.uid !== file.uid);
+    form.courseContent = JSON.stringify(fileList.value);
+  };
 
   // 提交保存/编辑
   const handleValidate = async () => {
     if (!formRef.value) return;
     try {
-        await formRef.value.validate();
-        return true;
+      await formRef.value.validate();
+      return true;
     } catch {
-        return false;
+      return false;
     }
   };
   const handleSave = debounce(async () => {
-    
-    if(form.startDate > form.endDate) {
+    if (form.startDate > form.endDate) {
       ElMessage.error('开始日期不能晚于结束日期');
       return;
     }
@@ -321,13 +322,12 @@ const openState = ref(false)
         ...form,
         petpiId: props.currentId,
       };
-    //   console.log('提交的表单数据：', basePayload);
-      
+      //   console.log('提交的表单数据：', basePayload);
+
       if (isCreateMode.value) {
         // 新增,创建接口
         await saveTrainingInformation(basePayload);
         ElMessage.success('创建成功');
-
       } else if (isEditMode.value && props.currentId) {
         // 编辑,更新接口
         await updateTrainingInformation({
@@ -335,7 +335,6 @@ const openState = ref(false)
           ...basePayload,
         });
         ElMessage.success('保存成功');
-
       }
       emit('saveSuccess');
     } catch (e) {
@@ -367,7 +366,7 @@ const openState = ref(false)
       direction="rtl"
       size="45%"
       @opened="openDrawerFn"
-      :title="state === 'add' ? '新增培训课程': state === 'edit' ? '编辑培训课程' : '查看培训课程'"
+      :title="state === 'add' ? '新增培训课程' : state === 'edit' ? '编辑培训课程' : '查看培训课程'"
       @close="$emit('update:visible', false)"
     >
       <el-form label-position="right" label-width="150px" :model="form" :rules="rules" ref="formRef">
@@ -451,7 +450,7 @@ const openState = ref(false)
             v-if="!isViewMode"
             :on-change="handleFileChange"
             :on-remove="handleFileRemove"
-            accept=".rar, .zip, .doc, .docx, .pdf, .mp4"
+            accept=".rar, .zip, .doc, .docx, .pdf, .mp4, .ppt, .pptx"
             :file-list="fileList"
           >
             <el-button type="default" :disabled="isViewMode">
@@ -465,13 +464,13 @@ const openState = ref(false)
             </template>
           </el-upload>
           <div class="file-list" v-else>
-          <div class="file-item" v-for="file in fileList" :key="file.fileId">
-            <span class="file-item--name">{{ file.name }}</span>
-            <div class="file-item--footer">
-              <el-button link type="primary" @click.stop="downloadFile(file.url, file.name)">下载</el-button>
+            <div class="file-item" v-for="file in fileList" :key="file.fileId">
+              <span class="file-item--name">{{ file.name }}</span>
+              <div class="file-item--footer">
+                <el-button link type="primary" @click.stop="downloadFile(file.url, file.name)">下载</el-button>
+              </div>
             </div>
           </div>
-        </div>
         </el-form-item>
 
         <el-form-item label="是否需要签名：" prop="isSign">
@@ -494,10 +493,11 @@ const openState = ref(false)
             :on-remove="handlePictureCardDelete"
             :on-preview="handlePictureCardPreview"
             :before-upload="validateImage"
-            list-type="picture-card">
-                <el-icon>
-                    <Plus />
-                </el-icon>
+            list-type="picture-card"
+          >
+            <el-icon>
+              <Plus />
+            </el-icon>
             <template #tip>
               <div class="el-upload__tip"> 支持格式：.jpg .png .jpeg，单个文件不能超过300k，设置一个默认图片。</div>
             </template>
@@ -516,7 +516,7 @@ const openState = ref(false)
             </template> -->
           </el-upload>
           <el-dialog v-model="dialogVisible">
-            <img w-full :src="dialogImageUrl" alt="Preview Image" style="width: 100%;" />
+            <img w-full :src="dialogImageUrl" alt="Preview Image" style="width: 100%" />
           </el-dialog>
         </el-form-item>
       </el-form>
@@ -525,7 +525,7 @@ const openState = ref(false)
         <div class="dialog-footer">
           <el-button @click="$emit('update:visible', false)">取消</el-button>
           <el-button type="primary" @click="handleSave" v-if="!isViewMode">
-            {{ isEditMode ? '保存' : '新增' }}
+            保存
           </el-button>
         </div>
       </template>
@@ -588,12 +588,12 @@ const openState = ref(false)
   pre {
     white-space: pre-wrap;
   }
-  .file-item{
+  .file-item {
     display: flex;
     justify-content: flex-start;
     align-items: center;
     .file-item--name {
-        margin-right: 20px;
+      margin-right: 20px;
     }
   }
 </style>

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/components/educationTrainingPlanManagementDeptDetail.vue

@@ -60,27 +60,27 @@
         </template>
 
         <!-- 查询区 -->
-        <div  style="margin-bottom: 20px" v-if="details.status < 3">
-            <el-button type="primary" :icon="Plus" @click="handleAdd"> 新增课程 </el-button>
+        <div style="margin-bottom: 20px" v-if="details.status < 3">
+          <el-button type="primary" :icon="Plus" @click="handleAdd"> 新增课程 </el-button>
         </div>
         <el-form :inline="true" class="mb-12 flex align-middle act-search">
-            <section class="select-box">
-                <el-form-item>
-                    <el-input v-model="tableQuery.queryParam.courseName" placeholder="搜索培训课程名称" clearable />
-                </el-form-item>
-
-                <el-form-item>
-                    <el-date-picker
-                        v-model="dateRange"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始时间"
-                        end-placeholder="结束时间"
-                        value-format="YYYY-MM-DD"
-                        format="YYYY-MM-DD"
-                    />
-                </el-form-item>
-            </section>
+          <section class="select-box">
+            <el-form-item>
+              <el-input v-model="tableQuery.queryParam.courseName" placeholder="搜索培训课程名称" clearable />
+            </el-form-item>
+
+            <el-form-item>
+              <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD"
+              />
+            </el-form-item>
+          </section>
           <el-form-item class="search-btn">
             <el-button type="primary" @click="handleSearch"> 查询 </el-button>
             <el-button @click="handleReset"> 重置 </el-button>
@@ -89,7 +89,7 @@
         </el-form>
 
         <!-- 表格 -->
-         <div class="batch-table">
+        <div class="batch-table">
           <BasicTable
             ref="basicTableRef"
             :tableData="tableData"
@@ -102,13 +102,92 @@
                 <el-button link type="primary" @click="handleEdit(scope.row)"> 编辑 </el-button>
                 <el-button link type="primary" @click="handleDelete(scope.row)"> 删除 </el-button>
                 <el-button link type="primary" @click="handleView(scope.row)"> 查看 </el-button>
+                <el-button link type="primary" @click="handleSignInList(scope.row)"> 签到名单 </el-button>
               </div>
             </template>
           </BasicTable>
         </div>
       </el-card>
     </div>
-    <AddTrainingInformation :state="type" v-model:visible="showAddTrainingInfo" :currentId="currentTableId" @save-success="handleSearch" />
+    <AddTrainingInformation
+      :state="type"
+      v-model:visible="showAddTrainingInfo"
+      :currentId="currentTableId"
+      @save-success="handleSearch"
+    />
+    <!-- 签到名单 -->
+    <el-dialog v-model="signInDialogVisible" width="70%" :title="'签到名单'">
+      <el-form>
+        <el-row>
+          <el-col :span="16">
+            <el-row :gutter="12">
+              <el-col :span="6">
+                <el-form-item>
+                  <el-input v-model="signInParams.queryParam.keywords" placeholder="搜索工号/姓名" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item>
+                  <el-select
+                    v-model="signInParams.queryParam.deptIds"
+                    collapse-tags
+                    collapse-tags-tooltip
+                    :max-collapse-tags="1"
+                    multiple
+                    clearable
+                    placeholder="请选择使用部门"
+                    style="width: 100%"
+                  >
+                    <el-option :label="item.deptName" :value="item.id" v-for="item in deptTreeOne" :key="item.id" />
+                  </el-select>
+                  <!-- <el-cascader
+                        v-model="signInParams.queryParam.deptIds"
+                        :options="deptTreeOne"
+                        :props="deptCascaderProps"
+                        :show-all-levels="false"
+                        placeholder="请选择使用部门"
+                        filterable
+                        collapse-tags
+                        collapse-tags-tooltip
+                        :max-collapse-tags="2"
+                        style="width: 100%;"
+                        clearable
+                    /> -->
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item>
+                  <el-date-picker
+                    v-model="signInDateRange"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    value-format="YYYY-MM-DD"
+                    format="YYYY-MM-DD"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
+            <div class="search-btn">
+              <el-button type="primary" @click="handleSignInSearch"> 查询 </el-button>
+              <el-button @click="handleSignInReset"> 重置 </el-button>
+              <el-button @click="handleSignInExport"> 导出 </el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="batch-table">
+        <BasicTable
+          :tableData="signInTableData"
+          :tableConfig="signInTableConfig"
+          @update:pageSize="handleSignInSizeChange"
+          @update:pageNumber="handleSignInCurrentChange"
+        />
+      </div>
+    </el-dialog>
   </main>
 </template>
 
@@ -121,6 +200,8 @@
     queryEducationAndTrainingProgramDetail,
     deleteTrainingInformation,
     exportEducationTrainingPlanCourseData,
+    querySignInDepartmentList,
+    exportSignInDepartmentList,
     type TableParamsType,
   } from '@/api/production-education-training-plan-dept';
   import AddTrainingInformation from './addTrainingInformation.vue';
@@ -129,7 +210,9 @@
   import { Plus } from '@element-plus/icons-vue';
   import BasicTable from '@/components/BasicTable.vue';
   import useTableConfig from '@/hooks/useTableConfigHook';
-  import { TABLE_OPTIONS, COURSE_TABLE_COLUMNS } from '../configs/tables';
+  import { TABLE_OPTIONS, COURSE_TABLE_COLUMNS, SIGN_IN_TABLE_COLUMNS, SIGN_IN_TABLE_CONFIG } from '../configs/tables';
+  import type { DeptTree } from '@/types/dept/type';
+  import { getAllDepartments } from '@/api/auth/dept';
 
   const router = useRouter();
   const route = useRoute();
@@ -138,7 +221,7 @@
   const currentId = computed(() => Number(route.query.id));
 
   const isViewMode = computed(() => operate.value === 'education-training-plan-management-dept-view');
-  
+
   const details = reactive({
     trainingPlanName: '',
     categoryName: '',
@@ -154,7 +237,7 @@
     createdByName: '',
     createdAt: '',
     deptName: '',
-    status: 0
+    status: 0,
   });
 
   // 表格
@@ -162,13 +245,18 @@
 
   const { tableConfig, pagination } = useTableConfig(COURSE_TABLE_COLUMNS, TABLE_OPTIONS);
 
+  const { tableConfig: signInTableConfig, pagination: signInPagination } = useTableConfig(
+    SIGN_IN_TABLE_COLUMNS,
+    SIGN_IN_TABLE_CONFIG,
+  );
+
   const tableData = ref([]);
   const type = ref('add');
   const showAddTrainingInfo = ref(false);
   const currentTableId = ref('');
   // 搜索和筛选相关
   const dateRange = ref([]);
-
+  const signInDateRange = ref([]);
   const tableQuery = reactive<QueryPageRequest<TableParamsType>>({
     pageNumber: pagination.pageNumber,
     pageSize: pagination.pageSize,
@@ -179,7 +267,27 @@
       dateEnd: undefined, //dateRange.value[1],
     },
   });
-
+  const deptTreeOne = ref<DeptTree[]>([]);
+  const deptCascaderProps = {
+    expandTrigger: 'click',
+    checkStrictly: true,
+    emitPath: false,
+    value: 'id',
+    label: 'deptName',
+    multiple: true,
+  };
+  const getDeptTreeData = async () => {
+    try {
+      const res = await getAllDepartments();
+      deptTreeOne.value = res?.[0]?.children.map((item) => ({
+        ...item,
+        children: [],
+      }));
+    } catch (e) {
+      console.error('获取部门树失败:', e);
+      deptTreeOne.value = [];
+    }
+  };
   const handleCurrentChange = (value: number) => {
     pagination.pageNumber = value;
     tableQuery.pageNumber = value;
@@ -193,12 +301,12 @@
   };
 
   const handleSearch = () => {
-    showAddTrainingInfo.value = false
+    showAddTrainingInfo.value = false;
     pagination.pageNumber = 1;
     tableQuery.pageNumber = 1;
     getTableList();
   };
-  const handleReset = ()=>{
+  const handleReset = () => {
     pagination.pageNumber = 1;
     pagination.pageSize = 20;
     Object.assign(tableQuery, {
@@ -213,14 +321,14 @@
     });
     dateRange.value = [];
     handleSearch();
-  }
+  };
   const handleExport = async () => {
     try {
-      const response = await exportEducationTrainingPlanCourseData(tableQuery.queryParam)
+      const response = await exportEducationTrainingPlanCourseData(tableQuery.queryParam);
       if (response) {
-          const fileName = `培训课程信息_${new Date().toISOString().split('T')[0]}.xlsx`;
-          downloadByData(response, fileName);
-          ElMessage.success('导出成功');
+        const fileName = `培训课程信息_${new Date().toISOString().split('T')[0]}.xlsx`;
+        downloadByData(response, fileName);
+        ElMessage.success('导出成功');
       }
     } catch (e) {
       console.error('导出培训课程信息失败:', e);
@@ -246,6 +354,96 @@
     showAddTrainingInfo.value = true;
   };
 
+  const signInTableData = ref([]);
+  const signInDialogVisible = ref(false);
+  const signInParams = reactive({
+    pageNumber: signInPagination.pageNumber,
+    pageSize: signInPagination.pageSize,
+    queryParam: {
+      id: undefined,
+      keywords: undefined, // 搜索工号/姓名
+      deptIds: undefined,
+      startDate: undefined,
+      endDate: undefined,
+    },
+  });
+  // 打开签到名单弹窗
+  const handleSignInList = async (row) => {
+    signInDialogVisible.value = true;
+    signInParams.queryParam.id = row.id;
+    signInTableData.value = [];
+    getSignInList();
+  };
+  // 查询签到名单
+  const handleSignInSearch = () => {
+    signInParams.pageNumber = 1;
+    if (signInDateRange.value) {
+      signInParams.queryParam.startDate = signInDateRange.value[0];
+      signInParams.queryParam.endDate = signInDateRange.value[1];
+    } else {
+      signInParams.queryParam.startDate = undefined;
+      signInParams.queryParam.endDate = undefined;
+    }
+    getSignInList();
+  };
+  // 重置签到名单搜索
+  const handleSignInReset = () => {
+    signInParams.pageNumber = 1;
+    signInParams.queryParam.keywords = undefined;
+    signInParams.queryParam.deptIds = undefined;
+    signInParams.queryParam.startDate = undefined;
+    signInParams.queryParam.endDate = undefined;
+    signInDateRange.value = [];
+    signInTableData.value = [];
+    getSignInList();
+  };
+  // 获取签到名单
+  const getSignInList = async () => {
+    signInTableConfig.loading = true;
+    try {
+      const res = await querySignInDepartmentList(signInParams);
+      if (res) {
+        signInTableData.value = res.records || [];
+        signInPagination.total = res.totalRow;
+      } else {
+        signInTableData.value = [];
+        signInPagination.total = 0;
+      }
+    } catch (error) {
+      console.error('获取签到名单失败:', error);
+      signInTableData.value = [];
+      signInPagination.total = 0;
+    } finally {
+      signInTableConfig.loading = false;
+    }
+  };
+  // 导出签到名单
+  const handleSignInExport = async () => {
+    try {
+      const response = await exportSignInDepartmentList(signInParams.queryParam);
+      if (response) {
+        const fileName = `签到名单_${new Date().toISOString().split('T')[0]}.xlsx`;
+        downloadByData(response, fileName);
+        ElMessage.success('导出成功');
+      }
+    } catch (e) {
+      console.error('导出签到名单失败:', e);
+      ElMessage.error('导出失败，请重试');
+    }
+  };
+  // 分页
+  const handleSignInSizeChange = (value: number) => {
+    signInPagination.pageSize = value;
+    signInParams.pageSize = value;
+    getSignInList();
+  };
+  //   分页
+  const handleSignInCurrentChange = (value: number) => {
+    signInPagination.pageNumber = value;
+    signInParams.pageNumber = value;
+    getSignInList();
+  };
+
   const handleDelete = (row) => {
     ElMessageBox.confirm(`确认删除课程「${row.courseName}」吗？`, '提示', { type: 'warning' }).then(async () => {
       await deleteTrainingInformation(row.id);
@@ -258,8 +456,8 @@
     tableConfig.loading = true;
     if (!currentId.value) return;
     try {
-      tableQuery.queryParam.dateStart = dateRange.value ? dateRange.value[0]: undefined
-      tableQuery.queryParam.dateEnd = dateRange.value ? dateRange.value[1]: undefined
+      tableQuery.queryParam.dateStart = dateRange.value ? dateRange.value[0] : undefined;
+      tableQuery.queryParam.dateEnd = dateRange.value ? dateRange.value[1] : undefined;
       const res = await queryTrainingTableData(tableQuery);
       if (res) {
         tableData.value = res.records || [];
@@ -284,9 +482,10 @@
     }
   };
 
-  onMounted(() => {
-    getDetail();
-    getTableList();
+  onMounted(async () => {
+    await getDetail();
+    await getTableList();
+    await getDeptTreeData();
   });
 </script>
 
@@ -326,4 +525,10 @@
   .mb-16 {
     margin-bottom: 16px;
   }
+  .search-btn {
+    display: flex;
+    gap: 8px;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 </style>

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/configs/form.ts

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-02-26 13:57:24
  * @LastEditors: liuJie
- * @LastEditTime: 2026-02-26 17:22:35
+ * @LastEditTime: 2026-04-16 13:33:17
  * @Describe: file describe
  */
 import { FormConfig } from '@/types/basic-form';
@@ -61,7 +61,7 @@ export const TRAINING_FORM_RULES = {
   courseType: [{ required: true, message: '请选择课程所属类别', trigger: 'blur' }],
   courseName: [{ required: true, message: '请输入培训课程名称', trigger: 'blur' }],
   trainingMethod: [{ required: true, message: '请输入培训方式', trigger: 'blur' }],
-  trainingTeacher: [{ required: true, message: '请输入培训课程讲师', trigger: 'blur' }],
+//   trainingTeacher: [{ required: true, message: '请输入培训课程讲师', trigger: 'blur' }],
   planNumOfParticipants: [
     { required: true, message: '请输入计划参与人数', trigger: 'blur' },
     { type: 'number', message: '人数必须为数字值', trigger: 'blur' },

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/configs/tables.ts

@@ -185,4 +185,42 @@ export const COURSE_TABLE_COLUMNS: TableColumnProps[] = [
     width: '300px',
     align: 'left',
   },
-];
+];
+
+export const SIGN_IN_TABLE_COLUMNS: TableColumnProps[] = [
+  {
+    label: '编号',
+    type: 'index',
+    align: 'center',
+    width: '80px',
+  },
+  {
+    label: '签到时间',
+    prop: 'signTime',
+    align: 'center',
+    minWidth: '200px',
+  },
+  {
+    label: '工号',
+    prop: 'staffNo',
+    align: 'center',
+    minWidth: '150px',
+  },
+  {
+    label: '姓名',
+    prop: 'realName',
+    align: 'center',
+    minWidth: '150px',
+  },
+  {
+    label: '所属部门',
+    prop: 'deptName',
+    align: 'center',
+    minWidth: '200px',
+  },
+];
+
+export const SIGN_IN_TABLE_CONFIG = {
+  ...TABLE_OPTIONS,
+//   maxHeight: '400px',
+};

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/educationTrainingPlanManagementDept.vue

@@ -6,8 +6,7 @@
     <main class="safety-platform-container__main">
       <div class="search-table-container">
         <header>
-          <div style="position: relative">                        
-          </div>
+          <div style="position: relative"> </div>
           <div class="act-search">
             <section class="select-box">
               <div class="select-box--item">
@@ -56,9 +55,7 @@
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button @click="handleReset">重置</el-button>
-              <el-button plain  @click="handleDownload">
-                导出   
-              </el-button> 
+              <el-button plain @click="handleDownload"> 导出 </el-button>
             </section>
           </div>
         </header>
@@ -74,7 +71,7 @@
             <template #action="scope">
               <div class="action-container--div" style="justify-content: left">
                 <ActionButton text="查看" @click="handleView(scope.row.id)" />
-                <ActionButton text="小结" v-if="scope.row.status===2" @click="handleSummary(scope.row)" />
+                <ActionButton text="小结" v-if="scope.row.status === 2" @click="handleSummary(scope.row)" />
               </div>
             </template>
           </BasicTable>
@@ -92,39 +89,37 @@
       @update="handleUpdate"
     />
     <el-dialog v-model="dialogVisible" title="填写培训小结">
-        <el-form>
-            <el-form-item label="材料上传" required>
-                <el-upload
-                    action=""
-                    ref="courseContentUpload"
-                    :auto-upload="false"
-                    :on-change="handleFileChange"
-                    accept=".rar, .zip, .doc, .docx, .pdf, .mp4"
-                    :file-list="fileList"
-                >
-                    <el-button type="default">
-                    <el-icon style="margin-right: 6px">
-                        <UploadFilled />
-                    </el-icon>
-                    选择附件
-                    </el-button>
-                    <template #tip>
-                    <div class="el-upload__tip"> 支持格式：.rar .zip .doc .docx .pdf .mp4，单个文件不能超过20MB </div>
-                    </template>
-                </el-upload>
-            </el-form-item>
-            <el-form-item label="培训小结" required>
-                <el-input type="textarea" v-model="form.trainingSummary"></el-input>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="handleCancel">取消</el-button>
-                <el-button type="primary" @click="saveSummary" >
-                    确认
-                </el-button>
-            </div>
-        </template>
+      <el-form>
+        <el-form-item label="材料上传：" required>
+          <el-upload
+            action=""
+            ref="courseContentUpload"
+            :auto-upload="false"
+            :on-change="handleFileChange"
+            accept=".rar, .zip, .doc, .docx, .pdf, .mp4"
+            :file-list="fileList"
+          >
+            <el-button type="default">
+              <el-icon style="margin-right: 6px">
+                <UploadFilled />
+              </el-icon>
+              选择附件
+            </el-button>
+            <template #tip>
+              <div class="el-upload__tip"> 支持格式：.rar .zip .doc .docx .pdf .mp4，单个文件不能超过20MB </div>
+            </template>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="培训小结：" required>
+          <el-input type="textarea" v-model="form.trainingSummary"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="saveSummary"> 确认 </el-button>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
@@ -138,7 +133,11 @@
   import { TABLE_OPTIONS, TABLE_COLUMNS, STATUS_OPTIONS } from './configs/tables';
   import { useRouter } from 'vue-router';
   import type { QueryPageRequest } from '@/types/basic-query';
-  import { getEducationAndTrainingProgramList, updateEducationTrainingPlanCourseSummary,exportTableData } from '@/api/production-education-training-plan-dept';
+  import {
+    getEducationAndTrainingProgramList,
+    updateEducationTrainingPlanCourseSummary,
+    exportTableData,
+  } from '@/api/production-education-training-plan-dept';
   import { downloadByData } from '@/utils/file/download';
   import BatchImport from '@/components/batch-import/BatchImport.vue';
   import { useGlobSetting } from '@/hooks/setting';
@@ -165,15 +164,15 @@
     { label: '生产作业安全培训', value: '生产作业安全培训' },
     { label: '安全管理人员培训', value: '安全管理人员培训' },
   ]);
-    // 验证文件类型
-    const allowedTypes = [
-      'application/rar',
-      'application/zip',
-      'application/msword',
-      'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-      'application/pdf',
-      'video/mp4',
-    ];
+  // 验证文件类型
+  const allowedTypes = [
+    'application/rar',
+    'application/zip',
+    'application/msword',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'application/pdf',
+    'video/mp4',
+  ];
 
   const tableQuery = reactive<QueryPageRequest<any>>({
     pageNumber: pagination.pageNumber,
@@ -191,16 +190,16 @@
       datePlanEnd: undefined,
     },
   });
-  const fileList = ref([])
-  const dialogVisible = ref(false)
-  const handleCancel = ()=>{
-    dialogVisible.value = false
-  }
+  const fileList = ref([]);
+  const dialogVisible = ref(false);
+  const handleCancel = () => {
+    dialogVisible.value = false;
+  };
   const form = reactive({
-    id:'',
+    id: '',
     uploadAttach: '',
-    trainingSummary: ''
-  })
+    trainingSummary: '',
+  });
   const beforeUpload = (file) => {
     const isAllowedType = allowedTypes.includes(file.type);
     const isLt20M = file.size / 1024 / 1024 < 20;
@@ -214,22 +213,22 @@
 
     return isAllowedType && isLt20M;
   };
-     // 上传文件
- const formatAttachment = async (data: any) => {
+  // 上传文件
+  const formatAttachment = async (data: any) => {
     if (!data) return data;
     const uuid = Math.random().toString(36).substring(2, 9);
     const timestamp = Date.now().toString();
     const random = Math.random().toString(36).substring(2, 4);
     const fileName = data.name;
     const res = await uploadFileApi({
-        bizType: UPLOAD_BIZ_TYPE.ATTACHMENT,
-        fileName: `${uuid}-${timestamp}-${random}`,
-        file: data,
+      bizType: UPLOAD_BIZ_TYPE.ATTACHMENT,
+      fileName: `${uuid}-${timestamp}-${random}`,
+      file: data,
     });
-   
-    return res
-};
-    // 文件选择更新
+
+    return res;
+  };
+  // 文件选择更新
   const courseContentUpload = ref();
   const handleFileExceed = (files) => {
     courseContentUpload.value!.clearFiles(); // 清空文件列表
@@ -239,9 +238,8 @@
     }
     courseContentUpload.value!.handleStart(file); // 手动触发上传
   };
-    // 课程内容文件上传
+  // 课程内容文件上传
   const handleFileChange = async (file, fileLists) => {
-
     if (!allowedTypes.includes(file.raw.type)) {
       ElMessage.error('不支持的文件格式');
       return;
@@ -251,33 +249,32 @@
       ElMessage.error('文件大小不能超过20MB');
       return;
     }
-    
-    if(file.raw){
-        try {
-            const res = await formatAttachment(file.raw);
-            
-            const targetFile = fileLists.find(f => f.uid === file.uid);
-            if (targetFile) {
-                targetFile.url = res.url; 
-                targetFile.contentType = res.contentType
-            }
-            fileList.value = fileLists; 
-            form.uploadAttach = JSON.stringify(fileList.value); 
-            ElMessage.success('上传成功');
-        } catch (error) {
-            ElMessage.error('上传失败，请重试');
-            // 上传失败时，可以从 fileLists 中移除该文件
-            fileList.value = fileLists.filter(f => f.uid !== file.uid);
+
+    if (file.raw) {
+      try {
+        const res = await formatAttachment(file.raw);
+
+        const targetFile = fileLists.find((f) => f.uid === file.uid);
+        if (targetFile) {
+          targetFile.url = res.url;
+          targetFile.contentType = res.contentType;
         }
+        fileList.value = fileLists;
+        form.uploadAttach = JSON.stringify(fileList.value);
+        ElMessage.success('上传成功');
+      } catch (error) {
+        ElMessage.error('上传失败，请重试');
+        // 上传失败时，可以从 fileLists 中移除该文件
+        fileList.value = fileLists.filter((f) => f.uid !== file.uid);
+      }
     }
-
   };
-  const saveSummary = async()=>{
-    if(!fileList.value.length){
+  const saveSummary = async () => {
+    if (!fileList.value.length) {
       ElMessage.error('请先上传材料');
       return;
     }
-    if(!form.trainingSummary){
+    if (!form.trainingSummary) {
       ElMessage.error('请输入小结内容');
       return;
     }
@@ -288,13 +285,13 @@
     } catch (e) {
       ElMessage.error('更新小结失败');
     }
-    dialogVisible.value = false
-  }
-   const handleSummary = async (row) => {
-    dialogVisible.value = true
-    form.id = row.id
-    form.trainingSummary = ''
-    form.uploadAttach = ''
+    dialogVisible.value = false;
+  };
+  const handleSummary = async (row) => {
+    dialogVisible.value = true;
+    form.id = row.id;
+    form.trainingSummary = '';
+    form.uploadAttach = '';
   };
   const handleSizeChange = (value: number) => {
     pagination.pageSize = value;
@@ -315,12 +312,12 @@
         pageNumber: tableQuery.pageNumber,
         pageSize: tableQuery.pageSize,
         queryParam: {
-            ...tableQuery.queryParam,
-            datePlanStart: dateRange.value ? dateRange.value[0] : undefined,
-            datePlanEnd: dateRange.value ? dateRange.value[1] : undefined,
-            status: tableQuery.queryParam.status==='全部'? undefined :tableQuery.queryParam.status
-        }
-      }
+          ...tableQuery.queryParam,
+          datePlanStart: dateRange.value ? dateRange.value[0] : undefined,
+          datePlanEnd: dateRange.value ? dateRange.value[1] : undefined,
+          status: tableQuery.queryParam.status === '全部' ? undefined : tableQuery.queryParam.status,
+        },
+      };
       const res = await getEducationAndTrainingProgramList(params);
       if (res) {
         // 映射返回数据字段到表格字段
@@ -364,8 +361,6 @@
     handleSearch();
   };
 
-
-
   // 批量导入
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
@@ -385,9 +380,9 @@
     try {
       const response = await exportTableData(tableQuery.queryParam);
       if (response) {
-          const fileName = `教育培训计划管理（部门）_${new Date().toISOString().split('T')[0]}.xlsx`;
-          downloadByData(response, fileName);
-          ElMessage.success('导出成功');
+        const fileName = `教育培训计划管理（部门）_${new Date().toISOString().split('T')[0]}.xlsx`;
+        downloadByData(response, fileName);
+        ElMessage.success('导出成功');
       }
     } catch (e) {
       console.error('导出教育培训计划管理（部门）失败:', e);

src/views/production-safety/safetyTrainingAndEducation/employeeTrainingRecordCardManagement/components/commonTable.vue

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-02-13 16:04:29
  * @LastEditors: liuJie
- * @LastEditTime: 2026-03-19 10:32:45
+ * @LastEditTime: 2026-04-17 17:39:36
  * @Describe: file describe
 -->
 <script setup lang="ts">
@@ -142,6 +142,21 @@
     tableQuery.pageNumber = 1;
     handleSearch();
   };
+  const getNumber = (value, unit)=>{
+    if(value===0){
+        return value + unit;
+    }else if(value === null || value === undefined || value === ''){
+        return '-';
+    } else {
+        return value + unit
+    }
+  }
+  const preViewVisible = ref(false)
+  const imageUrl = ref('')
+  const preview = (url)=>{
+    preViewVisible.value = true
+    imageUrl.value = url
+  }
 </script>
 <template>
   <div>
@@ -163,23 +178,22 @@
 
     <!-- 表格 -->
     <el-table border stripe :data="tableData">
-      <el-table-column type="selection" width="50" />
-      <el-table-column label="编号" type="index" width="80" />
+      <el-table-column label="编号" type="index" width="80" align="center" />
       <el-table-column label="日期" prop="logDate" width="200" />
       <el-table-column label="教育内容" prop="educationContent" width="280" />
       <el-table-column label="学时" prop="creditHour">
         <template #default="scope">
-          <span>{{ scope.row.creditHour }}时</span>
+          <span>{{  getNumber(scope.row.creditHour, '时') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="成绩" prop="scoreMust">
         <template #default="scope">
-          <span>{{ scope.row.scoreMust }}分</span>
+          <span>{{  getNumber(scope.row.scoreMust, '分') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="受教育者签字" prop="educationSign" width="220">
         <template #default="scope">
-            <img :src="scope.row.educationSign" style="width:100%" v-if="scope.row.educationSign" alt="">
+            <img :src="scope.row.educationSign" style="width:100%;height:60px; cursor: pointer;" @click="preview(scope.row.educationSign)" v-if="scope.row.educationSign" alt="">
         </template>
       </el-table-column>
       <el-table-column label="操作" width="220">
@@ -217,6 +231,10 @@
         <el-button type="primary" @click="confirmHandle">保存</el-button>
       </template>
     </el-dialog>
+    <!-- 预览 -->
+     <el-dialog v-model="preViewVisible" width="60%" @close="preViewVisible = false">
+        <img :src="imageUrl" style="width: 100%;" alt="">
+     </el-dialog>
   </div>
 </template>
 

src/views/production-safety/safetyTrainingAndEducation/employeeTrainingRecordCardManagement/components/commonTable2.vue

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-02-13 16:04:29
  * @LastEditors: liuJie
- * @LastEditTime: 2026-03-19 10:27:05
+ * @LastEditTime: 2026-04-17 17:31:01
  * @Describe: file describe
 -->
 <script setup lang="ts">
@@ -145,6 +145,15 @@
     tableQuery.pageNumber = 1;
     handleSearch();
   };
+  const getNumber = (value, unit)=>{
+    if(value===0){
+        return value + unit;
+    }else if(value === null || value === undefined || value === ''){
+        return '-';
+    } else {
+        return value + unit
+    }
+  }
 </script>
 <template>
   <div>
@@ -166,25 +175,24 @@
 
     <!-- 表格 -->
     <el-table border stripe :data="tableData">
-      <el-table-column type="selection" width="50" />
-      <el-table-column label="编号" prop="serialNum" width="100" />
+      <el-table-column label="编号" type="index" width="80" align="center" />
       <el-table-column label="日期" prop="logDate" width="200" />
       <el-table-column label="工种名称" prop="educationContent" width="180" />
       <el-table-column label="考核成绩-应知" prop="score" width="220">
         <template #default="scope">
-          <span>{{ scope.row.score }}分</span>
+          <span>{{  getNumber(scope.row.score, '分') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="考核成绩-应会" prop="scoreMust" width="220">
         <template #default="scope">
-          <span>{{ scope.row.scoreMust }}分</span>
+          <span>{{  getNumber(scope.row.scoreMust, '分') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作证号" prop="operationCertificateNum" width="220" />
       <el-table-column label="培训单位" prop="trainingCompany" width="220" />
       <el-table-column label="学时" prop="creditHour" width="120">
         <template #default="scope">
-          <span>{{ scope.row.creditHour }}时</span>
+          <span>{{  getNumber(scope.row.creditHour, '时') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="220" fixed="right">

src/views/production-safety/safetyTrainingAndEducation/employeeTrainingRecordCardManagement/components/employeeTrainingRecordCardManagementDetail.vue

@@ -39,8 +39,8 @@
           <el-descriptions-item label="文化程度">{{ employeeDetail.highestDegree }}</el-descriptions-item>
           <el-descriptions-item label="从事岗位">{{ employeeDetail.staffJob }}</el-descriptions-item>
 
-          <el-descriptions-item label="本岗位工龄">{{ employeeDetail.jobSeniority }}年</el-descriptions-item>
-          <el-descriptions-item label="技术等级">{{ employeeDetail.technicalLvl }}级</el-descriptions-item>
+          <el-descriptions-item label="本岗位工龄">{{ employeeDetail.jobSeniority }}</el-descriptions-item>
+          <el-descriptions-item label="技术等级">{{ employeeDetail.technicalLvl }}</el-descriptions-item>
 
           <el-descriptions-item label="职称">{{ employeeDetail.professionalTitle }}</el-descriptions-item>
           <el-descriptions-item label="照片">

src/views/production-safety/safetyTrainingAndEducation/employeeTrainingRecordCardManagement/configs/form.ts

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-02-03 17:55:50
  * @LastEditors: liuJie
- * @LastEditTime: 2026-02-25 13:28:34
+ * @LastEditTime: 2026-04-16 13:41:45
  * @Describe: file describe
  */
 import { FormConfig } from '@/types/basic-form';
@@ -69,19 +69,19 @@ export const FORM_CARD_RULES = {
       trigger: 'blur',
     },
   ],
-  staffIdCard: [
-    { required: true, message: '请输入身份证号', trigger: 'blur' },
-    {
-      validator: (_rule: any, value: any, callback: any) => {
-        const v = String(value ?? '').trim();
-        if (!v) return callback();
-        if (!isValidChinaIdCard(v)) return callback(new Error('身份证号格式不正确'));
-        return callback();
-      },
-      trigger: 'blur',
-    },
-  ],
-  staffAddress: [{ required: true, message: '请输入家庭住址', trigger: 'blur' }],
+//   staffIdCard: [
+//     { required: true, message: '请输入身份证号', trigger: 'blur' },
+//     {
+//       validator: (_rule: any, value: any, callback: any) => {
+//         const v = String(value ?? '').trim();
+//         if (!v) return callback();
+//         if (!isValidChinaIdCard(v)) return callback(new Error('身份证号格式不正确'));
+//         return callback();
+//       },
+//       trigger: 'blur',
+//     },
+//   ],
+//   staffAddress: [{ required: true, message: '请输入家庭住址', trigger: 'blur' }],
   dateOfJoining: [
     { required: true, message: '请输入入职日期', trigger: 'blur' },
     {

src/views/production-safety/safetyTrainingAndEducation/employeeTrainingRecordCardManagement/configs/tables.ts

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-02-03 17:55:50
  * @LastEditors: liuJie
- * @LastEditTime: 2026-02-24 17:33:42
+ * @LastEditTime: 2026-04-17 17:05:07
  * @Describe: file describe
  */
 import type { TableColumnProps } from '@/types/basic-table';
@@ -17,7 +17,7 @@ export const TABLE_OPTIONS = {
 export const TABLE_COLUMNS: TableColumnProps[] = [
   {
     label: '编号',
-    prop: 'serialNum',
+    type: 'index',
     align: 'center',
     width: '80px',
   },
@@ -25,41 +25,49 @@ export const TABLE_COLUMNS: TableColumnProps[] = [
     label: '员工工号',
     prop: 'staffNo',
     align: 'left',
+    minWidth: '140px',
   },
   {
     label: '状态',
     prop: 'statusName',
     align: 'left',
+    minWidth: '120px',
   },
   {
     label: '员工姓名',
     prop: 'staffName',
     align: 'center',
+    minWidth: '120px',
   },
   {
     label: '从事岗位',
     prop: 'staffJob',
     align: 'left',
+    minWidth: '120px',
   },
   {
     label: '文化程度',
     prop: 'highestDegree',
     align: 'left',
+    minWidth: '120px',
   },
   {
     label: '本岗位工龄',
     prop: 'jobSeniority',
     align: 'center',
+    minWidth: '160px',
   },
   {
     label: '职称',
     prop: 'professionalTitle',
     align: 'left',
+    minWidth: '120px',
   },
   {
     label: '入职日期',
     prop: 'dateOfJoining',
     align: 'center',
+    minWidth: '160px',
   },
   {
     label: '操作',