“培训审批流程完成版v0.1”
This commit is contained in:
1 parent
f006de24f4
commit
2e4d35b41e
28 files changed
+238
-5596
No files matched your search
@@ -81,7 +81,7 @@
|
||||
<el-table-column label="主办单位" align="center" prop="organizerUnit" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="培训地点" align="center" prop="location" />
|
||||
<el-table-column label="培训类型" align="center" prop="trainingType" />
|
||||
<el-table-column label="申请人" align="center" prop="userName" />
|
||||
<el-table-column label="申请人" align="center" prop="nickName" />
|
||||
<el-table-column label="同行人" align="center" prop="companions" width="150">
|
||||
<template #default="scope">
|
||||
<span>{{ getCompanionNames(scope.row.companions) || '无' }}</span>
|
||||
@@ -262,7 +262,7 @@
|
||||
<el-dialog title="申请详情" v-model="applicationDetailOpen" width="800px" append-to-body>
|
||||
<el-descriptions :column="2" border>
|
||||
<!-- 申请人基本信息 -->
|
||||
<el-descriptions-item label="申请人">{{ applicationDetail.userName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="申请人">{{ applicationDetail.nickName || applicationDetail.userName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="所在部门(系部)">{{ applicationDetail.department }}</el-descriptions-item>
|
||||
<el-descriptions-item label="现职称">{{ applicationDetail.currentTitle || '暂无' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="现岗位">{{ applicationDetail.currentPosition || '暂无' }}</el-descriptions-item>
|
||||
@@ -392,7 +392,7 @@
|
||||
<el-dialog title="审批记录详情" v-model="approvalRecordDetailOpen" width="800px" append-to-body>
|
||||
<el-descriptions :column="2" border>
|
||||
<!-- 申请人基本信息 -->
|
||||
<el-descriptions-item label="申请人">{{ approvalRecordDetail.userName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="申请人">{{ approvalRecordDetail.nickName || approvalRecordDetail.userName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="所在部门(系部)">{{ approvalRecordDetail.department }}</el-descriptions-item>
|
||||
<el-descriptions-item label="现职称">{{ approvalRecordDetail.currentTitle || '暂无' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="现岗位">{{ approvalRecordDetail.currentPosition || '暂无' }}</el-descriptions-item>
|
||||
@@ -985,6 +985,7 @@ const handleViewApprovalRecord = async (row: any) => {
|
||||
courseName: applicationData.courseName,
|
||||
userId: applicationData.userId,
|
||||
userName: applicationData.userName,
|
||||
nickName: applicationData.nickName, // 用户昵称(真实姓名)
|
||||
department: applicationData.department, // 从申请数据获取部门
|
||||
currentTitle: applicationData.currentTitle, // 现职称
|
||||
currentPosition: applicationData.currentPosition, // 现岗位
|
||||
|
||||
Reference in new issue
Block a user