diff --git a/frontend/src/api/teachBusiness/courseRunning.js b/frontend/src/api/teachBusiness/courseRunning.js index 04ecfd690..af8546372 100644 --- a/frontend/src/api/teachBusiness/courseRunning.js +++ b/frontend/src/api/teachBusiness/courseRunning.js @@ -71,8 +71,8 @@ export function getScheduleAdjustDetail(ssdksqbh) { * 提交调课申请 * POST /course-running/adjust/submit * 请求体（ScheduleAdjustApplyDTO）核心字段：sskcbbh 课次编号、sy 调课事由、rq 调课后新日期、 - * jc 调课后新节次、nd 年度、sqjybh 申请教员编号（可选 ydsjap 原日期节次描述、xydrwbh/kbh/ - * kcbbh/xydmc/jysdh/yjsbh/xjsbh/kcmc/sqjyxm 由课次自动带出） + * jc 调课后新节次、nd 年度；sqjybh/xydrwbh/kbh/kcbbh/xjsbh 为可选关联字段， + * roomList/teacherList/teamList/supportList 为调整后的关联明细。 */ export function submitScheduleAdjust(data) { return request({ diff --git a/frontend/src/views/student/warningCondition/index.vue b/frontend/src/views/student/warningCondition/index.vue index d81be0738..a31c30734 100644 --- a/frontend/src/views/student/warningCondition/index.vue +++ b/frontend/src/views/student/warningCondition/index.vue @@ -20,11 +20,11 @@ - - - - - + + + 否 + 是 + @@ -253,7 +253,7 @@ export default { mc: '', pxlx: '', pxcc: '', - ty: '' + ty: 0 }, // ==================== 列表数据 ==================== @@ -317,10 +317,7 @@ export default { pageNum: this.pageNum, pageSize: this.pageSize } - // 状态：0 启用 / 1 停用（选中时才传） - if (this.searchForm.ty !== '' && this.searchForm.ty !== null && this.searchForm.ty !== undefined) { - params.ty = this.searchForm.ty - } + params.ty = this.searchForm.ty // 其余文本条件非空时才传 ;['mc', 'pxlx', 'pxcc'].forEach(key => { if (this.searchForm[key] !== '' && this.searchForm[key] !== null && this.searchForm[key] !== undefined) { @@ -349,7 +346,7 @@ export default { mc: '', pxlx: '', pxcc: '', - ty: '' + ty: 0 } this.pageNum = 1 this.fetchList() @@ -541,4 +538,4 @@ export default { user-select: none; } } - \ No newline at end of file + diff --git a/frontend/src/views/subjectMajor/discipline/index.vue b/frontend/src/views/subjectMajor/discipline/index.vue index a77d6a0a1..4a8b328a2 100644 --- a/frontend/src/views/subjectMajor/discipline/index.vue +++ b/frontend/src/views/subjectMajor/discipline/index.vue @@ -25,8 +25,11 @@ - - 停用 + + + 否 + 是 + @@ -322,10 +325,7 @@ export default { pageNum: this.pageNum, pageSize: this.pageSize } - // 状态：勾选「停用」时仅查已停用（ty=1），未勾选则查询全部 - if (this.searchForm.ty) { - params.ty = 1 - } + params.ty = this.searchForm.ty ? 1 : 0 // 其余文本条件非空时才传 ;['zymc', 'zydm', 'zyfx', 'xnz', 'pxlx2'].forEach(key => { const value = this.searchForm[key] diff --git a/frontend/src/views/subjectMajor/major/index.vue b/frontend/src/views/subjectMajor/major/index.vue index 1a6571f74..598e346b7 100644 --- a/frontend/src/views/subjectMajor/major/index.vue +++ b/frontend/src/views/subjectMajor/major/index.vue @@ -45,11 +45,11 @@ - - - - - + + + 否 + 是 + @@ -367,7 +367,7 @@ export default { pxlx2: '', pxcc: '', xkzyxxbsh: '', - ty: '' + ty: 0 }, // ==================== 列表数据 ==================== @@ -460,10 +460,7 @@ export default { pageNum: this.pageNum, pageSize: this.pageSize } - // 状态：0 启用 / 1 停用（选中时才传） - if (this.searchForm.ty !== '' && this.searchForm.ty !== null && this.searchForm.ty !== undefined) { - params.ty = this.searchForm.ty - } + params.ty = this.searchForm.ty // 其余文本条件非空时才传 ;['zymc', 'zyfx', 'zydm', 'xnz', 'pxlx', 'pxlx2', 'pxcc', 'xkzyxxbsh'].forEach(key => { if (this.searchForm[key] !== '' && this.searchForm[key] !== null && this.searchForm[key] !== undefined) { @@ -497,7 +494,7 @@ export default { pxlx2: '', pxcc: '', xkzyxxbsh: '', - ty: '' + ty: 0 } this.pageNum = 1 this.fetchList() diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue index 601e226b4..cb6231d6f 100644 --- a/frontend/src/views/system/dept/index.vue +++ b/frontend/src/views/system/dept/index.vue @@ -9,15 +9,11 @@ @keyup.enter.native="handleQuery" /> - - - - + + + 否 + 是 + 搜索 @@ -206,7 +202,7 @@ export default { // 查询参数 queryParams: { deptName: undefined, - status: undefined + status: '0' }, // 表单参数 form: {}, diff --git a/frontend/src/views/system/dict/data.vue b/frontend/src/views/system/dict/data.vue index 4ad1f322a..0acb25fe6 100644 --- a/frontend/src/views/system/dict/data.vue +++ b/frontend/src/views/system/dict/data.vue @@ -19,15 +19,11 @@ @keyup.enter.native="handleQuery" /> - - - - + + + 否 + 是 + 搜索 @@ -253,7 +249,7 @@ export default { pageSize: 10, dictType: undefined, dictLabel: undefined, - status: undefined + status: '0' }, // 表单参数 form: {}, diff --git a/frontend/src/views/system/dict/index.vue b/frontend/src/views/system/dict/index.vue index bab1b55db..7079dbb37 100644 --- a/frontend/src/views/system/dict/index.vue +++ b/frontend/src/views/system/dict/index.vue @@ -19,20 +19,11 @@ @keyup.enter.native="handleQuery" /> - - - - + + + 否 + 是 + \ No newline at end of file + diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue index 49fac46ce..d5c0144ea 100644 --- a/frontend/src/views/system/menu/index.vue +++ b/frontend/src/views/system/menu/index.vue @@ -9,15 +9,11 @@ @keyup.enter.native="handleQuery" /> - - - - + + + 否 + 是 + 搜索 @@ -352,7 +348,8 @@ export default { // 查询参数 queryParams: { menuName: undefined, - visible: undefined + visible: undefined, + status: '0' }, // 表单参数 form: {}, diff --git a/frontend/src/views/system/post/index.vue b/frontend/src/views/system/post/index.vue index 6bdc3a3bd..c8a6fd236 100644 --- a/frontend/src/views/system/post/index.vue +++ b/frontend/src/views/system/post/index.vue @@ -17,15 +17,11 @@ @keyup.enter.native="handleQuery" /> - - - - + + + 否 + 是 + 搜索 @@ -190,7 +186,7 @@ export default { pageSize: 10, postCode: undefined, postName: undefined, - status: undefined + status: '0' }, // 表单参数 form: {}, diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue index 17468da66..0cda7bb05 100644 --- a/frontend/src/views/system/role/index.vue +++ b/frontend/src/views/system/role/index.vue @@ -19,20 +19,11 @@ @keyup.enter.native="handleQuery" /> - - - - + + + 否 + 是 + \ No newline at end of file + diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 30bc674c4..97f6389a6 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -10,10 +10,11 @@ - - - - + + + 否 + 是 + @@ -230,7 +231,7 @@ export default { pageSize: 10, userName: undefined, phonenumber: undefined, - status: undefined, + status: '0', deptId: undefined }, // 列信息 diff --git a/frontend/src/views/teachBusiness/syllabus/index.vue b/frontend/src/views/teachBusiness/syllabus/index.vue index cda411597..43c212f0d 100644 --- a/frontend/src/views/teachBusiness/syllabus/index.vue +++ b/frontend/src/views/teachBusiness/syllabus/index.vue @@ -10,11 +10,11 @@ - - - - - + + + 否 + 是 + @@ -296,7 +296,7 @@ export default { loading: false, searchForm: { zydh: '', - ty: '' + ty: 0 }, tableData: [], total: 0, @@ -381,8 +381,8 @@ export default { fetchList() { this.loading = true const { zydh, ty } = this.searchForm - // 专业代号与停用标识同时给出时走后端 /listByZydhAndTy；否则查全部后本地过滤 - const useApiQuery = zydh && ty !== '' && ty !== null && ty !== undefined + // 专业代号存在时走后端组合查询；否则查全部后按停用标识过滤 + const useApiQuery = Boolean(zydh) const req = useApiQuery ? listSyllabusByZydhAndTy(zydh, ty) : listSyllabus() @@ -390,9 +390,7 @@ export default { let list = response.data || [] if (!useApiQuery) { if (zydh) list = list.filter(i => i.zydh && i.zydh.indexOf(zydh) !== -1) - if (ty !== '' && ty !== null && ty !== undefined) { - list = list.filter(i => Number(i.ty) === Number(ty)) - } + list = list.filter(i => Number(i.ty) === Number(ty)) } this.tableData = list this.total = list.length @@ -408,7 +406,7 @@ export default { this.fetchList() }, handleReset() { - this.searchForm = { zydh: '', ty: '' } + this.searchForm = { zydh: '', ty: 0 } this.fetchList() }, handleSelectionChange(val) { diff --git a/frontend/src/views/teachBusiness/timetableAdjust/index.vue b/frontend/src/views/teachBusiness/timetableAdjust/index.vue index 71e96de42..154e37056 100644 --- a/frontend/src/views/teachBusiness/timetableAdjust/index.vue +++ b/frontend/src/views/teachBusiness/timetableAdjust/index.vue @@ -99,16 +99,23 @@ - + - + 选择可供调课课次 - + @@ -118,20 +125,34 @@ - - + + - + - + - + + + - +
@@ -294,6 +315,7 @@ import { cancelScheduleAdjust } from '@/api/teachBusiness/courseRunning' import { listAllSemester } from '@/api/teachBusiness/semester' +import { listAllClassroom } from '@/api/teachBusiness/classroom' // 节次 -> 节次区间映射 const JC_SECTION = { @@ -347,16 +369,17 @@ export default { addForm: {}, addRules: { nd: [{ required: true, message: '请选择年度', trigger: 'change' }], - sskcbbh: [{ required: true, message: '请输入课次编号', trigger: 'blur' }], + sskcbbh: [{ required: true, message: '请选择可供调课课次', trigger: 'change' }], sy: [{ required: true, message: '请输入调课事由', trigger: 'blur' }], rq: [{ required: true, message: '请选择拟调整日期', trigger: 'change' }], - jc: [{ required: true, message: '请选择拟调整节次', trigger: 'change' }], - sqjybh: [{ required: true, message: '请输入申请教员编号', trigger: 'blur' }] + jc: [{ required: true, message: '请选择拟调整节次', trigger: 'change' }] }, // 可供调课课次 lessonDialogVisible: false, lessonLoading: false, lessonOptions: [], + classroomLoading: false, + classroomOptions: [], // 审批 auditVisible: false, auditLoading: false, @@ -480,9 +503,39 @@ export default { xjsbh: '', ydsjap: '' } + this.lessonOptions = [] + this.loadClassroomOptions() this.$nextTick(() => this.$refs.addForm && this.$refs.addForm.clearValidate()) this.addVisible = true }, + handleAddYearChange() { + this.addForm.sskcbbh = '' + this.addForm.xydmc = '' + this.addForm.yjsbh = '' + this.addForm.xjsbh = '' + this.addForm.ydsjap = '' + this.lessonOptions = [] + }, + loadClassroomOptions() { + this.classroomLoading = true + return listAllClassroom().then(response => { + const classrooms = Array.isArray(response.data) ? response.data : [] + this.classroomOptions = classrooms + .filter(room => room.jsbh && !this.isDisabledValue(room.ty)) + .sort((first, second) => String(first.jsbh).localeCompare(String(second.jsbh), 'zh-CN')) + }).catch(() => { + this.classroomOptions = [] + this.$message.warning('教室列表加载失败，请稍后重试') + }).finally(() => { + this.classroomLoading = false + }) + }, + classroomOptionLabel(room) { + return room.jsmc ? room.jsbh + ' · ' + room.jsmc : room.jsbh + }, + isDisabledValue(value) { + return value === true || value === 1 || value === '1' || value === 'true' + }, loadAdjustableLessons() { if (!this.addForm.nd) { this.$message.warning('请先选择年度') @@ -490,23 +543,32 @@ export default { } this.lessonLoading = true listAdjustableLessons({ nd: this.addForm.nd }).then(response => { - this.lessonOptions = response.data || [] + const data = response.data || [] + this.lessonOptions = Array.isArray(data) ? data : (data.records || []) this.lessonLoading = false this.lessonDialogVisible = true }).catch(() => { this.lessonLoading = false - this.$message.info('加载可供调课课次失败，请手动填写课次编号') + this.$message.warning('加载可供调课课次失败，请稍后重试') }) }, pickLesson(row) { - this.addForm.sskcbbh = row.sskcbbh - // 自动带出课次关联字段（若接口返回则回填） - ;['xydmc', 'yjsbh', 'ydsjap', 'kbh', 'kcbbh', 'xydrwbh', 'jysdh', 'xjsbh', 'kcmc', 'sqjyxm'].forEach(key => { + const lessonNumber = row.sskcbbh || row.bh || '' + if (!lessonNumber) { + this.$message.warning('当前课次缺少课次编号，无法选择') + return + } + this.addForm.sskcbbh = lessonNumber + this.addForm.xydmc = row.xydmc || '' + this.addForm.yjsbh = row.jsbh || row.yjsbh || '' + this.addForm.xjsbh = '' + this.addForm.ydsjap = row.rq ? this.fmtRqJc(row.rq, row.jc) : (row.ydsjap || '') + ;['kbh', 'kcbbh', 'xydrwbh', 'jysdh', '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)) + this.$nextTick(() => this.$refs.addForm && this.$refs.addForm.validateField('sskcbbh')) + this.$message.success('已选择课次：' + (row.kcmc || lessonNumber)) }, submitAdd() { this.$refs.addForm.validate(valid => { @@ -516,12 +578,14 @@ export default { sy: this.addForm.sy, rq: this.addForm.rq + 'T00:00:00', jc: this.addForm.jc, - nd: this.addForm.nd, - sqjybh: this.addForm.sqjybh + nd: this.addForm.nd } - ;['xydmc', 'yjsbh', 'xjsbh', 'ydsjap', 'kbh', 'kcbbh', 'xydrwbh', 'jysdh', 'kcmc', 'sqjyxm'].forEach(key => { + ;['xydrwbh', 'kbh', 'kcbbh', 'xjsbh'].forEach(key => { if (this.addForm[key]) payload[key] = this.addForm[key] }) + if (this.addForm.xjsbh) { + payload.roomList = [{ jsbh: this.addForm.xjsbh }] + } this.addLoading = true submitScheduleAdjust(payload).then(() => { this.addLoading = false diff --git a/frontend/src/views/teachBusiness/venue/index.vue b/frontend/src/views/teachBusiness/venue/index.vue index 6c3bbefe4..3ef952450 100644 --- a/frontend/src/views/teachBusiness/venue/index.vue +++ b/frontend/src/views/teachBusiness/venue/index.vue @@ -29,10 +29,10 @@ - - - - + + 否 + 是 + @@ -211,7 +211,7 @@ export default { jsmc: '', jxldh: '', jxcdlx: '', - ty: '' + ty: false }, tableData: [], jxcdlxOptions: [], @@ -302,7 +302,7 @@ export default { jsmc: '', jxldh: '', jxcdlx: '', - ty: '' + ty: false } this.pageNum = 1 this.fetchList() diff --git a/frontend/src/views/teachOffice/office/index.vue b/frontend/src/views/teachOffice/office/index.vue index 24319f4d6..cc6b515ff 100644 --- a/frontend/src/views/teachOffice/office/index.vue +++ b/frontend/src/views/teachOffice/office/index.vue @@ -29,11 +29,11 @@ @keyup.enter.native="handleQuery" /> - - - - - + + + 否 + 是 + 查询 @@ -176,7 +176,7 @@ export default { jysdh: undefined, jysmc: undefined, bx: undefined, - ty: undefined + ty: 0 }, // 表单参数 form: {}, diff --git a/frontend/src/views/textbook/index.vue b/frontend/src/views/textbook/index.vue index a2450c7cb..2ae46e4ad 100644 --- a/frontend/src/views/textbook/index.vue +++ b/frontend/src/views/textbook/index.vue @@ -48,11 +48,10 @@ - - - - - + + 否 + 是 + @@ -806,7 +805,7 @@ export default { // ==================== 查询表单（仅后端 Mapper 支持的字段） ==================== searchForm: { bh: '', mc: '', zz: '', cbs: '', isbn: '', - jcfl: '', jclx: '', tyType: '' + jcfl: '', jclx: '', ty: false }, // ==================== 下拉选项 ==================== @@ -958,8 +957,7 @@ export default { params[key] = String(value).trim() } }) - if (this.searchForm.tyType === '0') params.ty = false - else if (this.searchForm.tyType === '1') params.ty = true + params.ty = this.searchForm.ty return params }, @@ -991,7 +989,7 @@ export default { handleReset() { this.searchForm = { bh: '', mc: '', zz: '', cbs: '', isbn: '', - jcfl: '', jclx: '', tyType: '' + jcfl: '', jclx: '', ty: false } this.pageNum = 1 this.fetchList()