lion 1 year ago
parent 2342bed0cd
commit 75c3897ed5

@ -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

@ -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

@ -56,13 +56,13 @@ export default {
type: ''
}],
course_date: [{
value: '未开始',
value: '课程未开始',
type: 'info',
}, {
value: '进行中',
value: '课程进行中',
type: '',
}, {
value: '已结束',
value: '课程已结束',
type: 'success',
}],
// 学员

@ -15,7 +15,7 @@
</div>
<div>
<span>时间段</span>
<span>14:00-15:00</span>
<span></span>
</div>
<div>
<span>预约事项</span>
@ -23,7 +23,7 @@
</div>
<div>
<span>预约场地</span>
<span>{{submitObj.site}}</span>
<span>{{submitObj.appointment_config?submitObj.appointment_config.name:''}}</span>
</div>
<div>
<span>车牌</span>
@ -33,13 +33,28 @@
<span>同行人数</span>
<span>{{submitObj.accompany_total}}</span>
</div>
<div>
<span>同行人</span>
<span v-if="submitObj.appointment_accompany&&submitObj.appointment_accompany.length>0">
<template v-for="item in submitObj.appointment_accompany">
{{item.name}},
</template>
</span>
</div>
<div>
<span>预约人</span>
<span>{{submitObj.user_name}}</span>
<span>{{submitObj.user?submitObj.user.username:''}}</span>
</div>
<div>
<span>状态</span>
<span>待审核</span>
<span>
<template v-for="item in book_status">
<el-tag :type="item.type" v-if="submitObj.status===item.id">{{item.value}}</el-tag>
</template>
</span>
</div>
</div>
<div v-if="type=='check'">
@ -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)
})
}
},

@ -40,7 +40,15 @@
</div>
</template>
</el-table-column>
</template>
</template>
<template v-slot:timerange>
<el-table-column align='center' label="预约时段" width="120" header-align="center">
<template slot-scope="scope">
{{formateHH(scope.row.start_time)}}-{{formateHH(scope.row.end_time)}}
</template>
</el-table-column>
</template>
<template v-slot:btns>
<el-table-column align='center' label="操作" width="180" header-align="center">
<template slot-scope="scope">
@ -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

@ -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

@ -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) {

@ -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,

@ -22,29 +22,45 @@
<template slot="label">
姓名
</template>
{{student_info.name?student_info.name:''}}
{{student_info.username?student_info.username:''}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
性别
</template>
{{student_info.sex?student_info.sex:''}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
出生日期
手机号码
</template>
{{student_info.mobile?student_info.mobile:''}}
</el-descriptions-item>
<el-descriptions-item :span="3">
<el-descriptions-item>
<template slot="label">
件照
身份
</template>
{{student_info.idcard?student_info.idcard:''}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
手机号码
公司名称
</template>
{{student_info.company_name?student_info.company_name:''}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
职务
</template>
{{student_info.company_position?student_info.company_position:''}}
</el-descriptions-item>
<!-- <el-descriptions-item :span="3">
<template slot="label">
证件照
</template>
</el-descriptions-item> -->
<!-- <el-descriptions-item>
<template slot="label">
邮箱
</template>
@ -68,84 +84,21 @@
<template slot="label">
个人简历
</template>
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
</div>
<lx-header icon="" text="公司信息" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<lx-header v-if="type==='check'" icon="" text="报名信息" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
</lx-header>
<div>
<div v-if="type==='check'">
<el-descriptions class="margin-top" :column="3" border>
<el-descriptions-item>
<template slot="label">
公司名称
</template>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
个人职务
</template>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
是否有股份
</template>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
公司成立时间
</template>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
公司所属区域
</template>
</el-descriptions-item>
<el-descriptions-item :span="3">
<template slot="label">
公司地址
</template>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
企业性质
</template>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
所属行业
</template>
</el-descriptions-item>
<el-descriptions-item :span="3">
<template slot="label">
主营业务
</template>
</el-descriptions-item>
<el-descriptions-item :span="3">
<template slot="label">
公司简介
</template>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
当前融资情况
</template>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
是否需要融资
</template>
</el-descriptions-item>
<el-descriptions-item>
<el-descriptions-item v-for="item in sign_info">
<template slot="label">
报名信息来源
</template>
</el-descriptions-item>
<el-descriptions-item :span="3">
<template slot="label">
备注
{{item.name}}
</template>
{{item.value}}
</el-descriptions-item>
</el-descriptions>
</div>
<lx-header icon="" text="审核" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
@ -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()
}
},

@ -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,
}]
},]
}
},

Loading…
Cancel
Save