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}}
-
+
-
- {{scope.row.course_keeps_count}}
-
+
+ {{scope.row.course_keeps_count}}
+
0
-
-
- {{scope.row.user_sign_total}}
-
+
+
+ {{scope.row.user_sign_total}}
+
0
-
-
- {{scope.row.course_keeps_count - scope.row.user_sign_total}}
-
+
+
+ {{scope.row.course_keeps_count - scope.row.user_sign_total}}
+
0
@@ -74,8 +80,8 @@
-
-
+
+
@@ -84,24 +90,27 @@
import showAttendance from './components/showAttendance.vue'
import {
index
- } from '@/api/course/courseContent.js'
- import imports from "@/views/component/imports.vue"
+ } from '@/api/course/courseContent.js'
+ import imports from "@/views/component/imports.vue"
+ import {
+ download
+ } from "@/utils/downloadRequest";
export default {
components: {
- showAttendance,
+ showAttendance,
imports
},
data() {
return {
select: {
theme: '',
- date: '',
- course_id:'',
+ date: '',
+ course_id: '',
page: 1,
page_size: 10
- },
- subjectObj:{},
- importData:[],
+ },
+ subjectObj: {},
+ importData: [],
list: [],
total: 0,
table_item: [{
@@ -109,12 +118,12 @@
label: '考勤日期',
align: 'center',
width: 180,
- }, {
- prop:'period',
- label: '考勤时间',
- align: 'center',
- width: 180,
- },{
+ }, {
+ prop: 'period',
+ label: '考勤时间',
+ align: 'center',
+ width: 180,
+ }, {
prop: 'theme',
label: '课程主题',
align: 'left'
@@ -123,12 +132,12 @@
label: '授课教师',
align: 'center',
width: 160,
- }, {
+ }, {
prop: 'address',
label: '授课教室',
align: 'center',
width: 160,
- },{
+ }, {
prop: 'course_keeps_count',
label: '应到人数',
align: 'center',
@@ -150,65 +159,103 @@
}
},
- created() {
- this.subjectObj = this.$route.query
- console.log(this.$route.query)
+ created() {
+ this.subjectObj = this.$route.query
+ console.log(this.$route.query)
this.select.course_id = this.$route.query.id
this.getList()
},
methods: {
- showAttendance(row,state) {
- this.$refs.showAttendance.setRow(row,state)
+ pageIndexChange(e) {
+ this.select.page = e
+ this.getList()
+ },
+ pageSizeChange(e) {
+ this.select.page_size = e
+ this.select.page = 1
+ this.getList()
+ },
+ showAttendance(row, state) {
+ this.$refs.showAttendance.setRow(row, state)
this.$refs.showAttendance.isShow = true
- },
- // 导入
- importTable(row) {
- this.$refs.imports.tableData = {
- 'data[course_id]':row.course_id,
- 'data[course_content_id]':row.id
- }
- this.$refs.imports.show()
-
- // {"course_id":15,"course_content_id":188}
+ },
+ // 导入
+ importTable(row) {
+ this.$refs.imports.tableData = {
+ 'data[course_id]': row.course_id,
+ 'data[course_content_id]': row.id
+ }
+ this.$refs.imports.show()
+
+ // {"course_id":15,"course_content_id":188}
},
async getList() {
const res = await index({
page: this.select.page,
page_size: this.select.page_size,
show_relation: ['teacher'],
- filter: [{
- key:'course_id',
- op:'eq',
- value:this.select.course_id
- },{
+ filter: [{
+ key: 'course_id',
+ op: 'eq',
+ value: this.select.course_id
+ }, {
key: 'theme',
op: 'like',
value: this.select.theme
}, {
key: 'date',
op: 'eq',
- value: this.select.date?this.select.date:''
+ value: this.select.date ? this.select.date : ''
}]
})
this.list = res.data
this.total = res.total
- },
+ },
+ exportExcel() {
+ let _export = {}
+ this.table_item.map(item => {
+ _export[item.prop] = item.label
+ })
+ download(
+ '/api/admin/course-keeps/index',
+ 'get', {
+ export_fields: _export,
+ filter: [{
+ key: 'course_id',
+ op: 'eq',
+ value: this.select.course_id
+ }, {
+ key: 'theme',
+ op: 'like',
+ value: this.select.theme
+ }, {
+ key: 'date',
+ op: 'eq',
+ value: this.select.date ? this.select.date : ''
+ }],
+ is_export: 1,
+ page: 1,
+ page_size: 999
+ },
+ `${this.subjectObj.title}${this.select.date ? this.select.date : ''}考勤信息.xlsx`)
+ }
}
}
-
diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue
index e9d33f7..7cc70b0 100644
--- a/src/views/notice/index.vue
+++ b/src/views/notice/index.vue
@@ -16,7 +16,7 @@
- 查询
+ 查询
新增
diff --git a/src/views/student/components/detail.vue b/src/views/student/components/detail.vue
index a733b7c..4be384d 100644
--- a/src/views/student/components/detail.vue
+++ b/src/views/student/components/detail.vue
@@ -169,10 +169,10 @@
- 审核:
+ *审核:
-
+
@@ -197,10 +197,10 @@
点击上传
- 只能上传xls/ppt/pdf/docx/xlsx/pptx文件
+ 只能上传pdf文件
@@ -263,7 +263,7 @@
fileList: [],
form: {
show: '',
- status: '',
+ status: 0,
score: '',
file_ids: [],
reason: '',
@@ -338,6 +338,7 @@
})
}
this.sign_info = res.data
+ this.form.status = res.status?res.status:0
console.log("this.sign_info",this.sign_info)
})
}
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index b7b9173..52ac1e4 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -77,7 +77,7 @@
- 查询
+ 查询
导入
批量设置校友库
批量取消校友库
diff --git a/src/views/student/search.vue b/src/views/student/search.vue
index c9182c7..918a482 100644
--- a/src/views/student/search.vue
+++ b/src/views/student/search.vue
@@ -71,7 +71,7 @@
- 查询
+ 查询
导出
diff --git a/src/views/student/user.vue b/src/views/student/user.vue
index 4b0d165..cc23cfa 100644
--- a/src/views/student/user.vue
+++ b/src/views/student/user.vue
@@ -47,7 +47,7 @@
- 查询
+ 查询
导出