diff --git a/src/components/UploadFiles/index.vue b/src/components/UploadFiles/index.vue
index a1bee881..7be7024f 100644
--- a/src/components/UploadFiles/index.vue
+++ b/src/components/UploadFiles/index.vue
@@ -107,12 +107,13 @@ export default {
(item) => item.FileName === param.file.name
)
if (isRepeat) {
- this.$confirm('Override the existing resume?', {
- type: 'warning',
- distinguishCancelAndClose: true,
- confirmButtonText: 'OK',
- cancelButtonText: 'Cancel',
- })
+ this.$confirm(
+ this.$t('curriculumVitae:resume:message:existingResume'),
+ {
+ type: 'warning',
+ distinguishCancelAndClose: true,
+ }
+ )
.then(() => {
// 重名覆盖
this.repeat = true
@@ -166,7 +167,7 @@ export default {
})
},
handleDeleteFile(file) {
- this.$confirm('Sure to remove?', {
+ this.$confirm(this.$t('system:reviewer:confirm:delete'), {
type: 'warning',
distinguishCancelAndClose: true,
})
diff --git a/src/views/reviewers/ReviewersResearch.vue b/src/views/reviewers/ReviewersResearch.vue
index e03aaf27..2b8048d9 100644
--- a/src/views/reviewers/ReviewersResearch.vue
+++ b/src/views/reviewers/ReviewersResearch.vue
@@ -240,15 +240,25 @@ export default {
store.dispatch('user/setTree', menuTree.Result)
store.dispatch('user/setPermissions', permissions.Result)
// this.$router.push({ path: `/researchForm?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
- this.$router.push({
- path: `/curriculumVitae?Id=${
- res.Result.DoctorId ? res.Result.DoctorId : ''
- }&tabActive=BasicInfo&ReviewStatus=${
- res.Result.ReviewStatus
- }&trialId=${this.$route.query.trialId}&lang=${
- this.$route.query.lang
- }`,
- })
+ if (this.$route.query.trialId) {
+ this.$router.push({
+ path: `/curriculumVitae?Id=${
+ res.Result.DoctorId ? res.Result.DoctorId : ''
+ }&tabActive=BasicInfo&ReviewStatus=${
+ res.Result.ReviewStatus
+ }&trialId=${this.$route.query.trialId}&lang=${
+ this.$route.query.lang
+ }`,
+ })
+ } else {
+ this.$router.push({
+ path: `/curriculumVitae?Id=${
+ res.Result.DoctorId ? res.Result.DoctorId : ''
+ }&tabActive=BasicInfo&ReviewStatus=${
+ res.Result.ReviewStatus
+ }&lang=${this.$route.query.lang}`,
+ })
+ }
})
.catch(() => {
this.btnLoading = false
diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 273fbb13..bdb6d3a9 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -27,11 +27,11 @@
- {{ item.HospitalName }}
+ {{ isEN ? item.HospitalName : item.HospitalNameCN }}
@@ -45,7 +45,7 @@
:label="$t('system:reviewer:label:AffiliatedUniversity')"
>
item.Id === value)
if (item.length) {
- this.UniversityAffiliated = item[0].UniversityAffiliated
- this.City = item[0].City
- this.Province = item[0].Province
- this.Country = item[0].Country
+ this.UniversityAffiliated = this.isEN
+ ? item[0].UniversityAffiliated
+ : item[0].UniversityAffiliatedCN
+ this.City = this.isEN ? item[0].City : item[0].CityCN
+ this.Province = this.isEN ? item[0].Province : item[0].ProvinceCN
+ this.Country = this.isEN ? item[0].Country : item[0].CountryCN
}
},
async initEmployment() {
diff --git a/src/views/reviewers/curriculumVitae/components/file/agreement.vue b/src/views/reviewers/curriculumVitae/components/file/agreement.vue
index 2fb93e86..06d67587 100644
--- a/src/views/reviewers/curriculumVitae/components/file/agreement.vue
+++ b/src/views/reviewers/curriculumVitae/components/file/agreement.vue
@@ -379,7 +379,7 @@ export default {
return
}
if (!this.checkFileSuffix(row.name)) {
- this.$message.warning(`Must be in .pdf format`)
+ this.$message.warning(this.$t('upload:rule:MUSTPDF'))
return false
}
},
@@ -445,7 +445,7 @@ export default {
this.form.IsIRUpload = true
}
addDoctorCriterionFile(this.form).then((res) => {
- this.$message.success('添加成功')
+ this.$message.success(this.$t('common:message:addedSuccessfully'))
this.initSowList()
this.handleCancle()
})
diff --git a/src/views/reviewers/curriculumVitae/components/file/curriculum.vue b/src/views/reviewers/curriculumVitae/components/file/curriculum.vue
index 3b24b3c1..71021edb 100644
--- a/src/views/reviewers/curriculumVitae/components/file/curriculum.vue
+++ b/src/views/reviewers/curriculumVitae/components/file/curriculum.vue
@@ -173,12 +173,13 @@ export default {
(item) => item.FileName === param.file.name
)
if (isRepeat) {
- this.$confirm('Override the existing resume?', {
- type: 'warning',
- distinguishCancelAndClose: true,
- confirmButtonText: 'OK',
- cancelButtonText: 'Cancel',
- })
+ this.$confirm(
+ this.$t('curriculumVitae:resume:message:existingResume'),
+ {
+ type: 'warning',
+ distinguishCancelAndClose: true,
+ }
+ )
.then(() => {
// 重名覆盖
this.repeat = true
@@ -189,7 +190,7 @@ export default {
this.uploadFile(param.file, param.data.language)
}
} else {
- this.$alert(`Must be in ${this.accept} format`)
+ this.$alert(this.$t('upload:rule:MUSTPDF'))
}
},
async uploadFile(file, language) {
@@ -228,7 +229,9 @@ export default {
this.resumeList = res.Result
this.filterByLanguage()
this.isDisabled = false
- this.$message.success('Uploaded successfully')
+ this.$message.success(
+ this.$t('trials:uploadDicomList:table:Uploaded')
+ )
})
.catch(() => {
this.isDisabled = false
@@ -286,7 +289,7 @@ export default {
if (res.IsSuccess) {
this.getResumeList()
this.$message({
- message: 'Saved successfully!',
+ message: this.$t('common:message:savedSuccessfully'),
type: 'success',
})
}
@@ -307,7 +310,7 @@ export default {
this.dialogVisible = false
this.getResumeList()
this.$message({
- message: 'Saved successfully!',
+ message: this.$t('common:message:savedSuccessfully'),
type: 'success',
})
}
diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue
index 2ab7478e..40a7e805 100644
--- a/src/views/reviewers/curriculumVitae/components/info/info.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/info.vue
@@ -216,11 +216,11 @@
- {{ item.HospitalName }}
+ {{ isEN ? item.HospitalName : item.HospitalNameCN }}
@@ -228,6 +228,7 @@
-
+
+
+
+
+
+
+
{
WorkPartTime: null,
WorkPartTimeEn: null,
UniversityAffiliated: null,
+ UniversityAffiliatedCN: null,
City: null,
+ CityCN: null,
}
}
export default {
@@ -676,6 +699,8 @@ export default {
if (item.length) {
this.form.UniversityAffiliated = item[0].UniversityAffiliated
this.form.City = item[0].City
+ this.form.UniversityAffiliatedCN = item[0].UniversityAffiliatedCN
+ this.form.CityCN = item[0].CityCN
}
},
},