lynn
/
Getinge-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改

Browse Source
master
lion 3 months ago
parent 2b4c370779
commit ee14a06c99
5 changed files with 126 additions and 55 deletions
Show Stats Download Patch File Download Diff File

8
.env.development
Unescape View File

@ -2,8 +2,8 @@
ENV='development'
# base api
#VUE_APP_BASE_API=https://suzhoukeji-test.ali251.langye.net
#VUE_APP_UPLOAD_API=https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file
VUE_APP_BASE_API=https://suzhoukeji-test.ali251.langye.net
VUE_APP_UPLOAD_API=https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file
VUE_APP_BASE_API = https://wx.sstbc.com
VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file
#VUE_APP_BASE_API = https://wx.sstbc.com
#VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file

136
src/views/course/apply_list.vue
Unescape View File

@ -127,8 +127,20 @@
<template v-slot:username>
<el-table-column align='center' label="姓名" width="120" header-align="center">
<template slot-scope="scope">
<div>{{scope.row.user.username}}</div>
<!-- <div style="color:red" v-if="scope.row.change_data && scope.row.change_data.length>0">
<div style="color:red" v-if="getPropValueIfExists(scope.row.change_data,'username')">
{{getPropValueIfExists(scope.row.change_data,'username')}}
</div>
<div v-else>
{{scope.row.user.username}}
</div>
<!-- <template v-if="scope.row.change_data && scope.row.change_data.length>0">
<template v-for="item in scope.row.change_data">
<div style="color:red" v-if="item.username">{{item.username}}000</div>
<div v-else>{{scope.row.user.username}}</div>
</template>
</template>
<div v-else>{{scope.row.user.username}}222</div>
<div style="color:red" v-if="scope.row.change_data && scope.row.change_data.length>0">
报名信息有变更
</div> -->
</template>
@ -138,7 +150,7 @@
<el-table-column align='center' label="状态" width="120" header-align="center">
<template slot-scope="scope">
<div v-for="item in apply_status_list">
<el-tag :type="item.type" v-if="scope.row.status===item.id">{{item.value}}</el-tag>
<el-tag :type="item.type" v-if="scope.row.status==item.id">{{item.value}}</el-tag>
</div>
</template>
</el-table-column>
@ -239,47 +251,92 @@
align: 'center',
width: 120,
fixed: 'left'
}, {
prop: 'user.sex',
label: '性别',
align: 'center',
width: 120
}, {
prop: 'user.idcard',
label: '身份证号',
align: 'center',
width: 180
}, {
prop: 'user.mobile',
label: '联系方式',
align: 'center',
width: 120,
}, {
prop: 'user.birthday',
label: '出生年月',
align: 'center',
width: 120,
}, {
prop: 'user.email',
label: '邮箱',
align: 'center',
width: 120,
}, {
width: 120,
customFn:(row)=>{
if(this.getPropValueIfExists(row.change_data,'mobile')){
return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'mobile')}</div>)
}else{
return (<div>{row.user.mobile}</div>)
}
}
},{
prop: 'user.company_name',
label: '公司名称',
align: 'left',
width: 240,
width: 240,
customFn:(row)=>{
if(this.getPropValueIfExists(row.change_data,'company_name')){
return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'company_name')}</div>)
}else{
return (<div>{row.user.company_name}</div>)
}
}
}, {
prop: 'user.company_position',
label: '职务',
align: 'center',
width: 120,
width: 120,
customFn:(row)=>{
if(this.getPropValueIfExists(row.change_data,'company_position')){
return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'company_position')}</div>)
}else{
return (<div>{row.user.company_position}</div>)
}
}
},{
prop: 'user.sex',
label: '性别',
align: 'center',
width: 120,
customFn:(row)=>{
if(this.getPropValueIfExists(row.change_data,'sex')){
return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'sex')}</div>)
}else{
return (<div>{row.user.sex}</div>)
}
}
},
// {
// prop: 'user.idcard',
// label: '身份证号',
// align: 'center',
// width: 180
// },
{
prop: 'user.birthday',
label: '出生年月',
align: 'center',
width: 120,
customFn:(row)=>{
if(this.getPropValueIfExists(row.change_data,'birthday')){
return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'birthday')}</div>)
}else{
return (<div>{row.user.birthday}</div>)
}
}
}, {
prop: 'score',
label: '评分',
prop: 'user.email',
label: '邮箱',
align: 'center',
width: 120,
},
width: 120,
customFn:(row)=>{
if(this.getPropValueIfExists(row.change_data,'email')){
return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'email')}</div>)
}else{
return (<div>{row.user.email}</div>)
}
}
},
// {
// prop: 'score',
// label: '评分',
// align: 'center',
// width: 120,
// },
{
prop: 'created_at',
label: '报名时间',
@ -305,7 +362,14 @@
}
this.getList()
},
methods: {
methods: {
getPropValueIfExists(change_data, prop) {
if (!change_data || !Array.isArray(change_data)) return false;
const itemWithProp = change_data.find(item => prop in item);
console.log("itemWithProp",itemWithProp)
return itemWithProp ? itemWithProp[prop] : false;
},
changeSelectType(e, selectName) {
if (e) {
this.select[selectName] = e.join(",")
@ -443,13 +507,15 @@
exportExcel() {
let _export = {}
this.table_item.map(item => {
if (item.prop === 'status') {
_export['status_text'] = item.label
} else if (item.prop === 'created_at' || item.prop === 'score') {
} else if (item.prop === 'created_at') {
_export[item.prop] = item.label
}
})
})
_export['user.idcard'] = '身份证号'
_export['score'] = '评分'
download(
'/api/admin/course-signs/index',
'get', {

8
src/views/course/components/addClass.vue
Unescape View File

@ -101,8 +101,12 @@
align: 'center',
width: 120,
}, {
prop: 'theme',
label: '课程主题',
prop: 'sex',
label: '性别',
align: 'left'
}, {
prop: 'mobile',
label: '联系方式',
align: 'left'
}, {
prop: 'address',

15
src/views/student/index.vue
Unescape View File

@ -11,6 +11,12 @@
<div>
<el-input v-model="select.keyword" placeholder="请输入关键词"></el-input>
</div>
<div>
<el-input v-model="select.name" placeholder="请输入姓名"></el-input>
</div>
<div>
<el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
</div>
<xy-selectors style="width:auto" @reset="resetSelect" @search="select.page=1,getList()">
<template v-slot:selected>
<div class="selected-wrap">
@ -39,9 +45,7 @@
</el-option>
</el-select>
</div>
<div>
<el-input v-model="select.name" placeholder="请输入姓名"></el-input>
</div>
<div style="width:250px">
<el-date-picker v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width:100%" @change="changeBirthdayDates" type="daterange" range-separator="至"
@ -81,11 +85,6 @@
</el-option>
</el-select>
</div>
<div>
<el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
</div>
<div>
<el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
</div>

14
src/views/student/search.vue
Unescape View File

@ -10,6 +10,12 @@
<div>
<div>
<el-input v-model="select.keyword" placeholder="请输入关键词"></el-input>
</div>
<div>
<el-input v-model="select.name" placeholder="请输入姓名"></el-input>
</div>
<div>
<el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
</div>
<xy-selectors style="width:auto" @reset="resetSelect" @search="select.page=1,getList()">
<template v-slot:selected>
@ -40,9 +46,7 @@
</el-option>
</el-select>
</div>
<div>
<el-input v-model="select.name" placeholder="请输入姓名"></el-input>
</div>
<div style="width:250px">
<el-date-picker v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width:100%" @change="changeBirthdayDates" type="daterange" range-separator="至"
@ -87,9 +91,7 @@
</div>
<div>
<el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
</div>
<div>
<el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
</div>

Write Preview
Loading…
Cancel
Save