From 5f804115139dfdeeb2ce950a0f584b30f94b285c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 23 九月 2023 17:57:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js
index 6cb31aa..c1d1b38 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js
@@ -22,28 +22,32 @@
         {title: '年龄', field: 'age', align: 'center', valign: 'middle'},
         {title: '性别', field: 'sex', align: 'center', valign: 'middle',
             formatter: function (v) {
-                if(v == 1){
+                if (v == 1) {
                     return '男';
-                }else{
+                } else {
                     return '女';
                 }
             }
         },
         {title: '到课状态', field: 'signInOrNot', align: 'center', valign: 'middle',
-            formatter: function (v) {
-                switch (v) {
-                    case 0:
-                        return '未到';
-                    case 1:
-                        return '已到';
+            formatter: function (v, row) {
+                if (row.reservationStatus === 0) {
+                    return '请假';
+                } else {
+                    switch (v) {
+                        case 0:
+                            return '旷课';
+                        case 1:
+                            return '已到';
+                    }
                 }
             }
         },
-        {title: '预定状态', field: 'reservationStatus', align: 'center', valign: 'middle',
+        {title: '预定状态', field: 'reservationStatus', align: 'center', valign: 'middle',hidden:true,
             formatter: function (v) {
-                if(v == 0){
+                if (v == 0) {
                     return '已取消';
-                }else{
+                } else {
                     return '正常';
                 }
             }

--
Gitblit v1.7.1