From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
index fd03170..2a643d8 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
@@ -59,7 +59,7 @@
             }
         },
         {title: '扣除课时', field: 'deductClassHour', align: 'center', valign: 'middle'},
-        {title: '取消记录', field: 'absencesNumber', align: 'center', valign: 'middle',
+        {title: '消课凭证', field: 'cancelClasses', align: 'center', valign: 'middle',
             formatter: function (v) {
                 if (typeof v === "undefined") {
                     return '未上传';
@@ -280,10 +280,10 @@
                     Feng.error("请上传凭证图片");
                     return
                 }
-                if(null == deductClassHour || '' == deductClassHour){
-                    Feng.error("请输入有效的扣除课时数");
-                    return
-                }
+                // if(null == deductClassHour || '' == deductClassHour){
+                //     Feng.error("请输入有效的扣除课时数");
+                //     return
+                // }
                 let div_array = $('#cancelClasses').find('div');
                 let str = '';
                 for (let i = 0; i < div_array.length; i++) {

--
Gitblit v1.7.1