diff --git a/src/mixin/selectMixin.js b/src/mixin/selectMixin.js index 2df8bef..7877315 100644 --- a/src/mixin/selectMixin.js +++ b/src/mixin/selectMixin.js @@ -12,10 +12,10 @@ export default { }], sortList: [{ id: "ASC", - value: '升序' + value: '评分升序' }, { id: "DESC", - value: '降序' + value: '评分降序' }], false_or_true: [{ id: 0, diff --git a/src/views/book/appointment.vue b/src/views/book/appointment.vue index 04d42c2..8b9452a 100644 --- a/src/views/book/appointment.vue +++ b/src/views/book/appointment.vue @@ -10,7 +10,7 @@
- 查询 + 查询
新增 diff --git a/src/views/book/components/addAppointment.vue b/src/views/book/components/addAppointment.vue index 129aa49..b7de236 100644 --- a/src/views/book/components/addAppointment.vue +++ b/src/views/book/components/addAppointment.vue @@ -88,7 +88,9 @@ 场地图片:
- diff --git a/src/views/book/count.vue b/src/views/book/count.vue index 055a744..99d7443 100644 --- a/src/views/book/count.vue +++ b/src/views/book/count.vue @@ -13,7 +13,7 @@
- 查询 + 查询
diff --git a/src/views/book/index.vue b/src/views/book/index.vue index 7fc6eb0..3a3deca 100644 --- a/src/views/book/index.vue +++ b/src/views/book/index.vue @@ -21,7 +21,7 @@
- 查询 + 查询
导出 @@ -92,7 +92,10 @@ } from "@/api/book/index.js" import { index as getAppointment - } from "@/api/book/appointment.js" + } from "@/api/book/appointment.js" + import { + download + } from "@/utils/downloadRequest"; export default { mixins: [myMixins], components: { @@ -229,9 +232,36 @@ this.$refs.addBook.site_options = this.site_options this.$refs.addBook.isShow = true }, - exportExcel(){ + exportExcel() { + let _export = {} + this.table_item.map(item => { - }, + if (item.prop === 'status') { + _export['status_text'] = item.label + } else { + _export[item.prop] = item.label + } + }) + download( + '/api/admin/appointments/index', + 'get', { + user_name: this.select.user_name, + export_fields: _export, + filter: [{ + key: 'date', + op: 'eq', + value: this.select.date ? this.select.date : '' + }, { + key: 'site', + op: 'eq', + value: this.select.site + }], + is_export: 1, + page: 1, + page_size: 999 + }, + `预约信息.xlsx`) + } } } diff --git a/src/views/config/banner.vue b/src/views/config/banner.vue index 4b53b97..ef132ae 100644 --- a/src/views/config/banner.vue +++ b/src/views/config/banner.vue @@ -16,7 +16,7 @@
- 查询 + 查询
新增 diff --git a/src/views/config/info.vue b/src/views/config/info.vue index 8fde183..d71e9ff 100644 --- a/src/views/config/info.vue +++ b/src/views/config/info.vue @@ -10,7 +10,7 @@
- 查询 + 查询
新增 diff --git a/src/views/config/teacher.vue b/src/views/config/teacher.vue index 5e19f7d..c714626 100644 --- a/src/views/config/teacher.vue +++ b/src/views/config/teacher.vue @@ -10,7 +10,7 @@
- 查询 + 查询
新增 diff --git a/src/views/course/apply.vue b/src/views/course/apply.vue index e4eea07..c213aaa 100644 --- a/src/views/course/apply.vue +++ b/src/views/course/apply.vue @@ -20,7 +20,7 @@
- 查询 + 查询
@@ -199,9 +199,12 @@ getTypes() { indexType({ page: 1, - page_size: 999 + page_size: 999, + sort_name:'id', + sort_type:'ASC', }).then(res => { - this.courseTypesList = res.data.filter(item => item.status === 1) + // this.courseTypesList = res.data.filter(item => item.status === 1) + this.courseTypesList = res.data }) }, changeDateRange(e) { diff --git a/src/views/course/apply_list.vue b/src/views/course/apply_list.vue index abd8e11..8e95b67 100644 --- a/src/views/course/apply_list.vue +++ b/src/views/course/apply_list.vue @@ -23,7 +23,7 @@
- 查询 + 查询 导出
diff --git a/src/views/course/attendance.vue b/src/views/course/attendance.vue index 432bda1..fbfed00 100644 --- a/src/views/course/attendance.vue +++ b/src/views/course/attendance.vue @@ -15,8 +15,8 @@
- 查询 - 导出 + 查询 + 导出
@@ -25,41 +25,47 @@ -
-
-
课程名称:{{subjectObj.title}}
-
开课日期:{{subjectObj.date}}
-
类别:{{subjectObj.leibie}}
-
班主任:{{subjectObj.teacher}}
+
+
+
课程名称:{{subjectObj.title}}
+
开课日期:{{subjectObj.date}}
+
类别:{{subjectObj.leibie}}
+
班主任:{{subjectObj.teacher}}
- +