feat: 实现单价分离、班级转课、消课筛选和手动录入功能

Coze-Commit-Type: user
Coze-User-ID: 3722323274763196
Coze-Conversation-ID: 5260473

xuexiao/templates/consumption_list.html

@@ -9,20 +9,63 @@
         {% if current_user.has_permission('consumption_export') %}<a href="{{ url_for('consumption_export') }}" class="btn btn-success"><i class="bi bi-file-earmark-excel"></i> 导出</a>{% endif %}
     </div>
 </div>
-<div class="card shadow-sm">
+
+<!-- 筛选表单 -->
+<div class="card shadow-sm mb-3">
     <div class="card-body">
-        <form method="GET" class="row g-2 mb-3">
-            <div class="col-md-4">
+        <form method="GET" class="row g-2">
+            <div class="col-md-3">
                 <input type="text" class="form-control" name="keyword" value="{{ keyword }}" placeholder="搜索学员姓名">
             </div>
             <div class="col-md-2">
-                <button type="submit" class="btn btn-outline-primary"><i class="bi bi-search"></i></button>
+                <select class="form-select" name="class_id">
+                    <option value="">全部班级</option>
+                    {% for c in classes %}
+                    <option value="{{ c.id }}" {% if class_id == c.id|string %}selected{% endif %}>{{ c.name }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <div class="col-md-2">
+                <select class="form-select" name="teacher_id">
+                    <option value="">全部老师</option>
+                    {% for t in teachers %}
+                    <option value="{{ t.id }}" {% if teacher_id == t.id|string %}selected{% endif %}>{{ t.name }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <div class="col-md-2">
+                <input type="date" class="form-control" name="start_date" value="{{ start_date }}" placeholder="开始日期">
+            </div>
+            <div class="col-md-2">
+                <input type="date" class="form-control" name="end_date" value="{{ end_date }}" placeholder="结束日期">
+            </div>
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-outline-primary w-100"><i class="bi bi-search"></i></button>
             </div>
         </form>
+    </div>
+</div>
+
+<!-- 消课记录表格 -->
+<div class="card shadow-sm">
+    <div class="card-body">
         <div class="table-responsive">
-            <table class="table table-hover table-bordered">
+            <table class="table table-hover table-bordered" id="consumptionTable">
                 <thead class="table-light">
-                    <tr><th>ID</th><th>日期</th><th>学员</th><th>课程</th><th>消课课时</th><th>正课消耗</th><th>赠课消耗</th><th>类型</th><th>操作人</th><th>备注</th></tr>
+                    <tr>
+                        <th>ID</th>
+                        <th>日期</th>
+                        <th>学员</th>
+                        <th>课程</th>
+                        <th>班级</th>
+                        <th>授课老师</th>
+                        <th>消课课时</th>
+                        <th>正课消耗</th>
+                        <th>赠课消耗</th>
+                        <th>类型</th>
+                        <th>操作人</th>
+                        <th>备注</th>
+                    </tr>
                 </thead>
                 <tbody>
                     {% for r in records %}
@@ -31,6 +74,14 @@
                         <td>{{ r.consume_date }}</td>
                         <td><a href="{{ url_for('student_detail', id=r.student_id) }}">{{ r.student.name }}</a></td>
                         <td>{{ r.course.name }}</td>
+                        <td>{{ r.class_.name if r.class_id and r.class_ else '-' }}</td>
+                        <td>
+                            {% if r.class_id and r.class_.teacher %}
+                                {{ r.class_.teacher.name }}
+                            {% else %}
+                                -
+                            {% endif %}
+                        </td>
                         <td>{{ r.hours_consumed }}</td>
                         <td>{{ r.normal_consumed }}</td>
                         <td>{{ r.gifted_consumed }}</td>
@@ -45,11 +96,109 @@
                     </tr>
                     {% endfor %}
                     {% if not records %}
-                    <tr><td colspan="10" class="text-center text-muted">暂无消课记录</td></tr>
+                    <tr><td colspan="12" class="text-center text-muted">暂无消课记录</td></tr>
                     {% endif %}
                 </tbody>
             </table>
         </div>
     </div>
 </div>
+
+<!-- 手动录入消课汇总 -->
+<div class="card shadow-sm mt-3">
+    <div class="card-header bg-warning text-dark">
+        <i class="bi bi-pencil-square"></i> 手动录入课时汇总
+    </div>
+    <div class="card-body">
+        <form method="POST" action="{{ url_for('consumption_manual_add') }}" id="manualForm">
+            <div class="row g-3">
+                <div class="col-md-2">
+                    <label class="form-label">上课日期</label>
+                    <input type="date" class="form-control" name="consume_date" value="" required>
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label">班级</label>
+                    <select class="form-select" name="class_id" id="manual_class_id" required>
+                        <option value="">选择班级</option>
+                        {% for c in classes %}
+                        <option value="{{ c.id }}">{{ c.name }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label">学员</label>
+                    <select class="form-select" name="student_id" id="manual_student_id" required>
+                        <option value="">选择学员</option>
+                    </select>
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label">课时数</label>
+                    <input type="number" step="0.5" class="form-control" name="hours" value="2" required min="0.5">
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label">类型</label>
+                    <select class="form-select" name="consume_type">
+                        <option value="normal">正课</option>
+                        <option value="mixed">混合</option>
+                    </select>
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label">备注</label>
+                    <input type="text" class="form-control" name="remark" placeholder="可选">
+                </div>
+            </div>
+            <div class="mt-3">
+                <button type="submit" class="btn btn-warning"><i class="bi bi-check-lg"></i> 确认录入</button>
+            </div>
+        </form>
+    </div>
+</div>
+{% endblock %}
+
+{% block extra_js %}
+<script>
+// 表格筛选功能（客户端）
+$(document).ready(function() {
+    // 班级选择变化时加载学员
+    $('#manual_class_id').change(function() {
+        var classId = $(this).val();
+        var $studentSelect = $('#manual_student_id');
+        $studentSelect.html('<option value="">加载中...</option>');
+
+        if (!classId) {
+            $studentSelect.html('<option value="">先选择班级</option>');
+            return;
+        }
+
+        // 通过API获取班级学员
+        fetch('/api/class_students/' + classId)
+            .then(r => r.json())
+            .then(data => {
+                if (data.success && data.data.length > 0) {
+                    var options = '<option value="">选择学员</option>';
+                    data.data.forEach(function(s) {
+                        options += '<option value="' + s.id + '">' + s.name + '</option>';
+                    });
+                    $studentSelect.html(options);
+                } else {
+                    $studentSelect.html('<option value="">该班级暂无学员</option>');
+                }
+            })
+            .catch(function() {
+                $studentSelect.html('<option value="">加载失败</option>');
+            });
+    });
+
+    // 表单提交验证
+    $('#manualForm').submit(function(e) {
+        var hours = parseFloat($('input[name="hours"]').val());
+        if (hours <= 0) {
+            alert('课时数必须大于0');
+            e.preventDefault();
+            return false;
+        }
+        return confirm('确认手动录入消课记录？');
+    });
+});
+</script>
 {% endblock %}

xuexiao/templates/transfer_form.html

@@ -2,15 +2,15 @@
 {% block title %}申请转课 - 学生课程管理系统{% endblock %}
 {% block content %}
 <div class="d-flex justify-content-between align-items-center mb-3">
-    <h4><i class="bi bi-arrow-left-right"></i> 申请转课/转赠</h4>
+    <h4><i class="bi bi-arrow-left-right"></i> 申请转课</h4>
     <a href="{{ url_for('transfer_list') }}" class="btn btn-outline-secondary"><i class="bi bi-arrow-left"></i> 返回</a>
 </div>
 <div class="card shadow-sm">
     <div class="card-body">
-        <form method="POST">
+        <form method="POST" id="transferForm">
             <div class="row g-3">
                 <div class="col-md-6">
-                    <label class="form-label">转出学员 <span class="text-danger">*</span></label>
+                    <label class="form-label">学员 <span class="text-danger">*</span></label>
                     <select class="form-select" name="from_student_id" id="from_student_id" required>
                         <option value="">请选择学员</option>
                         {% for s in students %}
@@ -19,28 +19,92 @@
                     </select>
                 </div>
                 <div class="col-md-6">
-                    <label class="form-label">转出课程 <span class="text-danger">*</span></label>
+                    <label class="form-label">课程 <span class="text-danger">*</span></label>
                     <select class="form-select" name="from_course_id" id="from_course_id" required>
                         <option value="">请选择课程</option>
                         {% for c in courses %}
-                        <option value="{{ c.id }}">{{ c.name }}(&yen;{{ c.price_per_hour }}/课时)</option>
+                        <option value="{{ c.id }}" data-price="{{ c.price_per_hour }}">{{ c.name }}(¥{{ c.price_per_hour }}/课时)</option>
                         {% endfor %}
                     </select>
                 </div>
-                <div class="col-md-4">
-                    <label class="form-label">操作类型 <span class="text-danger">*</span></label>
-                    <select class="form-select" name="transfer_type" id="transfer_type">
-                        <option value="transfer">转课(换课程，仅正课)</option>
-                        <option value="upgrade">升阶(100%正课结转)</option>
-                        <option value="gift">转赠(给其他学员，仅正课)</option>
+
+                <!-- 转课类型选择 -->
+                <div class="col-12">
+                    <label class="form-label">转课类型 <span class="text-danger">*</span></label>
+                    <div class="btn-group w-100" role="group">
+                        <input type="radio" class="btn-check" name="transfer_class_type" id="type_class" value="class_transfer" checked>
+                        <label class="btn btn-outline-primary" for="type_class"><i class="bi bi-people"></i> 班级转课</label>
+
+                        <input type="radio" class="btn-check" name="transfer_class_type" id="type_transfer" value="transfer">
+                        <label class="btn btn-outline-primary" for="type_transfer"><i class="bi bi-arrow-repeat"></i> 换课转课</label>
+
+                        <input type="radio" class="btn-check" name="transfer_class_type" id="type_upgrade" value="upgrade">
+                        <label class="btn btn-outline-primary" for="type_upgrade"><i class="bi bi-arrow-up-circle"></i> 升阶转课</label>
+
+                        <input type="radio" class="btn-check" name="transfer_class_type" id="type_gift" value="gift">
+                        <label class="btn btn-outline-primary" for="type_gift"><i class="bi bi-gift"></i> 转赠课时</label>
+                    </div>
+                </div>
+
+                <!-- 班级转课选项 -->
+                <div class="col-md-6" id="classTransferSection">
+                    <label class="form-label">目标班级 <span class="text-danger">*</span></label>
+                    <select class="form-select" name="to_class_id" id="to_class_id">
+                        <option value="">请选择目标班级</option>
+                        {% for c in classes %}
+                        <option value="{{ c.id }}" data-teacher="{{ c.teacher_id }}">{{ c.name }}</option>
+                        {% endfor %}
                     </select>
                 </div>
-                <div class="col-md-4" id="toCourseGroup">
+                <div class="col-md-6" id="teacherSelectSection">
+                    <label class="form-label">目标授课老师</label>
+                    <select class="form-select" name="to_teacher_id" id="to_teacher_id">
+                        <option value="">跟随班级老师</option>
+                        {% for t in teachers %}
+                        <option value="{{ t.id }}">{{ t.name }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+
+                <!-- 班级转课-单价变更选项 -->
+                <div class="col-12" id="priceChangeSection" style="display:none;">
+                    <div class="card bg-light">
+                        <div class="card-body">
+                            <div class="row g-3">
+                                <div class="col-md-12">
+                                    <label class="form-label">单价变更类型</label>
+                                    <div class="btn-group" role="group">
+                                        <input type="radio" class="btn-check" name="price_change_type" id="price_no_change" value="no_change" checked>
+                                        <label class="btn btn-outline-secondary" for="price_no_change">无单价变更</label>
+
+                                        <input type="radio" class="btn-check" name="price_change_type" id="price_changed" value="price_changed">
+                                        <label class="btn btn-outline-warning" for="price_changed">有单价变更</label>
+                                    </div>
+                                </div>
+                                <div class="col-md-4" id="newUnitPriceSection" style="display:none;">
+                                    <label class="form-label">新单价(元/课时)</label>
+                                    <input type="number" step="0.01" class="form-control" name="new_unit_price" id="new_unit_price" placeholder="请输入新单价">
+                                </div>
+                                <div class="col-md-4" id="priceChangeReasonSection" style="display:none;">
+                                    <label class="form-label">变更原因 <span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" name="price_change_reason" id="price_change_reason" placeholder="必填">
+                                </div>
+                                <div class="col-md-4" id="effectiveDateSection" style="display:none;">
+                                    <label class="form-label">生效时间</label>
+                                    <input type="date" class="form-control" name="effective_date" id="effective_date" value="">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- 换课/升阶/转赠选项 -->
+                <div class="col-md-4" id="toCourseGroup" style="display:none;">
                     <label class="form-label">转入课程</label>
                     <select class="form-select" name="to_course_id" id="to_course_id">
                         <option value="">请选择转入课程</option>
                         {% for c in courses %}
-                        <option value="{{ c.id }}" data-price="{{ c.price_per_hour }}">{{ c.name }}(&yen;{{ c.price_per_hour }}/课时)</option>
+                        <option value="{{ c.id }}" data-price="{{ c.price_per_hour }}">{{ c.name }}(¥{{ c.price_per_hour }}/课时)</option>
                         {% endfor %}
                     </select>
                 </div>
@@ -53,18 +117,20 @@
                         {% endfor %}
                     </select>
                 </div>
-                <div class="col-md-4">
-                    <label class="form-label">转出课时数 <span class="text-danger">*</span></label>
-                    <input type="number" step="1" class="form-control" name="transfer_hours" id="transfer_hours" required min="1">
+                <div class="col-md-4" id="transferHoursGroup" style="display:none;">
+                    <label class="form-label">转出课时数</label>
+                    <input type="number" step="1" class="form-control" name="transfer_hours" id="transfer_hours" min="1">
                 </div>
-                <div class="col-md-8">
+                <div class="col-12">
                     <label class="form-label">备注</label>
                     <input type="text" class="form-control" name="remark" placeholder="可选">
                 </div>
             </div>
+
+            <div class="mt-3" id="accountInfo"></div>
             <div class="mt-3" id="transferCalc"></div>
             <div class="mt-3">
-                <button type="submit" class="btn btn-primary" onclick="return confirm('确认转课/转赠操作？')"><i class="bi bi-check-lg"></i> 确认</button>
+                <button type="submit" class="btn btn-primary" onclick="return confirm('确认转课操作？')"><i class="bi bi-check-lg"></i> 确认</button>
                 <a href="{{ url_for('transfer_list') }}" class="btn btn-outline-secondary">取消</a>
             </div>
         </form>
@@ -74,28 +140,122 @@
 
 {% block extra_js %}
 <script>
-document.getElementById('transfer_type').addEventListener('change', function() {
-    var type = this.value;
-    document.getElementById('toCourseGroup').style.display = (type === 'transfer' || type === 'upgrade') ? '' : 'none';
-    document.getElementById('toStudentGroup').style.display = type === 'gift' ? '' : 'none';
+// 显示/隐藏不同转课类型的选项
+function toggleTransferType() {
+    var type = document.querySelector('input[name="transfer_class_type"]:checked').value;
+
+    // 班级转课
+    var classSection = document.getElementById('classTransferSection');
+    var teacherSection = document.getElementById('teacherSelectSection');
+    var priceSection = document.getElementById('priceChangeSection');
+    // 换课/升阶/转赠
+    var toCourse = document.getElementById('toCourseGroup');
+    var toStudent = document.getElementById('toStudentGroup');
+    var transferHours = document.getElementById('transferHoursGroup');
+
+    // 重置所有
+    classSection.style.display = 'none';
+    teacherSection.style.display = 'none';
+    priceSection.style.display = 'none';
+    toCourse.style.display = 'none';
+    toStudent.style.display = 'none';
+    transferHours.style.display = 'none';
+
+    if (type === 'class_transfer') {
+        classSection.style.display = '';
+        teacherSection.style.display = '';
+        priceSection.style.display = '';
+    } else if (type === 'gift') {
+        toStudent.style.display = '';
+        transferHours.style.display = '';
+    } else {
+        toCourse.style.display = '';
+        if (type === 'transfer') {
+            transferHours.style.display = '';
+        }
+    }
+}
+
+// 监听转课类型变化
+document.querySelectorAll('input[name="transfer_class_type"]').forEach(function(radio) {
+    radio.addEventListener('change', toggleTransferType);
 });
 
+// 监听单价变更类型
+document.querySelectorAll('input[name="price_change_type"]').forEach(function(radio) {
+    radio.addEventListener('change', function() {
+        var isChanged = this.value === 'price_changed';
+        document.getElementById('newUnitPriceSection').style.display = isChanged ? '' : 'none';
+        document.getElementById('priceChangeReasonSection').style.display = isChanged ? '' : 'none';
+        document.getElementById('effectiveDateSection').style.display = isChanged ? '' : 'none';
+    });
+});
+
+// 加载学员课时信息
 document.getElementById('from_student_id').addEventListener('change', loadFromAccount);
 document.getElementById('from_course_id').addEventListener('change', loadFromAccount);
 
 function loadFromAccount() {
     var sid = document.getElementById('from_student_id').value;
     var cid = document.getElementById('from_course_id').value;
-    if (!sid || !cid) return;
+    if (!sid || !cid) {
+        document.getElementById('accountInfo').innerHTML = '';
+        return;
+    }
     fetch('/api/student_account/' + sid + '/' + cid)
         .then(r => r.json())
         .then(data => {
             if (data.success) {
                 var d = data.data;
-                document.getElementById('transferCalc').innerHTML =
-                    '<div class="alert alert-light"><strong>当前余额：</strong>正课 ' + d.normal_hours + ' 课时，赠课 ' + d.gifted_hours + ' 课时，合计 ' + d.total_hours + ' 课时</div>';
+                document.getElementById('accountInfo').innerHTML =
+                    '<div class="alert alert-info"><strong>当前课时：</strong>正课 ' + d.normal_hours + ' 课时，赠课 ' + d.gifted_hours + ' 课时，合计 ' + d.total_hours + ' 课时</div>';
+            } else {
+                document.getElementById('accountInfo').innerHTML =
+                    '<div class="alert alert-warning">未找到该学员的课时账户</div>';
             }
         });
 }
+
+// 目标班级变更时自动填充老师
+document.getElementById('to_class_id').addEventListener('change', function() {
+    var selected = this.options[this.selectedIndex];
+    var teacherId = selected.dataset.teacher;
+    if (teacherId) {
+        document.getElementById('to_teacher_id').value = teacherId;
+    }
+});
+
+// 表单提交验证
+document.getElementById('transferForm').addEventListener('submit', function(e) {
+    var type = document.querySelector('input[name="transfer_class_type"]:checked').value;
+
+    if (type === 'class_transfer') {
+        var toClassId = document.getElementById('to_class_id').value;
+        if (!toClassId) {
+            alert('请选择目标班级');
+            e.preventDefault();
+            return;
+        }
+
+        var priceChange = document.querySelector('input[name="price_change_type"]:checked').value;
+        if (priceChange === 'price_changed') {
+            var newPrice = document.getElementById('new_unit_price').value;
+            var reason = document.getElementById('price_change_reason').value;
+            if (!newPrice || parseFloat(newPrice) <= 0) {
+                alert('有单价变更时，新单价必须大于0');
+                e.preventDefault();
+                return;
+            }
+            if (!reason) {
+                alert('有单价变更时，必须填写变更原因');
+                e.preventDefault();
+                return;
+            }
+        }
+    }
+});
+
+// 初始化
+toggleTransferType();
 </script>
 {% endblock %}

xuexiao/templates/transfer_list.html

@@ -2,7 +2,7 @@
 {% block title %}转课记录 - 学生课程管理系统{% endblock %}
 {% block content %}
 <div class="d-flex justify-content-between align-items-center mb-3">
-    <h4><i class="bi bi-arrow-left-right"></i> 转课/转赠记录</h4>
+    <h4><i class="bi bi-arrow-left-right"></i> 转课记录</h4>
     <a href="{{ url_for('transfer_add') }}" class="btn btn-primary"><i class="bi bi-plus-circle"></i> 申请转课</a>
     {% if current_user.has_permission('transfer_export') %}<a href="{{ url_for('transfer_export') }}" class="btn btn-success"><i class="bi bi-file-earmark-excel"></i> 导出</a>{% endif %}
 </div>
@@ -11,7 +11,24 @@
         <div class="table-responsive">
             <table class="table table-hover table-bordered">
                 <thead class="table-light">
-                    <tr><th>ID</th><th>时间</th><th>类型</th><th>转出学员</th><th>转入学员</th><th>转出课程</th><th>转入课程</th><th>转出课时</th><th>转出金额</th><th>备注</th></tr>
+                    <tr>
+                        <th>ID</th>
+                        <th>时间</th>
+                        <th>类型</th>
+                        <th>学员</th>
+                        <th>课程</th>
+                        <th>原班级</th>
+                        <th>目标班级</th>
+                        <th>原老师</th>
+                        <th>目标老师</th>
+                        <th>单价变更</th>
+                        <th>原单价</th>
+                        <th>新单价</th>
+                        <th>转出课时</th>
+                        <th>变更原因</th>
+                        <th>生效时间</th>
+                        <th>备注</th>
+                    </tr>
                 </thead>
                 <tbody>
                     {% for r in records %}
@@ -19,21 +36,39 @@
                         <td>{{ r.id }}</td>
                         <td>{{ r.created_at.strftime('%Y-%m-%d') }}</td>
                         <td>
-                            {% if r.transfer_type == 'transfer' %}<span class="badge bg-primary">转课</span>
-                            {% elif r.transfer_type == 'upgrade' %}<span class="badge bg-success">升阶</span>
-                            {% else %}<span class="badge bg-info">转赠</span>{% endif %}
+                            {% if r.transfer_class_type == 'class_transfer' %}
+                                <span class="badge bg-primary">班级转课</span>
+                            {% elif r.transfer_class_type == 'upgrade' %}
+                                <span class="badge bg-success">升阶</span>
+                            {% elif r.transfer_class_type == 'course_transfer' %}
+                                <span class="badge bg-info">换课</span>
+                            {% else %}
+                                <span class="badge bg-secondary">转赠</span>
+                            {% endif %}
                         </td>
-                        <td>{{ r.from_student.name }}</td>
-                        <td>{{ r.to_student.name if r.to_student else '-' }}</td>
-                        <td>{{ r.from_course.name }}</td>
-                        <td>{{ r.to_course.name if r.to_course else '-' }}</td>
+                        <td>{{ students[r.from_student_id].name if students.get(r.from_student_id) else '-' }}</td>
+                        <td>{{ courses[r.from_course_id].name if courses.get(r.from_course_id) else '-' }}</td>
+                        <td>{{ classes[r.from_class_id].name if r.from_class_id and classes.get(r.from_class_id) else '-' }}</td>
+                        <td>{{ classes[r.to_class_id].name if r.to_class_id and classes.get(r.to_class_id) else '-' }}</td>
+                        <td>{{ teachers[r.from_teacher_id].name if r.from_teacher_id and teachers.get(r.from_teacher_id) else '-' }}</td>
+                        <td>{{ teachers[r.to_teacher_id].name if r.to_teacher_id and teachers.get(r.to_teacher_id) else '-' }}</td>
+                        <td>
+                            {% if r.price_change_type == 'price_changed' %}
+                                <span class="badge bg-warning">有变更</span>
+                            {% else %}
+                                <span class="badge bg-secondary">无变更</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ '¥%.2f'|format(r.original_unit_price) if r.original_unit_price else '-' }}</td>
+                        <td>{{ '¥%.2f'|format(r.new_unit_price) if r.new_unit_price else '-' }}</td>
                         <td>{{ r.transfer_hours }}</td>
-                        <td>{% if r.transfer_amount %}&yen;{{ r.transfer_amount }}{% else %}-{% endif %}</td>
+                        <td>{{ r.price_change_reason or '-' }}</td>
+                        <td>{{ r.effective_date.strftime('%Y-%m-%d') if r.effective_date else '-' }}</td>
                         <td>{{ r.remark or '-' }}</td>
                     </tr>
                     {% endfor %}
                     {% if not records %}
-                    <tr><td colspan="10" class="text-center text-muted">暂无转课记录</td></tr>
+                    <tr><td colspan="16" class="text-center text-muted">暂无转课记录</td></tr>
                     {% endif %}
                 </tbody>
             </table>