From 79bbee5adf0071808a33c09d5f87c5573d83cb3b Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 21 十一月 2023 19:44:15 +0800
Subject: [PATCH] 11.21。1

---
 cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 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..a018859 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
@@ -15,35 +15,39 @@
 CoursePackageStudent.initColumn = function () {
     let columns = [
         {field: 'selectItem', radio: true},
-        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+        {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
         {title: '所属用户', field: 'userName', align: 'center', valign: 'middle'},
         {title: '姓名', field: 'studentName', align: 'center', valign: 'middle'},
         {title: '联系电话', field: 'phone', align: 'center', valign: 'middle'},
         {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.signInOrNot === 2) {
+                    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 '正常';
                 }
             }
@@ -71,6 +75,10 @@
 
 /**
  * 取消预约
+ * if(CoursePackageStudent.seItem.signInOrNot == 1){
+            Feng.error("不能取消预约操作");
+            return
+        }
  */
 CoursePackageStudent.cancelReservation = function () {
     if (this.check()) {
@@ -78,10 +86,7 @@
             Feng.error("不能重复操作");
             return
         }
-        if(CoursePackageStudent.seItem.signInOrNot == 1){
-            Feng.error("不能取消预约操作");
-            return
-        }
+
         let operation = function(){
             let ajax = new $ax(Feng.ctxPath + "/coursePackage/cancelReservation", function (res) {
                 if(res.code == 200){
@@ -96,7 +101,7 @@
             ajax.set("id", CoursePackageStudent.seItem.id);
             ajax.start();
         };
-        Feng.confirm("是否取消预约",operation);
+        Feng.confirm("是否请假",operation);
     }
 };
 
@@ -108,7 +113,7 @@
             return
         }
         if(CoursePackageStudent.seItem.reservationStatus == 0){
-            Feng.error("该数据已取消预约");
+            Feng.error("当前学员已请假");
             return
         }
         let operation = function(){

--
Gitblit v1.7.1