master
lion 4 months ago
parent 896c690123
commit cd137688e9

@ -32,12 +32,12 @@
<div v-if="item.field==='company_date'"> <div v-if="item.field==='company_date'">
{{student_info[item.field]?(student_info[item.field]=='0000-00-00'?'':student_info[item.field]):''}} {{student_info[item.field]?(student_info[item.field]=='0000-00-00'?'':student_info[item.field]):''}}
</div> </div>
<div v-else> <div v-else style="word-break: break-word; word-wrap: break-word; overflow-wrap: break-word;">
{{student_info[item.field]?student_info[item.field]:''}} {{student_info[item.field]?student_info[item.field]:''}}
<!-- 是否有更改的字段 --> <!-- 是否有更改的字段 -->
<template v-if="change_data.length>0"> <template v-if="change_data.length>0">
<template v-for="change in change_data"> <template v-for="change in change_data">
<span style="color:red" <span style="color:red; word-break: break-word; word-wrap: break-word; overflow-wrap: break-word;"
v-if="change[item.field] && change['need_update']">-->{{change[item.field]}}</span> v-if="change[item.field] && change['need_update']">-->{{change[item.field]}}</span>
</template> </template>
</template> </template>
@ -71,7 +71,7 @@
<template slot="label"> <template slot="label">
{{item.name}} {{item.name}}
</template> </template>
{{item.value}} <div style="word-break: break-word; word-wrap: break-word; overflow-wrap: break-word;">{{item.value}}</div>
</el-descriptions-item> </el-descriptions-item>
</template> </template>
@ -114,12 +114,12 @@
</el-table-column> </el-table-column>
</template> </template>
<template v-slot:values> <template v-slot:values>
<el-table-column align='left' label="操作详情" header-align="center"> <el-table-column align='left' width="450" label="操作详情" header-align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.event=='created'"> <div v-if="scope.row.event=='created'" style="word-break: break-word;">
提交报名信息 提交报名信息
</div> </div>
<div v-else> <div v-else style="word-break: break-word;">
<template v-for="item in apply_status_list"> <template v-for="item in apply_status_list">
<span style="font-weight: bold;" v-if="scope.row.old_values.status===item.id">{{item.value}}</span> <span style="font-weight: bold;" v-if="scope.row.old_values.status===item.id">{{item.value}}</span>
</template> </template>
@ -161,7 +161,7 @@
</div> </div>
<div v-if="sign_result.status===5"> <div v-if="sign_result.status===5">
<span>放弃原因</span> <span>放弃原因</span>
<span>{{sign_result.giveup_reason}}</span> <span style="word-break: break-word; word-wrap: break-word; overflow-wrap: break-word;">{{sign_result.giveup_reason}}</span>
</div> </div>
<div style="display: flex;" v-if="sign_result.status===1"> <div style="display: flex;" v-if="sign_result.status===1">
<span>录取通知书</span> <span>录取通知书</span>
@ -174,7 +174,7 @@
</div> </div>
<div> <div>
<span>备注</span> <span>备注</span>
<span>{{sign_result.reason?sign_result.reason:''}}</span> <span style="word-break: break-word; word-wrap: break-word; overflow-wrap: break-word;">{{sign_result.reason?sign_result.reason:''}}</span>
</div> </div>
</div> </div>
</div> </div>
@ -286,7 +286,7 @@
</template> </template>
</div> </div>
<template v-slot:footer> <template v-slot:footer>
<el-button plain type="primary" plain style='margin-left:5px;margin-bottom:5px;' <el-button plain type="primary" style='margin-left:5px;margin-bottom:5px;'
@click="showChange = false">取消</el-button> @click="showChange = false">取消</el-button>
<el-button type="primary" style='margin-left:5px;margin-bottom:5px;' @click="saveAndUpdate(false)"></el-button> <el-button type="primary" style='margin-left:5px;margin-bottom:5px;' @click="saveAndUpdate(false)"></el-button>
<el-button type="primary" style='margin-left:5px;margin-bottom:5px;' @click="saveAndUpdate(true)"></el-button> <el-button type="primary" style='margin-left:5px;margin-bottom:5px;' @click="saveAndUpdate(true)"></el-button>
@ -623,10 +623,43 @@
flex-basis: 100%; flex-basis: 100%;
} }
//
.xy-table-item-content {
min-width: 0;
max-width: 100%;
overflow: hidden;
word-break: break-word;
word-wrap: break-word;
overflow-wrap: break-word;
}
// el-descriptions
::v-deep .el-descriptions {
max-width: 100%;
overflow: hidden;
}
::v-deep .el-descriptions-item__label { ::v-deep .el-descriptions-item__label {
width: 15%; width: 15%;
} }
::v-deep .el-descriptions-item__content {
word-break: break-word;
word-wrap: break-word;
overflow-wrap: break-word;
max-width: 85%;
}
//
::v-deep .el-table {
max-width: 100%;
overflow: hidden;
}
::v-deep .el-table__body-wrapper {
overflow-x: auto;
}
::v-deep .v-header { ::v-deep .v-header {
margin-top: 0 !important; margin-top: 0 !important;
} }

