From 5c107426c1fadae8dc70aa6ab519d4ac4de0b638 Mon Sep 17 00:00:00 2001 From: zhaichao Date: Tue, 25 Aug 2026 18:08:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=91=98=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=95=99=E7=A0=94=E5=AE=A4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/teachBusiness/courseRunning.js | 90 ++------- .../teachBusiness/timetableAdjust/index.vue | 174 +++++------------- .../src/views/teachOffice/teacher/index.vue | 89 +++++---- 3 files changed, 117 insertions(+), 236 deletions(-) diff --git a/frontend/src/api/teachBusiness/courseRunning.js b/frontend/src/api/teachBusiness/courseRunning.js index f18cc16d6..04ecfd690 100644 --- a/frontend/src/api/teachBusiness/courseRunning.js +++ b/frontend/src/api/teachBusiness/courseRunning.js @@ -21,13 +21,13 @@ export function listTeachingPlan(params) { } // ==================== 调课申请管理 /course-running/adjust ==================== -// 接口依据：CourseRunningController（前端 baseURL 为 /api，此处不重复 /api 前缀） +// 接口依据：CourseRunningController（类上 @RequestMapping("/course-running")，前端 baseURL 为 /api，此处不重复 /api 前缀） /** * 分页查询调课申请列表 - * GET /adjust/list + * GET /course-running/adjust/list * 查询参数（ScheduleAdjustQueryDTO）：sskcbbh 课次编号、sqjybh 申请教员编号、nd 年度、 - * jyspzzt 教研室审批状态、jyscszt 教研室查收状态、jgspzt 机关审批状态、sczt 删除状态、 + * jyspzzt 教研室审批状态、jyscszt 教研室查收状态、sczt 删除状态、 * cjsjStart/cjsjEnd 申请日期范围（ISO 格式）、pageNum、pageSize * 返回：PageResult（records/total） */ @@ -40,11 +40,10 @@ export function listScheduleAdjust(params) { } /** - * 查询可供调课课次 - * GET /adjust/lessons - * 查询参数：nd 学期年度 - * 返回：List - * 注意：后端当前未实现该接口，调用会报错（页面已做兜底提示） + * 查询当前教员可供调课的课次 + * GET /course-running/adjust/lessons + * 查询参数：nd 年度（可选） + * 返回：List（kcmc/rq/jc/xydmc/kcxh/jsbh/sskcbbh 等） */ export function listAdjustableLessons(params) { return request({ @@ -56,7 +55,7 @@ export function listAdjustableLessons(params) { /** * 查询调课申请详情 - * GET /adjust/detail + * GET /course-running/adjust/detail * @param ssdksqbh 调课申请编号 * 返回：ScheduleAdjustDetailVO */ @@ -70,10 +69,10 @@ export function getScheduleAdjustDetail(ssdksqbh) { /** * 提交调课申请 - * POST /adjust/submit - * 请求体（ScheduleAdjustApplyDTO）：sskcbbh 课次编号、sy 调课事由、rq 新日期、jc 新节次、 - * nd 年度、sqjybh 申请教员编号、jxnr 教学内容、jxyd 教学要点、jxff 教学方法、 - * jxbzbz 教学保障备注、ycxx 用车信息、bz 备注、roomList/teacherList/teamList/supportList + * POST /course-running/adjust/submit + * 请求体（ScheduleAdjustApplyDTO）核心字段：sskcbbh 课次编号、sy 调课事由、rq 调课后新日期、 + * jc 调课后新节次、nd 年度、sqjybh 申请教员编号（可选 ydsjap 原日期节次描述、xydrwbh/kbh/ + * kcbbh/xydmc/jysdh/yjsbh/xjsbh/kcmc/sqjyxm 由课次自动带出） */ export function submitScheduleAdjust(data) { return request({ @@ -85,8 +84,9 @@ export function submitScheduleAdjust(data) { /** * 教研室审批调课申请 - * POST /adjust/audit/jys - * 请求体（ScheduleAdjustAuditDTO）：ssdksqbh、auditRole=jys、spzt（1同意/2发回/3拒绝）、fhyj、sprbh + * POST /course-running/adjust/audit/jys + * 请求体（ScheduleAdjustAuditDTO）：ssdksqbh（必填）、spzt（1同意/2发回/3拒绝）、 + * fhyj（审批意见，发回时填写）、sprbh（审批人编号，不传时取当前登录人；点审批即已查收） */ export function auditByTeachingOffice(data) { return request({ @@ -96,66 +96,10 @@ export function auditByTeachingOffice(data) { }) } -/** - * 教研室查收调课申请 - * POST /adjust/receive/jys - * @param ssdksqbh 调课申请编号 - * @param csrbh 查收人编号 - */ -export function receiveByTeachingOffice(params) { - return request({ - url: '/course-running/adjust/receive/jys', - method: 'post', - params - }) -} - -/** - * 教学系审批调课申请 - * POST /adjust/audit/jxx - * 请求体（ScheduleAdjustAuditDTO）：ssdksqbh、auditRole=jxx、spzt、fhyj、sprbh - */ -export function auditByTeachingDepartment(data) { - return request({ - url: '/course-running/adjust/audit/jxx', - method: 'post', - data - }) -} - -/** - * 机关审批调课申请 - * POST /adjust/audit/jg - * 请求体（ScheduleAdjustAuditDTO）：ssdksqbh、auditRole=jg、spzt、fhyj、sprbh、jgbh（机关编号必填） - */ -export function auditByAuthority(data) { - return request({ - url: '/course-running/adjust/audit/jg', - method: 'post', - data - }) -} - -/** - * 机关查收调课申请 - * POST /adjust/receive/jg - * @param ssdksqbh 调课申请编号 - * @param jgbh 机关编号 - * @param csrbh 查收人编号 - */ -export function receiveByAuthority(params) { - return request({ - url: '/course-running/adjust/receive/jg', - method: 'post', - params - }) -} - /** * 撤销调课申请 - * DELETE /adjust/cancel - * @param ssdksqbh 调课申请编号 - * @param sqjybh 申请教员编号（权限校验） + * DELETE /course-running/adjust/cancel + * @param params { ssdksqbh, sqjybh } */ export function cancelScheduleAdjust(params) { return request({ diff --git a/frontend/src/views/teachBusiness/timetableAdjust/index.vue b/frontend/src/views/teachBusiness/timetableAdjust/index.vue index ca91ac9e1..71e96de42 100644 --- a/frontend/src/views/teachBusiness/timetableAdjust/index.vue +++ b/frontend/src/views/teachBusiness/timetableAdjust/index.vue @@ -79,21 +79,7 @@ @@ -135,23 +121,17 @@ - - + + - - + + - - + + - - - - - - - - + +
@@ -180,7 +160,7 @@ - + @@ -188,15 +168,13 @@ 发回 拒绝 +
点审批即已查收
 - - - - - + +
