diff --git a/frontend/src/views/subjectMajor/major/index.vue b/frontend/src/views/subjectMajor/major/index.vue index 3e33df78..1a6571f7 100644 --- a/frontend/src/views/subjectMajor/major/index.vue +++ b/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 { diff --git a/frontend/src/views/teachBusiness/timetableAdjust/index.vue b/frontend/src/views/teachBusiness/timetableAdjust/index.vue index a963246c..ca91ac9e 100644 --- a/frontend/src/views/teachBusiness/timetableAdjust/index.vue +++ b/frontend/src/views/teachBusiness/timetableAdjust/index.vue @@ -228,6 +228,7 @@ {{ detailData.kcmc || '-' }} {{ detailData.sqjyxm || detailData.sqjybh || '-' }} {{ detailData.sy || '-' }} + {{ detailData.ydsjap || '-' }} {{ fmtRqJc(detailData.rq, detailData.jc) }} {{ detailData.nd || '-' }} {{ fmtDateTime(detailData.cjsj) }} @@ -241,7 +242,6 @@ {{ fmtDateTime(detailData.jyspzsj) }} {{ detailData.jyscsrbh || '-' }} {{ fmtDateTime(detailData.jyscssj) }} - {{ detailData.fhyj || '-' }} {{ detailData.jxnr || '-' }} {{ detailData.jxyd || '-' }} {{ detailData.jxff || '-' }} diff --git a/frontend/src/views/teachOffice/office/index.vue b/frontend/src/views/teachOffice/office/index.vue index 8f0e76c0..8249851e 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)" >停用 diff --git a/frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue b/frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue index 2cb1a00a..81ffdb68 100644 --- a/frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue +++ b/frontend/src/views/teachOffice/shiftSemester/ClassCalendarDialog.vue @@ -13,10 +13,10 @@
{{ semesterTitle }} - {{ semester.xydmc || semester.xydbh || '' }} + {{ className }}
-
学期日期:{{ fmtDate(semester.kxrq) }} 至 {{ fmtDate(semester.jsrq) }},共 {{ semesterWeeks }} 周
+
学期日期:{{ fmtDate(safeSemester.kxrq) }} 至 {{ fmtDate(safeSemester.jsrq) }},共 {{ semesterWeeks }} 周
班历记录:{{ records.length }} 条,总学时 {{ summary.totalXs }},总学分 {{ summary.totalXf }}
@@ -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))