From b06e6fe0de5161985e7dfcf6ccabf78e2137fc0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Thu, 6 Nov 2025 14:24:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/sc/base/roomSelect.vue | 3 ++ .../sc/claTime/addClaTimeAttend.vue | 25 +++++++++++- src/components/sc/claTime/changeTime.vue | 26 +++++++++++- src/components/sc/claTime/changeTimeRule.vue | 40 ++++++++++++++----- src/components/sc/claTime/claTimeSelect.vue | 1 + src/components/sc/course/addCourse.vue | 4 +- src/components/sc/course/cla/changeCla.vue | 23 ++++++++--- src/components/system/dept/deptSelect.vue | 3 ++ src/components/system/staff/staffSelect.vue | 6 +-- src/views/school/claTime/rule/index.vue | 27 ++++++++++++- src/views/school/course/cla/index.vue | 8 ++-- src/views/school/course/index.vue | 9 +++-- 12 files changed, 144 insertions(+), 31 deletions(-) diff --git a/src/components/sc/base/roomSelect.vue b/src/components/sc/base/roomSelect.vue index c669b86..347a91f 100644 --- a/src/components/sc/base/roomSelect.vue +++ b/src/components/sc/base/roomSelect.vue @@ -65,6 +65,9 @@ export default { roomSelect({ deptId: this.deptId }).then(response => { + response.data?.forEach(item=>{ + item.roomId=item.roomId+'' + }) this.roomOptions = response.data }) }, diff --git a/src/components/sc/claTime/addClaTimeAttend.vue b/src/components/sc/claTime/addClaTimeAttend.vue index dc49756..0c5db9d 100644 --- a/src/components/sc/claTime/addClaTimeAttend.vue +++ b/src/components/sc/claTime/addClaTimeAttend.vue @@ -44,7 +44,22 @@
上课教师:
- + + + +
@@ -250,6 +265,7 @@ import { allDetailInfoById } from '@/api/school/sc/cla' import moment from 'moment' import { searchCourseClaStudent } from '@/api/school/sc/student/course' import { claTimeAttend } from '@/api/school/sc/student/course' +import {select as teacherSelect} from "@/api/school/system/staff"; export default { components: { staffSelect, @@ -308,6 +324,7 @@ export default { roomId: undefined, classTheme: undefined }, + teacherOptions:[], // 排课记上课方式 claTimeAttendTypeOptions: [{ dictValue: 'rule', @@ -414,8 +431,14 @@ export default { this.getDictListByDictType('attend_status').then(response => { this.attendStatusOptions = response.data }) + this.getTeacherOptions() }, methods: { + getTeacherOptions() { + teacherSelect().then(response => { + this.teacherOptions = response.data + }) + }, resetData() { this.claInfo = { claName: '', diff --git a/src/components/sc/claTime/changeTime.vue b/src/components/sc/claTime/changeTime.vue index 4b51751..eb3efed 100644 --- a/src/components/sc/claTime/changeTime.vue +++ b/src/components/sc/claTime/changeTime.vue @@ -83,7 +83,21 @@ - + + + @@ -112,6 +126,7 @@ import deptSelect from '@/components/system/dept/deptSelect' import moment from 'moment' import { addTime, claTimeInfo, updateTime } from '@/api/school/sc/cla/claTime' import { getCla } from '@/api/school/sc/cla' +import {select as teacherSelect} from "@/api/school/system/staff"; export default { components: { @@ -138,7 +153,8 @@ export default { } }, // 是否可重新选择课程 - canChangeCla: true + canChangeCla: true, + teacherOptions:[], } }, computed: { @@ -162,8 +178,14 @@ export default { watch: { }, created() { + this.getTeacherOptions() }, methods: { + getTeacherOptions() { + teacherSelect().then(response => { + this.teacherOptions = response.data + }) + }, afterNow(date) { return moment(date).add(1, 'days').toDate().getTime() < new Date().getTime() }, diff --git a/src/components/sc/claTime/changeTimeRule.vue b/src/components/sc/claTime/changeTimeRule.vue index 5229b3e..031ce29 100644 --- a/src/components/sc/claTime/changeTimeRule.vue +++ b/src/components/sc/claTime/changeTimeRule.vue @@ -126,7 +126,21 @@ - + + + @@ -154,6 +168,7 @@ import staffSelect from '@/components/system/staff/staffSelect' import roomSelect from '@/components/sc/base/roomSelect' import moment from 'moment' import { addRule, getRule, updateRule } from '@/api/school/sc/cla/claTimeRule' +import {select as teacherSelect} from "@/api/school/system/staff"; let that export default { components: { @@ -187,6 +202,7 @@ export default { // 表单参数 form: { }, + teacherOptions:[], isIndeterminate: true, checkAllWeekDay: false, beginDatePickerOptions: { @@ -290,8 +306,14 @@ export default { this.weekDayOptions = response.data }) that = this + this.getTeacherOptions() }, methods: { + getTeacherOptions() { + teacherSelect().then(response => { + this.teacherOptions = response.data + }) + }, // 重复方式 repeatTypeFormat(row, column) { return this.selectDictLabel(this.repeatTypeOptions, row.repeatType) @@ -323,21 +345,23 @@ export default { }, loadInfo(id) { this.loadingChange = true + this.reset() getRule(id).then(response => { this.loadingChange = false const date = response.data - date.weekDays = date.weekDay.split(',') + date.deptId=date.deptId+'' + date.weekDays = date.weekDay?.split(',') if (date.startTime !== undefined && date.startTime.length > 5) { date.startTime = date.startTime.substr(0, 5) } if (date.endTime !== undefined && date.endTime.length > 5) { date.endTime = date.endTime.substr(0, 5) } - if (date.onceDate !== undefined) { + if (date.onceDate) { date.chooseDate = date.onceDate.split(',') } this.form = date - this.$refs['form'].resetFields() + console.log(date) this.open = true }).catch(() => { this.loadingChange = false @@ -348,11 +372,9 @@ export default { this.$refs['form'].validate(valid => { if (valid) { this.loadingChange = true - this.form.weekDay = this.form.weekDays.toString() - if (this.form.chooseDate !== undefined) { - this.form.onceDate = this.form.chooseDate.toString() - } - if (this.form.ruleId !== undefined) { + this.form.weekDay = this.form.weekDays?.toString() + this.form.onceDate = this.form.chooseDate?.toString() + if (this.form.ruleId) { updateRule(this.form).then(response => { this.loadingChange = false if (response.respCode === '0000') { diff --git a/src/components/sc/claTime/claTimeSelect.vue b/src/components/sc/claTime/claTimeSelect.vue index 6f5d769..cb33ec2 100644 --- a/src/components/sc/claTime/claTimeSelect.vue +++ b/src/components/sc/claTime/claTimeSelect.vue @@ -93,6 +93,7 @@ export default { queryParam.diffNowDay = this.diffNowDay } searchRecentDayTimeList(queryParam).then(response => { + console.log(queryParam) this.planClaTimeOptions = response.data if (this.planClaTimeOptions.length > 0) { this.courseTimeId = this.planClaTimeOptions[0].courseTimeId diff --git a/src/components/sc/course/addCourse.vue b/src/components/sc/course/addCourse.vue index aef766a..5a2c414 100644 --- a/src/components/sc/course/addCourse.vue +++ b/src/components/sc/course/addCourse.vue @@ -113,7 +113,8 @@ export default { form: { courseCampus: undefined, teachingMode: '1', - partCampus: [] + partCampus: [], + sale:'1', }, // 表单校验 rules: { @@ -177,6 +178,7 @@ export default { this.form.feeModeCycleList = feeModeCycleList this.form.feeModeCycle = feeModeCycle + this.form.sale='1' if (this.form.courseId !== undefined) { updateCourse(this.form).then(response => { diff --git a/src/components/sc/course/cla/changeCla.vue b/src/components/sc/course/cla/changeCla.vue index f9e6000..b5d10c3 100644 --- a/src/components/sc/course/cla/changeCla.vue +++ b/src/components/sc/course/cla/changeCla.vue @@ -35,9 +35,9 @@ > @@ -178,9 +178,20 @@ export default { }, created() { this.getTeacherOptions() - this.getDictListByDictType('recruit_status').then(response => { - this.recruitStatusOptions = response.data - }) + this.recruitStatusOptions = [ + { + "dictLabel": "开放", + "dictValue": "1" + }, + { + "dictLabel": "满班后停止", + "dictValue": "2" + }, + { + "dictLabel": "停止", + "dictValue": "0" + } + ] }, methods: { getTeacherOptions() { diff --git a/src/components/system/dept/deptSelect.vue b/src/components/system/dept/deptSelect.vue index bf2f744..450c248 100644 --- a/src/components/system/dept/deptSelect.vue +++ b/src/components/system/dept/deptSelect.vue @@ -59,6 +59,9 @@ export default { methods: { campusList() { campusList().then(response => { + response.data.forEach(item=>{ + item.id=item.id+'' + }) this.campusOptions = response.data }) }, diff --git a/src/components/system/staff/staffSelect.vue b/src/components/system/staff/staffSelect.vue index a6f6d90..929fe5b 100644 --- a/src/components/system/staff/staffSelect.vue +++ b/src/components/system/staff/staffSelect.vue @@ -29,7 +29,7 @@