提交 768510a2 authored 作者: 王鹏飞's avatar 王鹏飞

fix: 修复报名申请入学日期未提交的问题

上级 188c7e30
...@@ -90,9 +90,9 @@ export default { ...@@ -90,9 +90,9 @@ export default {
const { material, progress } = data const { material, progress } = data
this.material = material this.material = material
this.progress = progress this.progress = progress
const welcomeShowed = window.localStorage.getItem(this.user.id) === 'true' // const welcomeShowed = window.localStorage.getItem(this.user.id) === 'true'
material.attachments = material.attachments || [] // material.attachments = material.attachments || []
if (!material.basic_info?.admission_date && !welcomeShowed) { if (!material.basic_info?.admission_date) {
this.welcomeShow = true this.welcomeShow = true
} }
} else { } else {
......
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
<template v-for="item in options"> <template v-for="item in options">
<el-step <el-step
:title="item.title" :title="item.title"
:status="progress.FILLING[item.code] && progress.FILLING[item.code].progress === 1 ? 'success' : 'error'" :status="
(progress.FILLING[item.code] && progress.FILLING[item.code].progress === 1) || !item.required
? 'success'
: 'error'
"
:key="item.code" :key="item.code"
></el-step> ></el-step>
</template> </template>
...@@ -16,14 +20,14 @@ ...@@ -16,14 +20,14 @@
<template v-for="item in options"> <template v-for="item in options">
<div <div
class="preview-item" class="preview-item"
:class="progress.FILLING[item.code].progress === 1 ? 'is-success' : 'is-error'" :class="progress.FILLING[item.code].progress === 1 || !item.required ? 'is-success' : 'is-error'"
:key="item.code" :key="item.code"
v-if="progress.FILLING[item.code]" v-if="progress.FILLING[item.code]"
> >
<div class="preview-item-hd"> <div class="preview-item-hd">
<div class="title"> <div class="title">
{{ item.title }} {{ item.title }}
<template v-if="progress.FILLING[item.code].progress === 1">(已完善)</template> <template v-if="progress.FILLING[item.code].progress === 1 || !item.required">(已完善)</template>
<template v-else>(待完善)</template> <template v-else>(待完善)</template>
</div> </div>
<div class="line"></div> <div class="line"></div>
...@@ -198,6 +202,7 @@ export default { ...@@ -198,6 +202,7 @@ export default {
options() { options() {
const options = [ const options = [
{ {
required: true,
title: '个人资料', title: '个人资料',
code: 'basic_info', code: 'basic_info',
edit: { edit: {
...@@ -223,10 +228,12 @@ export default { ...@@ -223,10 +228,12 @@ export default {
{ label: '微信号', code: 'we_chat_account' }, { label: '微信号', code: 'we_chat_account' },
{ label: '邮寄地址', code: 'mailing_address' }, { label: '邮寄地址', code: 'mailing_address' },
{ label: '紧急联系人', code: 'emergency_contact_name' }, { label: '紧急联系人', code: 'emergency_contact_name' },
{ label: '紧急联系人电话', code: 'emergency_contacts_phone' } { label: '紧急联系人电话', code: 'emergency_contacts_phone' },
{ label: '入学日期', code: 'admission_date' }
] ]
}, },
{ {
required: true,
title: '教育背景', title: '教育背景',
code: 'educations', code: 'educations',
edit: { edit: {
...@@ -276,6 +283,7 @@ export default { ...@@ -276,6 +283,7 @@ export default {
] ]
}, },
{ {
required: true,
title: '学习目的', title: '学习目的',
code: 'answers', code: 'answers',
edit: { edit: {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论