Compare commits

..

No commits in common. "d065b8b2c13fc0fea00528769fff8c6935b936a5" and "c4f8e08b91faa7a5c49082a97a5d07ade96ef027" have entirely different histories.

6 changed files with 74 additions and 7 deletions

View File

@ -437,7 +437,7 @@ export default {
},
handlePreview3(row) {
return this.$preview({
path: row.Path || row.FilePath,
path: row.FilePath,
type: 'pdf',
title: row.FileName,
})
@ -447,7 +447,7 @@ export default {
},
handlePreview2(row, r2) {
return this.$preview({
path: row.Path || row.fullPath,
path: row.fullPath,
type: 'pdf',
title: row.FileName,
})
@ -537,7 +537,7 @@ export default {
handlePreview(row) {
console.log(row)
return this.$preview({
path: row.Path || row.FullPath,
path: row.FullPath,
type: 'pdf',
title: row.FileName,
})

View File

@ -155,6 +155,17 @@ export default {
},
],
IdCard: [
{
validator: (rule, value, callback) => {
let reg = new RegExp(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/, 'ig')
if (value && !reg.test(value)) {
callback(new Error(this.$t('common:ruleMessage:pattern')))
} else {
callback()
}
},
trigger: 'blur',
},
{
max: 400,
message: this.$t('form:rules:maxLength:400'),
@ -162,6 +173,17 @@ export default {
},
],
BankPhoneNum: [
{
validator: (rule, value, callback) => {
let reg = new RegExp(/^\d{11}$/, 'i')
if (value && !reg.test(value)) {
callback(new Error(this.$t('common:ruleMessage:pattern')))
} else {
callback()
}
},
trigger: 'blur',
},
{
max: 400,
message: this.$t('form:rules:maxLength:400'),

View File

@ -333,7 +333,7 @@ export default {
},
preview(row) {
this.$preview({
path: row.Path || row.FullPath,
path: row.FullPath,
type: 'pdf',
title: row.FileName,
})

View File

@ -292,7 +292,7 @@ export default {
},
preview(row) {
this.$preview({
path: row.Path || row.FullPath,
path: row.FullPath,
type: 'pdf',
title: row.FileName,
})

View File

@ -211,6 +211,17 @@ export default {
},
],
IdCard: [
{
validator: (rule, value, callback) => {
let reg = new RegExp(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/, 'ig')
if (value && !reg.test(value)) {
callback(new Error(this.$t('common:ruleMessage:pattern')))
} else {
callback()
}
},
trigger: 'blur',
},
{
max: 400,
message: this.$t('form:rules:maxLength:400'),
@ -218,6 +229,17 @@ export default {
},
],
BankPhoneNum: [
{
validator: (rule, value, callback) => {
let reg = new RegExp(/^\d{11}$/, 'i')
if (value && !reg.test(value)) {
callback(new Error(this.$t('common:ruleMessage:pattern')))
} else {
callback()
}
},
trigger: 'blur',
},
{
max: 400,
message: this.$t('form:rules:maxLength:400'),

View File

@ -582,9 +582,32 @@
</div>
</div>
<div class="file" v-if="isAll && hasFile">
<div class="curriculum" v-if="resumeListEN && resumeListEN.length > 0">
<div
class="curriculum"
v-if="
(resumeListCN && resumeListCN.length > 0) ||
(resumeListEN && resumeListEN.length > 0)
"
>
<div class="title">{{ $t('curriculumVitae:curriculum:title') }}</div>
<div class="fileBox">
<div
class="file_title"
v-if="resumeListCN && resumeListCN.length > 0"
>
{{ $t('curriculumVitae:curriculum:fileTitle:CN') }}
</div>
<template v-if="true">
<div class="file" v-for="item in resumeListCN" :key="item.Id">
<div class="name" :title="item.FileName">{{ item.FileName }}</div>
<i
class="el-icon-download"
:title="$t('common:button:download')"
@click.stop="handlePreview(item)"
/>
</div>
</template>
<div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
<div
class="file_title"
v-if="resumeListEN && resumeListEN.length > 0"
@ -992,7 +1015,7 @@ export default {
}
},
preview(row) {
let path = row.Path || row.FullPath || row.FilePath
let path = row.FullPath || row.FilePath
this.$preview({
path: path,
type: 'pdf',