@@ -205,22 +183,6 @@
- - - - - - - - - - -
- 确定 - 取消 -
- -
@@ -329,10 +291,6 @@ import { getScheduleAdjustDetail, submitScheduleAdjust, auditByTeachingOffice, - auditByTeachingDepartment, - auditByAuthority, - receiveByTeachingOffice, - receiveByAuthority, cancelScheduleAdjust } from '@/api/teachBusiness/courseRunning' import { listAllSemester } from '@/api/teachBusiness/semester' @@ -402,13 +360,7 @@ export default { // 审批 auditVisible: false, auditLoading: false, - auditTitle: '审批', - auditForm: { ssdksqbh: '', auditRole: 'jys', spzt: 1, fhyj: '', sprbh: '', jgbh: '' }, - // 查收 - receiveVisible: false, - receiveLoading: false, - receiveTitle: '查收', - receiveForm: { ssdksqbh: '', type: 'jys', csrbh: '', jgbh: '' }, + auditForm: { ssdksqbh: '', spzt: 1, fhyj: '', sprbh: '' }, // 详情 detailVisible: false, detailLoading: false, @@ -523,12 +475,10 @@ export default { rq: '', jc: 1, sqjybh: this.curUserName, - jxnr: '', - jxyd: '', - jxff: '', - jxbzbz: '', - ycxx: '', - bz: '' + xydmc: '', + yjsbh: '', + xjsbh: '', + ydsjap: '' } this.$nextTick(() => this.$refs.addForm && this.$refs.addForm.clearValidate()) this.addVisible = true @@ -545,11 +495,16 @@ export default { this.lessonDialogVisible = true }).catch(() => { this.lessonLoading = false - this.$message.info('后端暂未提供可供调课课次接口，请手动填写课次编号') + this.$message.info('加载可供调课课次失败，请手动填写课次编号') }) }, pickLesson(row) { this.addForm.sskcbbh = row.sskcbbh + // 自动带出课次关联字段（若接口返回则回填） + ;['xydmc', 'yjsbh', 'ydsjap', 'kbh', 'kcbbh', 'xydrwbh', 'jysdh', 'xjsbh', 'kcmc', 'sqjyxm'].forEach(key => { + if (row[key] !== undefined && row[key] !== null) this.addForm[key] = row[key] + }) + if (!this.addForm.ydsjap && row.rq) this.addForm.ydsjap = this.fmtRqJc(row.rq, row.jc) this.lessonDialogVisible = false this.$message.success('已选择课次：' + (row.kcmc || row.sskcbbh)) }, @@ -564,7 +519,7 @@ export default { nd: this.addForm.nd, sqjybh: this.addForm.sqjybh } - ;['jxnr', 'jxyd', 'jxff', 'jxbzbz', 'ycxx', 'bz'].forEach(key => { + ;['xydmc', 'yjsbh', 'xjsbh', 'ydsjap', 'kbh', 'kcbbh', 'xydrwbh', 'jysdh', 'kcmc', 'sqjyxm'].forEach(key => { if (this.addForm[key]) payload[key] = this.addForm[key] }) this.addLoading = true @@ -580,46 +535,31 @@ export default { }, /* ---------- 审批 ---------- */ showAuditMenu(row) { - return row.sczt === 0 && (row.jyspzzt === 0 || row.jyspzzt === 1) + return row.sczt === 0 && (row.jyspzzt === 0 || row.jyspzzt === 2 || row.jyspzzt === 3) }, - openAudit(row, role) { - const titleMap = { jys: '教研室审批', jxx: '教学系审批', jg: '机关审批' } - this.auditTitle = titleMap[role] || '审批' + openAudit(row) { this.auditForm = { ssdksqbh: row.ssdksqbh, - auditRole: role, spzt: 1, fhyj: '', - sprbh: this.curUserName, - jgbh: '' + sprbh: '' } this.auditVisible = true }, submitAudit() { const f = this.auditForm - if (!f.sprbh) { - this.$message.warning('请填写审批人编号') - return - } - if (f.auditRole === 'jg' && !f.jgbh) { - this.$message.warning('请填写机关编号') + if (f.spzt !== 1 && !f.fhyj) { + this.$message.warning('发回/拒绝时请填写审批意见') return } const payload = { ssdksqbh: f.ssdksqbh, - auditRole: f.auditRole, spzt: f.spzt, - fhyj: f.fhyj, - sprbh: f.sprbh - } - if (f.jgbh) payload.jgbh = f.jgbh - const apiMap = { - jys: auditByTeachingOffice, - jxx: auditByTeachingDepartment, - jg: auditByAuthority + fhyj: f.fhyj } + if (f.sprbh) payload.sprbh = f.sprbh this.auditLoading = true - apiMap[f.auditRole](payload).then(() => { + auditByTeachingOffice(payload).then(() => { this.auditLoading = false this.auditVisible = false this.$message.success('审批成功') @@ -628,48 +568,11 @@ export default { this.auditLoading = false }) }, - /* ---------- 查收 ---------- */ - showReceiveMenu(row) { - return row.sczt === 0 && row.jyspzzt === 1 - }, - openReceive(row, type) { - this.receiveTitle = type === 'jys' ? '教研室查收' : '机关查收' - this.receiveForm = { - ssdksqbh: row.ssdksqbh, - type: type, - csrbh: this.curUserName, - jgbh: '' - } - this.receiveVisible = true - }, - submitReceive() { - const f = this.receiveForm - if (!f.csrbh) { - this.$message.warning('请填写查收人编号') - return - } - if (f.type === 'jg' && !f.jgbh) { - this.$message.warning('请填写机关编号') - return - } - const params = { ssdksqbh: f.ssdksqbh, csrbh: f.csrbh } - if (f.jgbh) params.jgbh = f.jgbh - const api = f.type === 'jys' ? receiveByTeachingOffice : receiveByAuthority - this.receiveLoading = true - api(params).then(() => { - this.receiveLoading = false - this.receiveVisible = false - this.$message.success('查收成功') - this.loadList() - }).catch(() => { - this.receiveLoading = false - }) - }, /* ---------- 撤销 ---------- */ handleCancel(row) { - this.$confirm('确认撤销该调课申请？撤销后课次将恢复原时间。', '提示', { type: 'warning' }) + this.$confirm('确认撤销该调课申请？', '提示', { type: 'warning' }) .then(() => { - cancelScheduleAdjust({ ssdksqbh: row.ssdksqbh, sqjybh: row.sqjybh }).then(() => { + cancelScheduleAdjust({ ssdksqbh: row.ssdksqbh }).then(() => { this.$message.success('撤销成功') this.loadList() }).catch(() => {}) @@ -791,6 +694,13 @@ export default { gap: 0 4px; } + .form-tip { + font-size: 12px; + color: #909399; + line-height: 1.4; + margin-top: 4px; + } + .pick-lesson-btn { margin-top: 6px; width: 100%; diff --git a/frontend/src/views/teachOffice/teacher/index.vue b/frontend/src/views/teachOffice/teacher/index.vue index 112a8cf28..f97bd74f0 100644 --- a/frontend/src/views/teachOffice/teacher/index.vue +++ b/frontend/src/views/teachOffice/teacher/index.vue @@ -103,22 +103,9 @@ 教员基本信息 - - - - - - - - - - - - - @@ -126,33 +113,55 @@ + + + + + - + + + + + - - + + 是 + 否 + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + @@ -594,6 +603,7 @@ import { getTeacherAttribute, updateTeacherAttribute } from '@/api/teachOffice/teacher' +import { getDicts } from '@/api/system/dict/data' export default { name: 'Teacher', @@ -614,14 +624,14 @@ export default { addForm: this.createEmptyAddForm(), addRules: { 'teacher.jyxm': [{ required: true, message: '请输入教员姓名', trigger: 'blur' }], - 'teacher.jysdh': [{ required: true, message: '请输入教研室代号', trigger: 'blur' }], + 'teacher.xh': [{ required: true, message: '请输入序号', trigger: 'blur' }], - 'teacher.zyjszwdj': [{ required: true, message: '请输入专业技术职务等级', trigger: 'blur' }], + 'teacher.zyjszwdj': [{ required: true, message: '请选择专业技术职务等级', trigger: 'change' }], 'teacher.xslx': [{ required: true, message: '请选择虚实类型', trigger: 'change' }], - 'teacher.jylb': [{ required: true, message: '请输入教员类别', trigger: 'blur' }], - 'teacher.zzlb': [{ required: true, message: '请输入在职类别', trigger: 'blur' }], + 'teacher.jylb': [{ required: true, message: '请选择教员类别', trigger: 'change' }], + 'teacher.zzlb': [{ required: true, message: '请选择在职类别', trigger: 'change' }], 'teacher.ewyxkbs': [{ required: true, message: '请输入额外允许开班数', trigger: 'change' }], - 'teacher.dslb': [{ required: true, message: '请输入导师类别', trigger: 'blur' }], + 'teacher.dslb': [{ required: true, message: '请选择导师类别', trigger: 'change' }], 'teacher.xy': [{ required: true, message: '请输入学缘', trigger: 'blur' }], 'teacher.sfzh': [{ required: true, message: '请输入身份证号', trigger: 'blur' }], 'teacher.xb': [{ required: true, message: '请选择性别', trigger: 'change' }], @@ -659,11 +669,17 @@ export default { attributeForm: {}, attributeLoading: false, attributeSaving: false, - attributeJybh: '' + attributeJybh: '', + // 字典选项 + zyjszwdjOptions: [], + jylbOptions: [], + zzlbOptions: [], + dslbOptions: [] } }, mounted() { this.fetchList() + this.loadDicts() }, methods: { /** 统一格式化后端 LocalDateTime（去除 T、截断到秒） */ @@ -696,6 +712,15 @@ export default { }, /** 移除空值 */ + + + loadDicts() { + getDicts('teacher_zyjszwdj').then(res => { this.zyjszwdjOptions = res.data || [] }).catch(() => {}) + getDicts('teacher_jylb').then(res => { this.jylbOptions = res.data || [] }).catch(() => {}) + getDicts('teacher_zzlb').then(res => { this.zzlbOptions = res.data || [] }).catch(() => {}) + getDicts('teacher_dslb').then(res => { this.dslbOptions = res.data || [] }).catch(() => {}) + }, + cleanPayload(obj) { const payload = {} Object.keys(obj).forEach(key => { @@ -1052,3 +1077,5 @@ export default { } } + +