diff --git a/frontend/src/views/teachOffice/office/index.vue b/frontend/src/views/teachOffice/office/index.vue
index 8f0e76c0c..8249851e1 100644
--- a/frontend/src/views/teachOffice/office/index.vue
+++ b/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>
diff --git a/frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue b/frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue
index 2cb1a00a8..81ffdb684 100644
--- a/frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue
+++ b/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))