@@ -195,10 +195,10 @@
total: '',
status: 1,
use_student: 1,
- dateRange: ['09:00','17:30'],
+ // dateRange: ['09:00','17:30'],
file_ids: [],
- start_time:'09:00',
- end_time:'17:30',
+ // start_time:'09:00',
+ // end_time:'17:30',
// door:'',
// room:''
},
@@ -283,7 +283,7 @@
this.form.sort = res.sort?res.sort:0
this.form.status = res.status ? res.status : 0
this.form.use_student = res.use_student ? res.use_student : 0
- this.form.dateRange = res.start_time?[res.start_time,res.end_time]:['','']
+ // this.form.dateRange = res.start_time?[res.start_time,res.end_time]:['','']
// this.form.door = res.door?JSON.parse(res.door):''
// this.form.room = res.room?JSON.parse(res.room):''
})
@@ -311,10 +311,10 @@
total: '',
status: 1,
use_student: 1,
- dateRange: ['09:00','17:30'],
+ // dateRange: ['09:00','17:30'],
file_ids: [],
- start_time:'09:00',
- end_time:'17:30'
+ // start_time:'09:00',
+ // end_time:'17:30'
}
this.$refs['dialog'].reset()
}
diff --git a/src/views/book/components/addBook.vue b/src/views/book/components/addBook.vue
index 0b60754..1133862 100644
--- a/src/views/book/components/addBook.vue
+++ b/src/views/book/components/addBook.vue
@@ -86,7 +86,7 @@
*预约场地:
-
+
@@ -159,7 +159,8 @@
isShow: false,
type: 'add',
typeName: '手动预约',
- id: '',
+ id: '',
+ siteData:[],
form: {
course_id: '',
user_id: '',
@@ -224,6 +225,14 @@
this.form.timeRange = ''
}
},
+ changeSite(e){
+ console.log("eqwe",e)
+ if(e.length>0){
+ this.form.site = e.join(",")
+ }else{
+ this.form.site = ''
+ }
+ },
compareTime(startTime) {
let date1 = this.$moment()
let sign1 = this.$moment(startTime)
@@ -280,12 +289,16 @@
getDetail() {
show({
id: this.id,
- show_relation: ['user', 'appointmentConfig']
+ show_relation: ['user']
}).then(res => {
this.form = this.base.requestToForm(res, this.form)
this.form.status = res.status ? res.status : 0
- this.form.site = res.site?parseInt(res.site):''
- this.form.timeRange = [res.start_time, res.end_time]
+ let _arr = res.site?res.site.split(","):[]
+ _arr.map(item=>{
+ this.siteData.push(parseInt(item))
+ })
+ this.form.timeRange = [res.start_time, res.end_time]
+
})
},
formatHH(val) {
@@ -349,11 +362,11 @@
const res = await getAppointment({
page: 1,
page_size: 999,
- // filter: [{
- // key: 'status',
- // op: 'eq',
- // value: 1
- // }]
+ filter: [{
+ key: 'status',
+ op: 'eq',
+ value: 1
+ }]
})
this.site_options = res.data
},
@@ -393,6 +406,7 @@
this.type = "add"
this.typeName = '手动预约'
this.course_id = ''
+ this.siteData = []
this.form = {
course_id: '',
user_id: '',
diff --git a/src/views/book/components/checkBook.vue b/src/views/book/components/checkBook.vue
index 50090ae..b2808af 100644
--- a/src/views/book/components/checkBook.vue
+++ b/src/views/book/components/checkBook.vue
@@ -22,8 +22,14 @@
{{submitObj.content}}
- 预约场地:
- {{submitObj.appointment_config?submitObj.appointment_config.real_name:''}}
+ 预约场地:
+
+
+ {{item.real_name}}
+ ,
+
+
+
车牌:
@@ -235,7 +241,7 @@
async getDetail() {
await show({
id: this.id,
- show_relation: ['user', 'appointmentAccompany', 'appointmentConfig', 'third_appointment_logs']
+ show_relation: ['user', 'appointmentAccompany', 'third_appointment_logs']
}).then(res => {
this.submitObj = this.base.deepCopy(res, this.submitObj)
this.thirdArr = res.third_appointment_logs ? res.third_appointment_logs : []
diff --git a/src/views/book/components/showCount.vue b/src/views/book/components/showCount.vue
index dfcdcb1..d014b3a 100644
--- a/src/views/book/components/showCount.vue
+++ b/src/views/book/components/showCount.vue
@@ -140,7 +140,7 @@
page: this.select.page,
page_size: this.select.page_size,
user_name: this.select.user_name,
- show_relation: ['user', 'appointmentConfig'],
+ show_relation: ['user'],
})
this.list = res.data
this.total = res.total
diff --git a/src/views/book/index.vue b/src/views/book/index.vue
index df074ac..bb7aa39 100644
--- a/src/views/book/index.vue
+++ b/src/views/book/index.vue
@@ -55,13 +55,17 @@
-
+
@@ -74,7 +78,8 @@
title="确定取消吗?">
取消
- 编辑
删除
@@ -140,7 +145,7 @@
align: 'center',
width: 120,
}, {
- prop: 'appointment_config.real_name',
+ prop: 'site_detail',
label: '预约场地',
align: 'center',
width: 120,
@@ -148,7 +153,7 @@
prop: 'plate',
label: '车牌',
align: 'center',
- // width: 180,
+ width: 180,
}, {
prop: 'accompany_total',
label: '同行人数',
@@ -195,7 +200,7 @@
page: this.select.page,
page_size: this.select.page_size,
user_name: this.select.user_name,
- show_relation: ['user', 'appointmentConfig', 'third_appointment_logs'],
+ show_relation: ['user', 'third_appointment_logs'],
filter: [{
key: 'date',
op: 'eq',
@@ -268,7 +273,7 @@
'get', {
user_name: this.select.user_name,
export_fields: _export,
- show_relation: ['user', 'appointmentConfig'],
+ show_relation: ['user'],
filter: [{
key: 'date',
op: 'eq',
diff --git a/src/views/config/components/addTeacher.vue b/src/views/config/components/addTeacher.vue
index 2bfc922..c2c8b81 100644
--- a/src/views/config/components/addTeacher.vue
+++ b/src/views/config/components/addTeacher.vue
@@ -24,16 +24,16 @@
-
-