Merge remote-tracking branch 'origin/main'

frontend/src/views/subjectMajor/major/index.vue

@@ -412,6 +412,11 @@ export default {
     this.fetchList()
   },
   methods: {
+    /** 表格序号（跨页连续） */
+    fmtXh(index) {
+      return (this.pageNum - 1) * this.pageSize + index + 1
+    },
+
     /** 创建空表单 */
     createEmptyForm() {
       return {

frontend/src/views/teachBusiness/timetableAdjust/index.vue

@@ -228,6 +228,7 @@
           <el-descriptions-item label="课程名称">{{ detailData.kcmc || '-' }}</el-descriptions-item>
           <el-descriptions-item label="申请教员">{{ detailData.sqjyxm || detailData.sqjybh || '-' }}</el-descriptions-item>
           <el-descriptions-item label="调课事由" :span="2">{{ detailData.sy || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="原上课时间">{{ detailData.ydsjap || '-' }}</el-descriptions-item>
           <el-descriptions-item label="拟调整时间">{{ fmtRqJc(detailData.rq, detailData.jc) }}</el-descriptions-item>
           <el-descriptions-item label="年度">{{ detailData.nd || '-' }}</el-descriptions-item>
           <el-descriptions-item label="创建时间">{{ fmtDateTime(detailData.cjsj) }}</el-descriptions-item>
@@ -241,7 +242,6 @@
           <el-descriptions-item label="教研室审批时间">{{ fmtDateTime(detailData.jyspzsj) }}</el-descriptions-item>
           <el-descriptions-item label="教研室查收人">{{ detailData.jyscsrbh || '-' }}</el-descriptions-item>
           <el-descriptions-item label="教研室查收时间">{{ fmtDateTime(detailData.jyscssj) }}</el-descriptions-item>
-          <el-descriptions-item label="发回意见" :span="2">{{ detailData.fhyj || '-' }}</el-descriptions-item>
           <el-descriptions-item label="教学内容" :span="2">{{ detailData.jxnr || '-' }}</el-descriptions-item>
           <el-descriptions-item label="教学要点" :span="2">{{ detailData.jxyd || '-' }}</el-descriptions-item>
           <el-descriptions-item label="教学方法" :span="2">{{ detailData.jxff || '-' }}</el-descriptions-item>

frontend/src/views/teachOffice/office/index.vue

@@ -67,7 +67,7 @@
             type="text"
             icon="el-icon-circle-close"
             style="color: #f56c6c"
-            :disabled="scope.row.ty"
+            :disabled="scope.row.ty === 1"
             @click="handleDisable(scope.row)"
           >停用</el-button>
         </template>

frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue

@@ -13,10 +13,10 @@
       <div class="info-panel">
         <div class="info-title-row">
           <span class="semester-name">{{ semesterTitle }}</span>
-          <span class="class-name">{{ semester.xydmc || semester.xydbh || '' }}</span>
+          <span class="class-name">{{ className }}</span>
         </div>
         <div class="date-range-row">
-          <div class="range-item">学期日期：{{ fmtDate(semester.kxrq) }} 至 {{ fmtDate(semester.jsrq) }}，共 {{ semesterWeeks }} 周</div>
+          <div class="range-item">学期日期：{{ fmtDate(safeSemester.kxrq) }} 至 {{ fmtDate(safeSemester.jsrq) }}，共 {{ semesterWeeks }} 周</div>
           <div class="range-item">班历记录：{{ records.length }} 条，总学时 {{ summary.totalXs }}，总学分 {{ summary.totalXf }}</div>
         </div>
       </div>
@@ -370,14 +370,21 @@ export default {
         this.$emit('update:visible', val)
       }
     },
+    safeSemester() {
+      return this.semester || {}
+    },
+    className() {
+      const s = this.safeSemester
+      return s.xydmc || s.xydbh || ''
+    },
     semesterTitle() {
-      const s = this.semester || {}
+      const s = this.safeSemester
       const nd = s.nd !== undefined && s.nd !== null && s.nd !== '' ? `${s.nd}年` : ''
       const xq = this.xqdcLabel(s.xqdc)
       return `${nd}${xq}`
     },
     semesterWeeks() {
-      const s = this.semester || {}
+      const s = this.safeSemester
       if (!s.kxrq || !s.jsrq) return '-'
       const start = new Date(String(s.kxrq).slice(0, 10))
       const end = new Date(String(s.jsrq).slice(0, 10))