@@ -324,79 +313,111 @@ export default {
BeginDate: [
{
required: true,
- message: 'Please select a start date',
+ message: this.$t('common:ruleMessage:select'),
trigger: 'blur',
},
],
EndDate: [
{
required: true,
- message: 'Please select a valid date',
+ message: this.$t('common:ruleMessage:select'),
trigger: 'blur',
},
],
Degree: [
{
required: true,
- message: 'Please enter the degree',
+ message: this.$t('common:ruleMessage:specify'),
trigger: 'blur',
},
],
Major: [
{
required: true,
- message: 'Please enter the major',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: 'blur',
+ },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
trigger: 'blur',
},
- { max: 100, message: 'The maximum length is 100' },
],
MajorCN: [
{
required: true,
- message: 'Please enter the major',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: 'blur',
+ },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
trigger: 'blur',
},
- { max: 100, message: 'The maximum length is 100' },
],
Organization: [
{
required: true,
- message: 'Please enter the institution',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: 'blur',
+ },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
trigger: 'blur',
},
- { max: 100, message: 'The maximum length is 100' },
],
OrganizationCN: [
{
required: true,
- message: 'Please enter the institution',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: 'blur',
+ },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
trigger: 'blur',
},
- { max: 100, message: 'The maximum length is 100' },
],
City: [
- { required: true, message: 'Please enter the city', trigger: 'blur' },
- { max: 50, message: 'The maximum length is 50' },
+ { required: true, message:this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
CityCN: [
- { required: true, message: 'Please enter the city', trigger: 'blur' },
- { max: 50, message: 'The maximum length is 50' },
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
Country: [
{
required: true,
- message: 'Please enter the country',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: 'blur',
+ },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
trigger: 'blur',
},
- { max: 50, message: 'The maximum length is 50' },
],
CountryCN: [
{
required: true,
- message: 'Please enter the country',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: 'blur',
+ },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
trigger: 'blur',
},
- { max: 50, message: 'The maximum length is 50' },
],
},
loading: false,
@@ -485,10 +506,11 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
}
.el-select,
.el-date-editor {
- width: 97%;
+ width: 100%;
}
\ No newline at end of file
diff --git a/src/views/reviewers/curriculumVitae/components/info/holiday.vue b/src/views/reviewers/curriculumVitae/components/info/holiday.vue
index d6e23e5e..fd314531 100644
--- a/src/views/reviewers/curriculumVitae/components/info/holiday.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/holiday.vue
@@ -107,7 +107,6 @@ export default {
},
methods: {
closeDialog() {
- console.log(111111111)
this.$emit('update:visible', false)
},
handleAddHoliday() {
diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue
index 0c0d9aff..dd7df04f 100644
--- a/src/views/reviewers/curriculumVitae/components/info/info.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/info.vue
@@ -64,7 +64,7 @@
v-loading="loading"
:model="form"
:rules="rules"
- label-width="80px"
+ label-width="100px"
size="small"
>
@@ -76,7 +76,11 @@
:label="$t('curriculumVitae:info:form:surname')"
prop="FirstName"
>
-
+
@@ -84,17 +88,25 @@
:label="$t('curriculumVitae:info:form:name')"
prop="LastName"
>
-
+
-
+
-
+
@@ -134,7 +146,11 @@
:label="$t('curriculumVitae:info:form:phone')"
prop="Phone"
>
-
+
@@ -152,7 +168,11 @@
:label="$t('curriculumVitae:info:form:wechat')"
prop="WeChat"
>
-
+
@@ -200,6 +220,7 @@
@@ -237,6 +259,7 @@
$t('curriculumVitae:info:form:placeholder:DepartmentOther')
"
size="small"
+ :maxlength="400"
/>
-
+
@@ -398,33 +431,49 @@ export default {
showClose: true,
width: '800px',
title: this.$t('curriculumVitae:info:form:title'),
- appendToBody: false,
+ appendToBody: true,
+ top: '8vh',
+ bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
},
form: defaultForm(),
rules: {
FirstName: [
{
required: true,
- message: 'Please enter FirstName',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: 'blur',
+ },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
trigger: 'blur',
},
- { max: 50, message: 'The maximum length is 50' },
],
LastName: [
- { required: true, message: 'Please enter LastName', trigger: 'blur' },
- { max: 50, message: 'The maximum length is 50' },
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
+ ],
+ ChineseName: [
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
- ChineseName: [{ max: 50, message: 'The maximum length is 50' }],
Sex: [
- { required: true, message: 'Please select gender', trigger: 'blur' },
+ { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
],
TitleIds: [
- { required: true, message: 'Please select Title', trigger: 'blur' },
+ { required: true, message:this.$t('common:ruleMessage:select'), trigger: 'blur' },
],
Phone: [
{
required: true,
- message: 'Please enter phone number',
+ message: this.$t('common:ruleMessage:specify'),
trigger: 'blur',
},
{ max: 20, min: 7, message: 'The length is 7 to 20' },
@@ -432,51 +481,101 @@ export default {
EMail: [
{
required: true,
- message: 'Please input the email address',
+ message: this.$t('common:ruleMessage:specify'),
trigger: 'blur',
},
{
type: 'email',
- message: 'Please input the correct email address',
+ message: this.$t('rules:email'),
trigger: 'blur,change',
},
- { max: 50, message: 'The maximum length is 50' },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
+ ],
+ WeChat: [
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
- WeChat: [{ max: 50, message: 'The maximum length is 50' }],
Nation: [
{
required: true,
- message: 'Please select the Nation',
+ message: this.$t('common:ruleMessage:select'),
trigger: 'blur',
},
],
DepartmentId: [
{
required: true,
- message: 'Please select department',
+ message: this.$t('common:ruleMessage:select'),
trigger: 'blur',
},
],
DepartmentOther: [
- { required: true, message: 'Please specify', trigger: 'blur' },
- { max: 50, message: 'The maximum length is 50' },
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
+ ,
+ ],
+ DepartmentOtherCN: [
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
- DepartmentOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
RankId: [
- { required: true, message: 'Please select rank', trigger: 'blur' },
+ { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
],
RankOther: [
- { required: true, message: 'Please select rank', trigger: 'blur' },
- { max: 50, message: 'The maximum length is 50' },
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
RankOtherCN: [
- { required: true, message: 'Please select rank', trigger: 'blur' },
- { max: 50, message: 'The maximum length is 50' },
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
HospitalId: [
{
required: true,
- message: 'Please select hospital',
+ message: this.$t('common:ruleMessage:select'),
+ trigger: 'blur',
+ },
+ ],
+ UniversityAffiliated: [
+ {
+ max: 4000,
+ message: this.$t('form:rules:maxLength:4000'),
+ trigger: 'blur',
+ },
+ ],
+ WorkPartTime: [
+ {
+ max: 4000,
+ message: this.$t('form:rules:maxLength:4000'),
+ trigger: 'blur',
+ },
+ ],
+ WorkPartTimeEn: [
+ {
+ max: 4000,
+ message: this.$t('form:rules:maxLength:4000'),
trigger: 'blur',
},
],
diff --git a/src/views/reviewers/curriculumVitae/components/info/other.vue b/src/views/reviewers/curriculumVitae/components/info/other.vue
index f884e43f..823047dc 100644
--- a/src/views/reviewers/curriculumVitae/components/info/other.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/other.vue
@@ -12,8 +12,10 @@
- {{ DATA.AwardsHonors }}
- {{ DATA.AwardsHonorsCN }}
+
{{ $t('curriculumVitae:noData') }}
@@ -23,29 +25,36 @@
v-loading="loading"
:model="form"
:rules="rules"
- label-width="80px"
+ label-width="100px"
size="small"
>
-
+
@@ -102,12 +111,27 @@ export default {
model_cfg: {
visible: false,
showClose: true,
- width: '600px',
+ width: '800px',
title: this.$t('curriculumVitae:scientificResearchProject:form:title'),
appendToBody: true,
},
form: defaultForm(),
- rules: {},
+ rules: {
+ AwardsHonors: [
+ {
+ max: 4000,
+ message: this.$t('form:rules:maxLength:4000'),
+ trigger: 'blur',
+ },
+ ],
+ AwardsHonorsCN: [
+ {
+ max: 4000,
+ message: this.$t('form:rules:maxLength:4000'),
+ trigger: 'blur',
+ },
+ ],
+ },
loading: false,
}
},
@@ -155,6 +179,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
.message {
margin: auto;
@@ -163,6 +188,7 @@ export default {
padding: 10px;
line-height: 30px;
border-radius: 5px;
+ word-wrap: break-word;
}
}
.el-select,
diff --git a/src/views/reviewers/curriculumVitae/components/info/pay.vue b/src/views/reviewers/curriculumVitae/components/info/pay.vue
index dfd7d5f7..5c2148db 100644
--- a/src/views/reviewers/curriculumVitae/components/info/pay.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/pay.vue
@@ -66,6 +66,7 @@
clearable
placeholder=""
v-model="form.BankNum"
+ :maxlength="400"
>
-
+
@@ -181,6 +190,25 @@ export default {
},
trigger: 'blur',
},
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
+ ],
+ BankName: [
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
+ ],
+ OpeningBank: [
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
IdCard: [
{
@@ -194,6 +222,11 @@ export default {
},
trigger: 'blur',
},
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
BankPhoneNum: [
{
@@ -207,6 +240,11 @@ export default {
},
trigger: 'blur',
},
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
],
},
loading: false,
@@ -256,6 +294,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
.message {
margin: auto;
diff --git a/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue b/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
index d585f58c..e51459d3 100644
--- a/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
@@ -16,22 +16,44 @@
v-if="DATA.Research || DATA.ResearchCN || DATA.Grants || DATA.GrantsCN"
>
-
{{ DATA.Research }}
{{ DATA.ResearchCN }}
-
- -->
+
+ {{
+ $t('curriculumVitae:scientificResearchProject:direction')
+ }}
+
+
+
+
+ {{
+ $t('curriculumVitae:scientificResearchProject:subject')
+ }}
+
+