@ -20,24 +20,36 @@
<div ref="lxHeader"> <div ref="lxHeader">
<lx-header icon="md-apps" :text="$route.meta.title" style="margin-bottom: 10px; border: 0px; margin-top: 15px"> <lx-header icon="md-apps" :text="$route.meta.title" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content"> <div slot="content">
<div class="searchwrap" style="display: flex;align-items: center;"> <div class="searchwrap" style="display: flex; align-items: center; flex-wrap: wrap; gap: 10px;">
<div> <div>
<el-input v-model="select.company_name" placeholder="请输入企业名称"></el-input> <el-input v-model="select.user_name" placeholder="请输入学员名称" style="width: 150px;"></el-input>
</div>
<div>
<el-select v-model="select.is_schoolmate" placeholder="请选择是否校友" clearable style="width: 150px;">
<el-option label="是" :value="1">
</el-option>
<el-option label="否" :value="0">
</el-option>
</el-select>
</div>
<div>
<el-input v-model="select.company_name" placeholder="请输入企业名称" style="width: 200px;"></el-input>
</div> </div>
<div> <div>
<el-select collapse-tags multiple v-model="select.company_tag" placeholder="请选择企业资质" clearable style="width: 100%;"> <el-select collapse-tags multiple v-model="select.company_tag" placeholder="请选择企业资质" clearable style="width: 200px;">
<el-option v-for="(item,index) in companiesTags" :key="index" :label="item" :value="item"> <el-option v-for="(item,index) in companiesTags" :key="index" :label="item" :value="item">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
<el-select v-model="select.is_yh_invested" placeholder="请选择集团标签" clearable style="width: 100%;"> <el-select v-model="select.is_yh_invested" placeholder="请选择集团标签" clearable style="width: 200px;">
<el-option label="被投企业" :value="1"> <el-option label="被投企业" :value="1">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
<el-select v-model="select.course_type_id" placeholder="请选择课程体系" clearable style="width: 100%;"> <el-select v-model="select.course_type_id" placeholder="请选择课程体系" clearable style="width: 200px;">
<el-option v-for="item in courseTypeOptions" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in courseTypeOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
@ -49,7 +61,7 @@
filterable filterable
allow-create allow-create
clearable clearable
style="width: 100%;"> style="width: 200px;">
<el-option <el-option
v-for="item in courseOptions" v-for="item in courseOptions"
:key="item.id" :key="item.id"
@ -58,18 +70,7 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div>
<el-input v-model="select.user_name" placeholder="请输入学员名称"></el-input>
</div>
<div>
<el-select v-model="select.is_schoolmate" placeholder="请选择是否校友" clearable style="width: 100%;">
<el-option label="是" :value="1">
</el-option>
<el-option label="否" :value="0">
</el-option>
</el-select>
</div>
<div> <div>
<el-date-picker <el-date-picker
v-model="select.start_year" v-model="select.start_year"
@ -78,7 +79,7 @@
format="yyyy" format="yyyy"
value-format="yyyy" value-format="yyyy"
clearable clearable
style="width: 100%;"> style="width: 200px;">
</el-date-picker> </el-date-picker>
</div> </div>
<div> <div>
@ -89,7 +90,7 @@
format="yyyy" format="yyyy"
value-format="yyyy" value-format="yyyy"
clearable clearable
style="width: 100%;"> style="width: 200px;">
</el-date-picker> </el-date-picker>
</div> </div>
<div> <div>
@ -667,11 +668,12 @@
.searchwrap { .searchwrap {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap;
gap: 10px;
&>div { &>div {
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: 10px;
span { span {
min-width: 70px; min-width: 70px;

Loading…
Cancel
Save