提交 24a1e4cc authored 作者: 王鹏飞's avatar 王鹏飞

chore: 修改报名信息

上级 02c3618d
-----BEGIN PRIVATE KEY----- -----BEGIN PRIVATE KEY-----
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
pUnu8ZpORsuzDIHbVuAARzZxog== afpRt+TNfsY97fqDkK8P9+IE
-----END PRIVATE KEY----- -----END PRIVATE KEY-----
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIEADCCAmigAwIBAgIQChnXtH6E2q8CQAyzUXqfGTANBgkqhkiG9w0BAQsFADBP MIIELjCCApagAwIBAgIQW3tTTXpxSM2pHD/3OK903TANBgkqhkiG9w0BAQsFADB9
MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExEjAQBgNVBAsMCW1heEBi MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExKTAnBgNVBAsMIG1heEBN
b2dvbjEZMBcGA1UEAwwQbWtjZXJ0IG1heEBib2dvbjAeFw0yNDEyMTEwMzExMTBa YXhkZU1hY0Jvb2stUHJvLmxvY2FsIChNYXgpMTAwLgYDVQQDDCdta2NlcnQgbWF4
Fw0yNzAzMTEwMzExMTBaMEMxJzAlBgNVBAoTHm1rY2VydCBkZXZlbG9wbWVudCBj QE1heGRlTWFjQm9vay1Qcm8ubG9jYWwgKE1heCkwHhcNMjYwODIwMDk0MzI2WhcN
ZXJ0aWZpY2F0ZTEYMBYGA1UECwwPbWF4QGJvZ29uIChNYXgpMIIBIjANBgkqhkiG MjgxMTIwMDk0MzI2WjBDMScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2Vy
9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Q08ju0RQTZONshGQ9+kuzH22z6VCdyLKFGJ dGlmaWNhdGUxGDAWBgNVBAsMD21heEBib2dvbiAoTWF4KTCCASIwDQYJKoZIhvcN
TYt/ruEBrFO+uKx7CCD1NB1YqWu6KM3lruorjdOqMkpAFslyVQfkzqbiYDfhLCJd AQEBBQADggEPADCCAQoCggEBALko9ryseHYAe1/FRuHhTufODIZS+BrcgKGz957C
0tcflGTqWRFP4rafNceAXRjpZJ9xJryd8WSN7PIklwOJj3uaE7fDuLoQNp4JXfuX iwZcfxycmBwziDrawDfCiNgHzvl8hZgJ0kz54J4+8VnhNmiVIIeNINMBzu0BtZtF
Mfmv85hUAFbWWHTgA+Q8vvjQSE+zhr5YjnINypskqBo+ZpLo/qKRd/XG4weOTzkj IdKh2EB7jCBM0xsgbDi79wlqMqfqV+MpRBid3fvuGePJ8dqqSFtqjtN6Be3n5+pW
Zy91chctrUL0Yd9b1+FgeQI3lt5OVy/OGlKU/H8vQ9zvWLI3f0DChykOcUNGBQ24 MdYaItETVchHwLqiXVd8gVU4GiMgAeHNnaHAyIWlYoB6GqpKShq/WvIYuA7IjQ4/
EHAccCxHBMoAPEMFd0dAcg1e/uV5ooB+vx0YRJmHY58Rd2A0cwIDAQABo2QwYjAO ZcitPEf2GwqHgQZiHGnmkRcdcw0hyLsCKfeVaztp0fT9FHu0ODnDDw1AulF0IQus
BgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHwYDVR0jBBgwFoAU D2XsWpAvI9eZN5GS46Ufj34vQg/hAC7XnJQx0gozNlNiiVUCAwEAAaNkMGIwDgYD
Snxuhaez2tptVFUj9BqqivFtRyIwGgYDVR0RBBMwEYIPZGV2LmV6aWppbmcuY29t VR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB8GA1UdIwQYMBaAFEeI
MA0GCSqGSIb3DQEBCwUAA4IBgQAuQQq+9Xqsh54drhhzpp1G6TpRrF98FShAAXxK W5otjjWjarInJZrNkITzQl/NMBoGA1UdEQQTMBGCD2Rldi5lemlqaW5nLmNvbTAN
ZuVM/GNKh+jIoGJMjhMoOaklaHfSzfJKuVs1YCEypAw1dvHJemEBxCEWJ1sLWF02 BgkqhkiG9w0BAQsFAAOCAYEAHUhA3cki629ruXie/BrrVYYvkkGFBv17GWwP4NUj
uwo3YBGOYCmC8Hs/mgjrgYj8fncTfJ1Lz5lr1Be2xxxobTqwR9LgYi2pbNwxxzCW RWS2jlME4oSQCRgqsIP4R1R950fQjWxsoyVCDrPW5zx8us697ijjmNaBwgGo16N5
pUgw3dNeNqhdVz9Qnyjy4DfOX3dBnwW4Z061eurfjzmsrscx87fdu9BGNxZPx01r hCuzFNk2V1j3JT11RgyK31L0gCRNozaLJO1uvdWCMQKUD0e0I2uGVqc2dxZGyTqJ
7Q+M958udfXtnYw3PvbGVU5AF5R9N2M97PP1SH/iIPQxZzcnfXvCpx7gN+0aRbbL 9pZ4n+i4rv7FKXUWMd1TiIBsf1NP+OHacoWGpc4oEkcJABRLJyu7sIrE1eLrGm+O
7+dmKwxjOsfrHofdLlv6gHFr4ohHTkPQFNRaGOpWdj6YbxUnmXuBWAA2/I2F+bjA weR0S7anQoQX96i7O6Jrh+xuE2ZvxK8VBVptKTne4cugfUjc93ycPhEusjlJjWf1
PMR/tkmaNKHLasqzpM2SG/gP7UYS3c9nkPGUv36nlVTFoEXcbB1QyNQ+ohtFvUR0 uzMQcikZlPtTQZ+rtJENrAmKhg+Q5KYjKfXhvsdB+/97brDzEFcu6kwsCaqgAjkk
g/7Vb7qmkbfjnl9gShC1Ctm67juflSEtp99q70mcaY8tZWB1Z2Mav74XlqlYZZIN YKpS1dFzTA79ev5GhqwO5PuO+pWH72VNbUks8HdBs/y7zSDdB1I2cUVVLrw2MgHz
dPsH7+DvVncipPR4Y+2C0G/Ef4E= rgdr0ckGDiCBJy3Ns5zJQsmYqrTsy+4XLBA4ZCxHCyj9UxtRa1gqMo3OJKJY3RRh
W4/F5Mb5Oyl96euIcCgRl7t2
-----END CERTIFICATE----- -----END CERTIFICATE-----
...@@ -47,52 +47,34 @@ export default { ...@@ -47,52 +47,34 @@ export default {
], ],
[ [
{ {
title: '英文简历', title: '个人简历',
code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.RESUME_EN', code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.RESUME_EN',
view: { to: { path: '/my/interview', query: { active: 'interview_ywjl' } } } view: { to: { path: '/my/interview', query: { active: 'interview_ywjl' } } }
}, },
{
title: '成绩单',
code: [
'INTERVIEW_APPLICATION.attachments.missed_required_list.REPORT_CARD_CN',
'INTERVIEW_APPLICATION.attachments.missed_required_list.REPORT_CARD_EN',
'INTERVIEW_APPLICATION.basic_info.missed_required_list.gpa_score',
'INTERVIEW_APPLICATION.basic_info.missed_required_list.average_score'
],
view: { to: { path: '/my/interview', query: { active: 'interview_cjd' } } }
},
{ {
title: '语言能力证明', title: '身份证扫描件',
code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.INTERNATIONAL_LANGUAGE_SCORE', code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.ID_CARD_PHOTO',
view: { to: { path: '/my/interview', query: { active: 'interview_yynl' } } } view: { to: { path: '/my/interview', query: { active: 'interview_sfz' } } }
}, },
{ {
title: '推荐信', title: '专科成绩单',
code: [ code: [
'INTERVIEW_APPLICATION.attachments.missed_required_list.RECOMMENDATION_LETTER', 'INTERVIEW_APPLICATION.attachments.missed_required_list.REPORT_CARD_CN'
'INTERVIEW_APPLICATION.attachments.missed_required_list.RECOMMENDATION_LETTER_2'
], ],
view: { to: { path: '/my/interview', query: { active: 'interview_tjx' } } } view: { to: { path: '/my/interview', query: { active: 'interview_cjd' } } }
},
{
title: '个人陈述',
code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.PERSONAL_STATEMENT',
view: { to: { path: '/my/interview', query: { active: 'interview_grcs' } } }
}, },
{ {
title: '毕业证或在读证明', title: '毕业证明',
code: [ code: [
'INTERVIEW_APPLICATION.attachments.missed_required_list.DIPLOMA_CN', 'INTERVIEW_APPLICATION.attachments.missed_required_list.DIPLOMA_CN',
'INTERVIEW_APPLICATION.attachments.missed_required_list.DEGREE_CERT_CN',
'INTERVIEW_APPLICATION.attachments.missed_required_list.PROOF_READING' 'INTERVIEW_APPLICATION.attachments.missed_required_list.PROOF_READING'
], ],
view: { to: { path: '/my/interview', query: { active: 'interview_byzs' } } } view: { to: { path: '/my/interview', query: { active: 'interview_byzs' } } }
}, },
{ {
title: '申请表格', title: '个人陈述',
code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.APPLICATION_FORM', code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.PERSONAL_STATEMENT',
view: { to: { path: '/my/interview', query: { active: 'interview_form' } } } view: { to: { path: '/my/interview', query: { active: 'interview_grcs' } } }
} }
], ],
[ [
......
...@@ -63,21 +63,19 @@ export default { ...@@ -63,21 +63,19 @@ export default {
async getApplication() { async getApplication() {
await api.getApplication().then(response => { await api.getApplication().then(response => {
const { payment_records: paymentRecords = [] } = response.data.material const { payment_records: paymentRecords = [] } = response.data.material
const applicationFeeRecords = paymentRecords.filter(item => item.bill_type === 'APPLICATION_FEE')
// 获取支付订单 // 获取支付订单
this.paymentRecords = paymentRecords this.paymentRecords = applicationFeeRecords
if (paymentRecords && paymentRecords.length) { if (applicationFeeRecords.length) {
// 获取支付成功的订单 // 获取支付成功的订单
const orderPaySuccess = paymentRecords.find(item => { const orderPaySuccess = applicationFeeRecords.find(item => item.payment_status === 'SUCCESS')
return item.bill_type === 'APPLICATION_FEE' && item.payment_status === 'SUCCESS'
})
if (orderPaySuccess) { if (orderPaySuccess) {
this.order = orderPaySuccess this.order = orderPaySuccess
this.dialogVisible = true this.dialogVisible = true
return return
} }
// 获取最后一个订单 // 获取最后一个订单
const [lastPayment] = paymentRecords.reverse() this.order = applicationFeeRecords[applicationFeeRecords.length - 1]
this.order = lastPayment
} }
}) })
}, },
...@@ -87,7 +85,7 @@ export default { ...@@ -87,7 +85,7 @@ export default {
return return
} }
const userId = this.user.id const userId = this.user.id
api.checkPay(order.id, { user_id: userId }).then(response => { api.checkPay(order.id, { user_id: userId }, 'APPLICATION_FEE').then(response => {
if (response.data.payment_status === 'SUCCESS') { if (response.data.payment_status === 'SUCCESS') {
this.timer && clearInterval(this.timer) this.timer && clearInterval(this.timer)
this.dialogVisible = true this.dialogVisible = true
......
...@@ -2,54 +2,32 @@ export default function (_this) { ...@@ -2,54 +2,32 @@ export default function (_this) {
return { return {
required: true, required: true,
id: 'interview_byzs', id: 'interview_byzs',
title: '毕业证书或在读证明', title: '毕业证明',
get: { get: {
callback(data) { callback(data) {
const { basic_info: basicInfo = {}, attachments = [] } = _this.detail.material const { attachments = [] } = _this.detail.material
const attachment = attachments.reduce( const attachment = attachments.reduce(
(result, item) => { (result, item) => {
if (item.file_type_id === 'DIPLOMA_CN') { if (item.file_type_id === 'DIPLOMA_CN') {
result.DIPLOMA_CN.push(item) result.DIPLOMA_CN.push(item)
} }
if (item.file_type_id === 'DEGREE_CERT_CN') {
result.DEGREE_CERT_CN.push(item)
}
if (item.file_type_id === 'PROOF_READING') { if (item.file_type_id === 'PROOF_READING') {
result.PROOF_READING.push(item) result.PROOF_READING.push(item)
} }
return result return result
}, },
{ DIPLOMA_CN: [], DEGREE_CERT_CN: [], PROOF_READING: [] } { DIPLOMA_CN: [], PROOF_READING: [] }
) )
return Object.assign({ learn_status: basicInfo.learn_status }, attachment) return attachment
}
},
update: {
beforeRequest(data) {
const basicInfo = ['learn_status'].reduce((result, key) => {
result[key] = data[key]
return result
}, {})
return { basic_info: basicInfo }
} }
}, },
form: { form: {
options: { 'label-position': 'top' }, options: { 'label-position': 'top' },
hasSubmit: false,
prepend: '<p>已毕业请上传专科毕业证;在读学生请上传在学或预计毕业证明,以上材料二选一。</p>',
items: [ items: [
{ {
type: 'v-select', label: '专科毕业证',
values: [{ value: '已毕业' }, { value: '未毕业' }],
label: '您当前的学习状态',
model: 'learn_status',
rules: [{ required: true, message: '请选择', trigger: 'change' }],
append: `
提示:<br />
1、请同时上传毕业证书及学位证书(中英文)<br />
2、如尚未毕业,请上传在读证明(中英文)`
},
{
required: true,
label: '毕业证书',
type: 'v-upload', type: 'v-upload',
model: 'DIPLOMA_CN', model: 'DIPLOMA_CN',
attrs: { attrs: {
...@@ -57,32 +35,10 @@ export default function (_this) { ...@@ -57,32 +35,10 @@ export default function (_this) {
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`, deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'DIPLOMA_CN' } data: { file_type: 'DIPLOMA_CN' }
}, },
rules: { required: true, message: '请上传毕业证书' }, append: '已毕业学生请上传专科毕业证原件扫描件或照片。'
append:
'申请者需要将本科或以上毕业证书原件扫描或者拍照后提交。<br> 可上传多个文件,请确保证书号码清晰可辨。<br> 上传文件仅限“jpg,jpeg,png”格式,文件小于10MB。',
isShow(ruleForm) {
return ruleForm.learn_status === '已毕业'
}
},
{
required: true,
label: '学位证书',
type: 'v-upload',
model: 'DEGREE_CERT_CN',
attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'DEGREE_CERT_CN' }
},
rules: { required: true, message: '请上传学位证书' },
append: '已毕业学员请提交学位证书<br />申请者需要将本科或以上的学位证书原件扫描或拍照后提交<br />可上传多个文件,请确保公章清晰可辨。',
isShow(ruleForm) {
return ruleForm.learn_status === '已毕业'
}
}, },
{ {
required: true, label: '在学/预计毕业证明',
label: '在读证明',
type: 'v-upload', type: 'v-upload',
model: 'PROOF_READING', model: 'PROOF_READING',
attrs: { attrs: {
...@@ -90,11 +46,7 @@ export default function (_this) { ...@@ -90,11 +46,7 @@ export default function (_this) {
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`, deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'PROOF_READING' } data: { file_type: 'PROOF_READING' }
}, },
rules: { required: true, message: '请上传在读证明' }, append: '在读学生请上传截至预计毕业时间的在学或预计毕业证明。'
append: '未毕业学员提交加盖公章的在读证明<br/>申请者需要将本科或以上在读证明原件扫描或拍照后提交。<br> 可上传多个文件,请确保公章清晰可辨。',
isShow(ruleForm) {
return ruleForm.learn_status === '未毕业'
}
} }
] ]
} }
......
...@@ -2,76 +2,29 @@ export default function (_this) { ...@@ -2,76 +2,29 @@ export default function (_this) {
return { return {
required: true, required: true,
id: 'interview_cjd', id: 'interview_cjd',
title: '成绩单', title: '专科成绩单',
get: { get: {
callback(data) { callback(data) {
const { basic_info: basicInfo = {}, attachments = [] } = _this.detail.material const { attachments = [] } = _this.detail.material
const attachment = attachments.reduce( return { REPORT_CARD_CN: attachments.filter(item => item.file_type_id === 'REPORT_CARD_CN') }
(result, item) => {
if (item.file_type_id === 'REPORT_CARD_CN') {
result.REPORT_CARD_CN.push(item)
}
if (item.file_type_id === 'REPORT_CARD_EN') {
result.REPORT_CARD_EN.push(item)
}
return result
},
{ REPORT_CARD_CN: [], REPORT_CARD_EN: [] }
)
return Object.assign({}, basicInfo, attachment)
}
},
update: {
beforeRequest(data) {
const basicInfo = ['gpa_score', 'average_score'].reduce((result, key) => {
result[key] = data[key]
return result
}, {})
return { basic_info: basicInfo }
} }
}, },
form: { form: {
options: { 'label-position': 'top' }, options: { 'label-position': 'top' },
items: [ items: [
{
type: 'v-input',
label: 'GPA成绩 (填写示例:3.9 / 5.0)',
model: 'gpa_score',
attrs: { placeholder: '请填写您的GPA成绩' },
rules: [{ required: true, message: '请填写您的GPA成绩', trigger: 'blur' }]
},
{
type: 'v-input',
label: '百分制平均成绩',
model: 'average_score',
attrs: { placeholder: '请填写百分制平均成绩' },
rules: [{ required: true, message: '请填写百分制平均成绩', trigger: 'blur' }]
},
{ {
required: true, required: true,
type: 'v-upload', type: 'v-upload',
label: '中文成绩单', label: '专科成绩单',
model: 'REPORT_CARD_CN', model: 'REPORT_CARD_CN',
attrs: { attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`, action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`, deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'REPORT_CARD_CN' } data: { file_type: 'REPORT_CARD_CN' }
}
},
{
required: true,
type: 'v-upload',
label: '英文成绩单',
model: 'REPORT_CARD_EN',
attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'REPORT_CARD_EN' }
}, },
append: ` append: `
<p>已毕业学生需提交完整成绩单,未毕业学生提交现有成绩单,成绩单需要加盖学校公章</p> <p>已毕业学生提交完整专科成绩单,在读学生提交至上学期末的成绩单。</p>
<p>请将成绩单原件扫描或者拍照后提交。</p> <p>成绩单需要加盖学校公章,请将原件扫描或拍照后提交。</p>`
<p>获取途径:联系大学时就读学校相关部门(档案馆/教务处)获取成绩单。</p>`
} }
] ]
} }
......
...@@ -25,7 +25,7 @@ export default function (_this) { ...@@ -25,7 +25,7 @@ export default function (_this) {
data: { file_type: 'PERSONAL_STATEMENT' }, data: { file_type: 'PERSONAL_STATEMENT' },
limit: 1 limit: 1
}, },
append: '请上传您的个人陈述(英文)' append: '请上传您的个人陈述,支持韩语或英语。'
} }
] ]
} }
......
export default function (_this) {
return {
required: false,
id: 'interview_honor',
title: '荣誉证书',
get: {
callback(data) {
const { attachments = [] } = _this.detail.material
return {
CERTIFICATE_OF_HONOR: attachments.filter(item => item.file_type_id === 'CERTIFICATE_OF_HONOR')
}
}
},
form: {
hasSubmit: false,
prepend: '<p>如有个人荣誉证书或获奖经历,请上传相关扫描件。</p>',
items: [
{
type: 'v-upload',
label: '荣誉证书和获奖经历扫描件(如有)',
model: 'CERTIFICATE_OF_HONOR',
attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'CERTIFICATE_OF_HONOR' },
accept: 'image/*,.pdf'
}
}
]
}
}
}
import ywjl from './ywjl'
import sfz from './sfz'
import cjd from './cjd' import cjd from './cjd'
import yynl from './yynl' import yynl from './yynl'
// import xwzs from './xwzs' import honor from './honor'
import ywjl from './ywjl'
// import zp from './zp'
import ywcjd from './ywcjd'
import tjx from './tjx'
import grcs from './grcs' import grcs from './grcs'
import byzs from './byzs' import byzs from './byzs'
import form from './form'
export default function(_this) { export default function(_this) {
return { return {
...@@ -15,18 +12,17 @@ export default function(_this) { ...@@ -15,18 +12,17 @@ export default function(_this) {
title: '申请面试', title: '申请面试',
children: [ children: [
ywjl(_this), ywjl(_this),
sfz(_this),
cjd(_this), cjd(_this),
yynl(_this), yynl(_this),
tjx(_this), honor(_this),
grcs(_this),
byzs(_this), byzs(_this),
form(_this), grcs(_this),
{ {
required: true, required: true,
id: 'application_pay', id: 'application_pay',
title: '缴申请费' title: '缴申请费'
} }
// ywcjd(_this), tjx(_this), grcs(_this), byzs(_this), form(_this)
] ]
} }
} }
export default function (_this) {
return {
required: true,
id: 'interview_sfz',
title: '身份证扫描件',
get: {
callback(data) {
const { basic_info: basicInfo = {}, attachments = [] } = _this.detail.material
const attachment = attachments.reduce(
(result, item) => {
const types = ['ID_CARD_FRONT', 'ID_CARD_BACK', 'HK_ID_CARD', 'PASSPORT', 'OTHER_ID_CARD_PHOTO']
types.forEach(type => {
if (item.file_type_id === type) {
result[type].push(item)
}
})
return result
},
{ ID_CARD_FRONT: [], ID_CARD_BACK: [], HK_ID_CARD: [], PASSPORT: [], OTHER_ID_CARD_PHOTO: [] }
)
return Object.assign({}, basicInfo, attachment)
}
},
form: {
hasSubmit: false,
prepend: '<p>身份证材料已在报名信息中填写,请确认正反面或其他有效身份证件清晰可辨。</p>',
items: [
{
type: 'v-upload',
label: '身份证人像面',
model: 'ID_CARD_BACK',
attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'ID_CARD_BACK' },
limit: 1,
accept: 'image/*'
},
rules: [{ type: 'array', required: true, message: '请上传身份证人像面', trigger: 'change' }],
isShow(data) {
return data.id_type === '居民身份证'
}
},
{
type: 'v-upload',
label: '身份证国徽面',
model: 'ID_CARD_FRONT',
attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'ID_CARD_FRONT' },
limit: 1,
accept: 'image/*'
},
rules: [{ type: 'array', required: true, message: '请上传身份证国徽面', trigger: 'change' }],
isShow(data) {
return data.id_type === '居民身份证'
}
},
{
type: 'v-upload',
label: '港澳台身份证',
model: 'HK_ID_CARD',
attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'HK_ID_CARD' },
limit: 1,
accept: 'image/*'
},
rules: [{ type: 'array', required: true, message: '请上传港澳台身份证', trigger: 'change' }],
isShow(data) {
return data.id_type === '港澳台身份证'
}
},
{
type: 'v-upload',
label: '中国护照',
model: 'PASSPORT',
attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'PASSPORT' },
limit: 1,
accept: 'image/*'
},
rules: [{ type: 'array', required: true, message: '请上传中国护照', trigger: 'change' }],
isShow(data) {
return data.id_type === '中国护照'
}
},
{
type: 'v-upload',
label: '其他证件',
model: 'OTHER_ID_CARD_PHOTO',
attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'OTHER_ID_CARD_PHOTO' },
limit: 1,
accept: 'image/*'
},
rules: [{ type: 'array', required: true, message: '请上传其他证件', trigger: 'change' }],
isShow(data) {
return data.id_type === '其他'
}
}
]
}
}
}
...@@ -2,11 +2,11 @@ export default function (_this) { ...@@ -2,11 +2,11 @@ export default function (_this) {
return { return {
required: true, required: true,
id: 'interview_ywjl', id: 'interview_ywjl',
title: '英文简历', title: '个人简历',
get: { get: {
callback(data) { callback(data) {
const { attachments = [] } = _this.detail.material const { attachments = [] } = _this.detail.material
const RESUME_EN = attachments.filter((item) => item.file_type_id === 'RESUME_EN') const RESUME_EN = attachments.filter(item => item.file_type_id === 'RESUME_EN')
return { RESUME_EN } return { RESUME_EN }
}, },
}, },
...@@ -22,9 +22,7 @@ export default function (_this) { ...@@ -22,9 +22,7 @@ export default function (_this) {
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`, deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'RESUME_EN' }, data: { file_type: 'RESUME_EN' },
}, },
append: ` append: '<p>请上传个人简历,支持中文、韩语或英语,文件请保存为 PDF 格式且小于 10MB。</p>',
<p>请下载填写英文简历模板后上传 [<a href="https://webapp-pub.ezijing.com/project/syracuse-plus/sit-en-resume.doc" target="_blank" download="英文简历模板">下载模板</a>]</p>
<p>请将英文简历填写完存为"pdf"格式上传,文件小于10MB。</p>`,
}, },
], ],
}, },
......
export default function (_this) { export default function (_this) {
return { return {
required: true, required: false,
id: 'interview_yynl', id: 'interview_yynl',
title: '语言能力证明', title: '韩国语成绩单',
get: { get: {
callback(data) { callback(data) {
const { basic_info: basicInfo = {}, attachments = [] } = _this.detail.material const { attachments = [] } = _this.detail.material
return {
const attachment = attachments.reduce( INTERNATIONAL_LANGUAGE_SCORE: attachments.filter(item => item.file_type_id === 'INTERNATIONAL_LANGUAGE_SCORE')
(result, item) => { }
if (item.file_type_id === 'INTERNATIONAL_LANGUAGE_SCORE') {
result.INTERNATIONAL_LANGUAGE_SCORE.push(item)
}
return result
},
{ INTERNATIONAL_LANGUAGE_SCORE: [] }
)
return Object.assign({}, basicInfo, attachment)
}
},
update: {
beforeRequest(data) {
const basicInfo = ['language_score'].reduce((result, key) => {
result[key] = data[key]
return result
}, {})
return { basic_info: basicInfo }
} }
}, },
form: { form: {
options: { 'label-position': 'top' }, options: { 'label-position': 'top' },
items: [ items: [
{ {
type: 'v-input',
label: '语言成绩(填写示例:大学英语六级/550)',
model: 'language_score',
attrs: { placeholder: '请填写您的语言成绩' },
rules: [{ required: true, message: '请填写您的语言成绩', trigger: 'blur' }]
},
{
required: true,
type: 'v-upload', type: 'v-upload',
label: '语言成绩单', label: '韩国语能力考试成绩单(如有)',
model: 'INTERNATIONAL_LANGUAGE_SCORE', model: 'INTERNATIONAL_LANGUAGE_SCORE',
attrs: { attrs: {
action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`, action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`, deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
data: { file_type: 'INTERNATIONAL_LANGUAGE_SCORE' } data: { file_type: 'INTERNATIONAL_LANGUAGE_SCORE' }
}, },
rules: [{ required: true, message: '请上传', trigger: 'change' }], append: '如有 TOPIK 等韩国语能力考试成绩,请上传成绩单。'
append: '成绩单类型包括:CET-4,CET-6,TOEFL,IELTS等'
} }
] ]
} }
......
...@@ -73,21 +73,19 @@ export default { ...@@ -73,21 +73,19 @@ export default {
async getApplication() { async getApplication() {
await api.getApplication().then(response => { await api.getApplication().then(response => {
const { payment_records: paymentRecords = [] } = response.data.material const { payment_records: paymentRecords = [] } = response.data.material
const applicationFeeRecords = paymentRecords.filter(item => item.bill_type === 'APPLICATION_FEE')
// 获取支付订单 // 获取支付订单
this.paymentRecords = paymentRecords this.paymentRecords = applicationFeeRecords
if (paymentRecords && paymentRecords.length) { if (applicationFeeRecords.length) {
// 获取支付成功的订单 // 获取支付成功的订单
const orderPaySuccess = paymentRecords.find(item => { const orderPaySuccess = applicationFeeRecords.find(item => item.payment_status === 'SUCCESS')
return item.bill_type === 'APPLICATION_FEE' && item.payment_status === 'SUCCESS'
})
if (orderPaySuccess) { if (orderPaySuccess) {
this.order = orderPaySuccess this.order = orderPaySuccess
this.dialogVisible = true this.dialogVisible = true
return return
} }
// 获取最后一个订单 // 获取最后一个订单
const [lastPayment] = paymentRecords.reverse() this.order = applicationFeeRecords[applicationFeeRecords.length - 1]
this.order = lastPayment
} }
}) })
}, },
...@@ -97,7 +95,7 @@ export default { ...@@ -97,7 +95,7 @@ export default {
return return
} }
const userId = this.user.id const userId = this.user.id
api.checkPay(order.id, { user_id: userId }).then(response => { api.checkPay(order.id, { user_id: userId }, 'APPLICATION_FEE').then(response => {
if (response.data.payment_status === 'SUCCESS') { if (response.data.payment_status === 'SUCCESS') {
this.timer && clearInterval(this.timer) this.timer && clearInterval(this.timer)
this.dialogVisible = true this.dialogVisible = true
......
...@@ -5,14 +5,7 @@ export default function (_this) { ...@@ -5,14 +5,7 @@ export default function (_this) {
id: 'admission', id: 'admission',
title: '综合评审', title: '综合评审',
children: [ children: [
{ // 留位费支付暂时隐藏,保留支付逻辑以便后续恢复
required: true,
id: 'application_pay',
title: '缴纳留位费'
// visible() {
// return _this.hasPay
// }
},
xy(_this) xy(_this)
] ]
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<p>材料补充已完成,请等待招生办进一步通知。</p> <p>材料补充已完成,请等待招生办进一步通知。</p>
</div> </div>
<template #footer> <template #footer>
<el-button type="primary" @click="toPay" v-if="hasPay">缴纳留位费</el-button> <!-- <el-button type="primary" @click="toPay" v-if="hasPay">缴纳留位费</el-button> -->
<!-- <el-button type="primary" @click="dialogVisible = false">确定</el-button> --> <!-- <el-button type="primary" @click="dialogVisible = false">确定</el-button> -->
</template> </template>
</el-dialog> </el-dialog>
...@@ -53,7 +53,7 @@ export default { ...@@ -53,7 +53,7 @@ export default {
const menus = getMenu(this) const menus = getMenu(this)
return { return {
menus: [menus], menus: [menus],
currentActive: 'application_pay', currentActive: 'admission_xy',
dialogVisible: false, dialogVisible: false,
detail: null, detail: null,
completeVisible: false, completeVisible: false,
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
immediate: true, immediate: true,
handler(route) { handler(route) {
const { query = {} } = route const { query = {} } = route
this.currentActive = query.active || 'application_pay' this.currentActive = query.active || 'admission_xy'
} }
}, },
showSubmittedDialog(value) { showSubmittedDialog(value) {
......
...@@ -68,21 +68,19 @@ export default { ...@@ -68,21 +68,19 @@ export default {
async getApplication() { async getApplication() {
await api.getApplication().then(response => { await api.getApplication().then(response => {
const { payment_records: paymentRecords = [] } = response.data.material const { payment_records: paymentRecords = [] } = response.data.material
const tuitionRecords = paymentRecords.filter(item => item.bill_type === 'TUITION')
// 获取支付订单 // 获取支付订单
this.paymentRecords = paymentRecords this.paymentRecords = tuitionRecords
if (paymentRecords && paymentRecords.length) { // 获取支付成功的订单
// 获取支付成功的订单 if (tuitionRecords.length) {
const orderPaySuccess = paymentRecords.find(item => { const orderPaySuccess = tuitionRecords.find(item => item.payment_status === 'SUCCESS')
return item.bill_type === 'TUITION' && item.payment_status === 'SUCCESS'
})
if (orderPaySuccess) { if (orderPaySuccess) {
this.order = orderPaySuccess this.order = orderPaySuccess
this.dialogVisible = true this.dialogVisible = true
return return
} }
// 获取最后一个订单 // 获取最后一个订单
const [lastPayment] = paymentRecords.reverse() this.order = tuitionRecords[tuitionRecords.length - 1]
this.order = lastPayment
} }
}) })
}, },
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论