From 02d4fb5744d5b04c5fb702197dd89aa2566c483e Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Wed, 21 Jan 2026 13:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/book/components/addBook.vue | 2 +- src/views/course/apply.vue | 2 +- src/views/course/class.vue | 2 +- src/views/course/components/addCourse.vue | 2 +- src/views/course/history.vue | 2 +- src/views/course/index.vue | 75 +- src/views/employee/components/addEmployee.vue | 26 +- src/views/employee/index.vue | 8 +- src/views/historyCourse/index.vue | 28 +- src/views/stockCompany/index.vue | 2 + src/views/student/black.vue | 4 +- src/views/student/index.vue | 2079 +++++++++-------- src/views/student/schoolmate.vue | 4 +- src/views/student/schoolmateCompany.vue | 1615 ++++++------- src/views/student/search.vue | 4 +- .../survey/components/SurveyResultsDialog.vue | 6 +- 16 files changed, 1993 insertions(+), 1868 deletions(-) diff --git a/src/views/book/components/addBook.vue b/src/views/book/components/addBook.vue index c92098b..2159b26 100644 --- a/src/views/book/components/addBook.vue +++ b/src/views/book/components/addBook.vue @@ -73,7 +73,7 @@ *预约时间:
- diff --git a/src/views/course/apply.vue b/src/views/course/apply.vue index 9d22976..48b4965 100644 --- a/src/views/course/apply.vue +++ b/src/views/course/apply.vue @@ -9,7 +9,7 @@
-
diff --git a/src/views/course/class.vue b/src/views/course/class.vue index 308db80..ea70095 100644 --- a/src/views/course/class.vue +++ b/src/views/course/class.vue @@ -10,7 +10,7 @@
-
diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue index cb457a3..9a327a7 100644 --- a/src/views/course/components/addCourse.vue +++ b/src/views/course/components/addCourse.vue @@ -102,7 +102,7 @@ 开课日期:
- diff --git a/src/views/course/history.vue b/src/views/course/history.vue index b802cf0..4d8a1d6 100644 --- a/src/views/course/history.vue +++ b/src/views/course/history.vue @@ -10,7 +10,7 @@
-
diff --git a/src/views/course/index.vue b/src/views/course/index.vue index 6b7fc7b..68b0fd6 100644 --- a/src/views/course/index.vue +++ b/src/views/course/index.vue @@ -10,7 +10,7 @@
-
@@ -26,6 +26,12 @@ +
+ + + + +
查询
@@ -125,6 +131,7 @@ dateRange: '', type: "", course_status: '', + is_chart: '', page: 1, page_size: 10, }, @@ -193,38 +200,62 @@ this.select.name = '' this.select.type = '' this.select.course_status = '' + this.select.is_chart = '' this.select.dateRange = '' this.select.page=1 this.getList() }, async getList() { + const filter = [] + + if (this.select.name) { + filter.push({ + key: 'name', + op: 'like', + value: this.select.name + }) + } + + if (this.select.type !== '' && this.select.type !== null) { + filter.push({ + key: 'type', + op: 'eq', + value: this.select.type + }) + } + + if (this.select.course_status !== '' && this.select.course_status !== null) { + filter.push({ + key: 'course_status', + op: 'eq', + value: this.select.course_status + }) + } + + if (this.select.dateRange) { + filter.push({ + key: 'start_date', + op: 'range', + value: this.select.dateRange + }) + } + + // 只有 is_chart 不为空时才添加(0 和 1 都需要传递) + if (this.select.is_chart !== '' && this.select.is_chart !== null && this.select.is_chart !== undefined) { + filter.push({ + key: 'is_chart', + op: 'eq', + value: this.select.is_chart + }) + } + const res = await index({ page: this.select.page, page_size: this.select.page_size, show_relation: ['type_detail'], sort_name: 'start_date', sort_type: 'DESC', - // course_status:this.select.course_status, - filter: [{ - key: 'name', - op: 'like', - value: this.select.name - }, { - key: 'type', - op: 'eq', - value: this.select.type - }, - { - key: 'course_status', - op: 'eq', - value: this.select.course_status - }, - { - key: 'start_date', - op: 'range', - value: this.select.dateRange - } - ] + filter: filter }) this.list = res.data this.total = res.total diff --git a/src/views/employee/components/addEmployee.vue b/src/views/employee/components/addEmployee.vue index 1019585..fd93a10 100644 --- a/src/views/employee/components/addEmployee.vue +++ b/src/views/employee/components/addEmployee.vue @@ -114,6 +114,16 @@ + @@ -144,7 +154,8 @@ export default { end_date: '', company_name: '', name: '', - department: '' + department: '', + total: 1 }, rules: { type: [{ @@ -162,6 +173,10 @@ export default { end_date: [{ required: true, message: '请选择结束日期' + }], + total: [{ + required: true, + message: '请输入数量' }] } } @@ -282,7 +297,8 @@ export default { end_date: res.end_date || '', company_name: res.company_name || '', name: res.name || '', - department: res.department || '' + department: res.department || '', + total: res.total || 1 } // 设置课程类型后,需要筛选课程列表 this.$nextTick(() => { @@ -312,7 +328,8 @@ export default { end_date: '', company_name: '', name: '', - department: '' + department: '', + total: 1 } this.filterCourseOptions() } @@ -328,7 +345,8 @@ export default { end_date: '', company_name: '', name: '', - department: '' + department: '', + total: 1 } this.$refs['dialog'].reset() } diff --git a/src/views/employee/index.vue b/src/views/employee/index.vue index 1eeddd8..bf3aaf1 100644 --- a/src/views/employee/index.vue +++ b/src/views/employee/index.vue @@ -48,7 +48,7 @@