diff --git a/build_ui/src/views/train/me/student/index.vue b/build_ui/src/views/train/me/student/index.vue
index a8f8f1e79..2cfb5538f 100644
--- a/build_ui/src/views/train/me/student/index.vue
+++ b/build_ui/src/views/train/me/student/index.vue
@@ -117,10 +117,10 @@
-
+
-
- {{ formatEnrollmentStatusText(scope.row.status) }}
+
+ {{ formatEnrollmentStatusText(scope.row.enrollmentStatus != null ? scope.row.enrollmentStatus : scope.row.status) }}
@@ -475,12 +475,14 @@ export default {
// 预留扩展
},
formatEnrollmentStatusText(status) {
- const map = { 0: '待报到', 1: '已报到', 2: '请假', 3: '退训', 4: '已完成' }
- return map[status] || '未知'
+ const val = typeof status === 'object' && status !== null ? (status.enrollmentStatus != null ? status.enrollmentStatus : status.status) : status
+ const map = { 0: '待报到', 1: '已报到', 2: '请假', 3: '退训', 4: '已完成', '0': '待报到', '1': '已报到', '2': '请假', '3': '退训', '4': '已完成' }
+ return map[val] || '未知'
},
formatEnrollmentStatusType(status) {
- const map = { 0: 'warning', 1: 'success', 2: 'info', 3: 'danger', 4: '' }
- return map[status] || ''
+ const val = typeof status === 'object' && status !== null ? (status.enrollmentStatus != null ? status.enrollmentStatus : status.status) : status
+ const map = { 0: 'warning', 1: 'success', 2: 'info', 3: 'danger', 4: '', '0': 'warning', '1': 'success', '2': 'info', '3': 'danger', '4': '' }
+ return map[val] || ''
},
formatAttendanceStatusText(status) {
// 状态严格使用:0 缺勤, 1 正常, 2 迟到, 3 早退, 4 请假。严禁将 1 显示为“已签到”!