diff --git a/.env.development b/.env.development
index ca75af5..3dd413d 100644
--- a/.env.development
+++ b/.env.development
@@ -2,6 +2,5 @@
ENV='development'
# base api
-VUE_APP_BASE_API=http://suzhoukeji-test.ali251.langye.net
-VUE_APP_UPLOAD_API=http://suzhoukeji-test.ali251.langye.net/api/admin/upload-file
-VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview
+VUE_APP_BASE_API=https://suzhoukeji-test.ali251.langye.net
+VUE_APP_UPLOAD_API=https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file
diff --git a/.env.production b/.env.production
index 28d6e46..66a994f 100644
--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,5 @@
ENV = 'production'
# base api
-VUE_APP_BASE_API = http://suzhoukeji-test.ali251.langye.net
-VUE_APP_UPLOAD_API = http://suzhoukeji-test.ali251.langye.net/api/admin/upload-file
-VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview
+VUE_APP_BASE_API = https://suzhoukeji-test.ali251.langye.net
+VUE_APP_UPLOAD_API = https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file
diff --git a/src/mixin/selectMixin.js b/src/mixin/selectMixin.js
index 0d1b2da..3ee3f94 100644
--- a/src/mixin/selectMixin.js
+++ b/src/mixin/selectMixin.js
@@ -56,13 +56,13 @@ export default {
type: ''
}],
course_date: [{
- value: '未开始',
+ value: '课程未开始',
type: 'info',
}, {
- value: '进行中',
+ value: '课程进行中',
type: '',
}, {
- value: '已结束',
+ value: '课程已结束',
type: 'success',
}],
// 学员
diff --git a/src/views/book/components/checkBook.vue b/src/views/book/components/checkBook.vue
index 52d6f1e..b078986 100644
--- a/src/views/book/components/checkBook.vue
+++ b/src/views/book/components/checkBook.vue
@@ -15,7 +15,7 @@
时间段：
- 14:00-15:00
+
预约事项：
@@ -23,7 +23,7 @@
预约场地：
- {{submitObj.site}}
+ {{submitObj.appointment_config?submitObj.appointment_config.name:''}}
车牌：
@@ -33,13 +33,28 @@
同行人数：
{{submitObj.accompany_total}}
+
+ 同行人：
+
+
+
+ {{item.name}},
+
+
+
预约人：
- {{submitObj.user_name}}
+ {{submitObj.user?submitObj.user.username:''}}
状态：
- 待审核
+
+
+
+ {{item.value}}
+
+
+
@@ -107,8 +122,10 @@
getDetail() {
show({
id: this.id,
+ show_relation: ['user', 'appointmentAccompany', 'appointmentConfig']
}).then(res => {
- this.submitObj = this.base.requestToForm(res, this.submitObj)
+ this.submitObj = this.base.deepCopy(res, this.submitObj)
+ console.log("this.submitObj", this.submitObj)
})
}
},
diff --git a/src/views/book/index.vue b/src/views/book/index.vue
index 2e1db6b..d6402d9 100644
--- a/src/views/book/index.vue
+++ b/src/views/book/index.vue
@@ -40,7 +40,15 @@
-
+
+
+
+
+ {{formateHH(scope.row.start_time)}}-{{formateHH(scope.row.end_time)}}
+
+
+
+
@@ -114,7 +122,7 @@
align: 'center',
width: 120,
}, {
- prop: 'user_name',
+ prop: 'user.username',
label: '预约人',
align: 'center',
width: 120,
@@ -146,7 +154,8 @@
const res = await index({
page: this.select.page,
page_size: this.select.page_size,
- user_name: this.select.user_name,
+ user_name: this.select.user_name,
+ show_relation:['user'],
filter: [{
key: 'site',
op: 'eq',
@@ -167,6 +176,13 @@
}]
})
this.site_options = res.data
+ },
+ formateHH(val){
+ if(val){
+ return this.$moment(val).format("HH:mm")
+ }else{
+ return ''
+ }
},
checkBook(type, id) {
this.$refs.checkBook.id = id
diff --git a/src/views/course/apply_list.vue b/src/views/course/apply_list.vue
index 96c1989..038a4be 100644
--- a/src/views/course/apply_list.vue
+++ b/src/views/course/apply_list.vue
@@ -81,16 +81,26 @@
list: [],
total: 0,
table_item: [{
- prop: 'user.name',
+ prop: 'user.username',
label: '姓名',
align: 'center',
width: 120
}, {
- prop: 'company_name',
- label: '公司',
+ prop: 'user.sex',
+ label: '性别',
+ align: 'center',
+ width: 120
+ },{
+ prop: 'user.idcard',
+ label: '身份证号',
+ align: 'center',
+ width: 180
+ },{
+ prop: 'user.company_name',
+ label: '公司名称',
align: 'left',
}, {
- prop: 'company_position',
+ prop: 'user.company_position',
label: '职务',
align: 'center',
width: 120,
@@ -99,23 +109,25 @@
label: '联系电话',
align: 'center',
width: 120,
- }, {
- prop: 'company_type',
- label: '企业性质',
- align: 'center',
- width: 180,
- }, {
- prop: 'company_industry',
- label: '所属行业',
- align: 'center',
- width: 120,
- }, {
- prop: 'company_area',
- label: '所属区域',
- align: 'center',
- width: 120,
- }, {
- prop: 'date',
+ },
+ // {
+ // prop: 'company_type',
+ // label: '企业性质',
+ // align: 'center',
+ // width: 180,
+ // }, {
+ // prop: 'company_industry',
+ // label: '所属行业',
+ // align: 'center',
+ // width: 120,
+ // }, {
+ // prop: 'company_area',
+ // label: '所属区域',
+ // align: 'center',
+ // width: 120,
+ // },
+ {
+ prop: 'created_at',
label: '报名时间',
align: 'center',
width: 180,
@@ -166,7 +178,7 @@
},
showDetail(type, row) {
this.$refs.studentDetail.subjectObj = this.subjectObj
- this.$refs.studentDetail.id = row.user_id
+ this.$refs.studentDetail.id = row.id
this.$refs.studentDetail.row = row
this.$refs.studentDetail.type = type
this.$refs.studentDetail.isShow = true
diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue
index e8ef46f..e950b5d 100644
--- a/src/views/course/components/addCourse.vue
+++ b/src/views/course/components/addCourse.vue
@@ -364,7 +364,7 @@
getDetail() {
show({
id: this.id,
- show_relations:['image']
+ show_relation:['image']
}).then(res => {
this.form = this.base.requestToForm(res, this.form)
if (res.image) {
diff --git a/src/views/course/pay.vue b/src/views/course/pay.vue
index 5ee37b4..a02f815 100644
--- a/src/views/course/pay.vue
+++ b/src/views/course/pay.vue
@@ -112,19 +112,26 @@
list: [],
total: 0,
table_item: [{
- type: 'selection',
- width: 50
- }, {
- prop: 'user.name',
+ prop: 'user.username',
label: '姓名',
align: 'center',
width: 120
}, {
- prop: 'company_name',
- label: '公司',
+ prop: 'user.sex',
+ label: '性别',
+ align: 'center',
+ width: 120
+ },{
+ prop: 'user.idcard',
+ label: '身份证号',
+ align: 'center',
+ width: 180
+ },{
+ prop: 'user.company_name',
+ label: '公司名称',
align: 'left',
}, {
- prop: 'company_position',
+ prop: 'user.company_position',
label: '职务',
align: 'center',
width: 120,
@@ -133,23 +140,25 @@
label: '联系电话',
align: 'center',
width: 120,
- }, {
- prop: 'company_type',
- label: '企业性质',
- align: 'center',
- width: 180,
- }, {
- prop: 'company_industry',
- label: '所属行业',
- align: 'center',
- width: 120,
- }, {
- prop: 'company_area',
- label: '所属区域',
- align: 'center',
- width: 120,
- }, {
- prop: 'date',
+ },
+ // {
+ // prop: 'company_type',
+ // label: '企业性质',
+ // align: 'center',
+ // width: 180,
+ // }, {
+ // prop: 'company_industry',
+ // label: '所属行业',
+ // align: 'center',
+ // width: 120,
+ // }, {
+ // prop: 'company_area',
+ // label: '所属区域',
+ // align: 'center',
+ // width: 120,
+ // },
+ {
+ prop: 'created_at',
label: '报名时间',
align: 'center',
width: 180,
diff --git a/src/views/student/components/detail.vue b/src/views/student/components/detail.vue
index 03e9c1d..55fb609 100644
--- a/src/views/student/components/detail.vue
+++ b/src/views/student/components/detail.vue
@@ -22,29 +22,45 @@
姓名
- {{student_info.name?student_info.name:''}}
+ {{student_info.username?student_info.username:''}}
性别
+ {{student_info.sex?student_info.sex:''}}
- 出生日期
+ 手机号码
+ {{student_info.mobile?student_info.mobile:''}}
-
+
- 证件照
+ 身份证
+ {{student_info.idcard?student_info.idcard:''}}
- 手机号码
+ 公司名称
+ {{student_info.company_name?student_info.company_name:''}}
+
+ 职务
+
+ {{student_info.company_position?student_info.company_position:''}}
+
+
+
+
-
+
-
+
-
-
- 公司名称
-
-
-
-
- 个人职务
-
-
-
-
- 是否有股份
-
-
-
-
- 公司成立时间
-
-
-
-
- 公司所属区域
-
-
-
-
- 公司地址
-
-
-
-
- 企业性质
-
-
-
-
- 所属行业
-
-
-
-
- 主营业务
-
-
-
-
- 公司简介
-
-
-
-
- 当前融资情况
-
-
-
-
- 是否需要融资
-
-
-
+
- 报名信息来源
-
-
-
-
- 备注
+ {{item.name}}
+ {{item.value}}
+
@@ -210,8 +163,10 @@
show
} from '@/api/student/index.js'
import {
- save
+ save,
+ show as showSign
} from '@/api/apply/index.js'
+
import myMixins from "@/mixin/selectMixin.js";
export default {
mixins: [myMixins],
@@ -225,7 +180,8 @@
id: '',
subjectObj:{},
student_info: {},
- row:{},
+ row:{},
+ sign_info:[],
form: {
show: '',
status:'',
@@ -260,18 +216,31 @@
}).then(res => {
this.student_info = res
})
+ },
+ getSignDetail(){
+ showSign({
+ id: this.id,
+ show_relation:['user']
+ }).then(res => {
+ this.student_info = res.user
+ this.sign_info = res.data
+ })
}
},
watch: {
isShow(newVal) {
if (newVal) {
- if (this.type === 'show' || this.type === 'check') {
+ if (this.type === 'show') {
this.getDetail()
console.log("row",this.row)
+ }else if(this.type === 'check'){
+ this.getSignDetail()
}
} else {
this.id = ''
- this.subjectObj = {}
+ this.type = 'show'
+ this.subjectObj = {}
+ this.sign_info = []
this.$refs['dialog'].reset()
}
},
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index 16c1fb7..8e9cbf1 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -108,13 +108,23 @@
alltotal:0,
total: 0,
table_item: [{
- prop: 'name',
+ prop: 'username',
label: '姓名',
align: 'center',
width: 120
}, {
+ prop: 'sex',
+ label: '性别',
+ align: 'center',
+ width: 120
+ },{
+ prop: 'idcard',
+ label: '身份证号',
+ align: 'center',
+ width: 180
+ },{
prop: 'company_name',
- label: '公司',
+ label: '公司名称',
align: 'left',
}, {
prop: 'company_position',
@@ -126,22 +136,7 @@
label: '联系电话',
align: 'center',
width: 120,
- }, {
- prop: 'company_type',
- label: '企业性质',
- align: 'center',
- width: 180,
- }, {
- prop: 'company_industry',
- label: '所属行业',
- align: 'center',
- width: 120,
- }, {
- prop: 'company_area',
- label: '所属区域',
- align: 'center',
- width: 120,
- }]
+ },]
}
},