From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js | 15 +++------------
1 files changed, 3 insertions(+), 12 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 a018859..0ca98b7 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
@@ -42,16 +42,7 @@
}
}
}
- },
- {title: '预定状态', field: 'reservationStatus', align: 'center', valign: 'middle',hidden:true,
- formatter: function (v) {
- if (v == 0) {
- return '已取消';
- } else {
- return '正常';
- }
- }
- },
+ }
];
return columns;
};
@@ -90,13 +81,13 @@
let operation = function(){
let ajax = new $ax(Feng.ctxPath + "/coursePackage/cancelReservation", function (res) {
if(res.code == 200){
- Feng.success("取消成功!");
+ Feng.success("请假成功!");
CoursePackageStudent.table.refresh();
}else{
Feng.error(res.msg);
}
}, function (data) {
- Feng.error("取消失败!" + data.responseJSON.message + "!");
+ Feng.error("请假失败!" + data.responseJSON.message + "!");
});
ajax.set("id", CoursePackageStudent.seItem.id);
ajax.start();
--
Gitblit v1.7.1