-
+
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6f3d378e..d7a66666 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -78,6 +78,9 @@ const mutations = {
}
const actions = {
+ changeUserName({ commit }, userName) {
+ commit('SET_USERNAME', userName)
+ },
// user login
login({ commit }, userInfo) {
const { username, password } = userInfo
diff --git a/src/views/blindResumeInfo/components/Employment.vue b/src/views/blindResumeInfo/components/Employment.vue
index 380098a6..c0f5379f 100644
--- a/src/views/blindResumeInfo/components/Employment.vue
+++ b/src/views/blindResumeInfo/components/Employment.vue
@@ -14,27 +14,26 @@
{{ employment.RankCN }}
-
-
- {{ employment.Physician }}
- {{ employment.PhysicianCN }}
-
-
+
+
+
+
+
+
{{ employment.Position }}
{{ employment.PositionCN }}
-
-
-
{{ employment.HospitalName }}
{{ employment.HospitalNameCN }}
+
+
{{ employment.UniversityAffiliated }}
diff --git a/src/views/blindResumeInfo/info.vue b/src/views/blindResumeInfo/info.vue
index e10c07c8..0b1b85c9 100644
--- a/src/views/blindResumeInfo/info.vue
+++ b/src/views/blindResumeInfo/info.vue
@@ -90,11 +90,12 @@ export default {
this.setLanguage('zh')
this.$updateDictionary()
}
- this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`:''
+ this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName} ${this.$t('resumeInfo:title:Details')}`:''
}
},
mounted() {
this.isEnglish = !!((this.$route.query.isEnglish === true || this.$route.query.isEnglish === 'true'))
+ this.isEnglish = this.$i18n.locale === 'zh' ? false : true
this.doctorId = this.$route.query.doctorId
this.initForm()
},
@@ -179,7 +180,8 @@ export default {
this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
this.doctorInfo = res.Result
!this.doctorInfo.ResearchPublicationView ? this.doctorInfo.ResearchPublicationView = {} : '';
- this.title = `${this.doctorInfo.BasicInfoView.BlindName} 's Details`
+ this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName} ${this.$t('resumeInfo:title:Details')}`:''
+ // this.title = `${this.doctorInfo.BasicInfoView.BlindName} 's Details`
this.htmlTitle = this.title
this.initStatus()
this.initEmploymentInfo()
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index b478b24f..4e123227 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -5,7 +5,7 @@
{{ $t('recompose:title:init') }}
-
+
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 83986c47..6b85fe54 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -7,7 +7,7 @@
ref="resetForm"
v-loading="formLoading"
:model="form"
- label-width="150px"
+ label-width="200px"
:rules="rules"
class="demo-ruleForm"
size="small"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ed76f483..38900c47 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -78,7 +78,7 @@
type="primary"
style="width:100%;margin-bottom:10px;"
size="medium"
- @click.native.prevent="loginIn"
+ @click.native.prevent="handleLogin"
>
{{ $t('login:button:login') }}
@@ -109,7 +109,7 @@
关于
-
+
{
if (valid) {
- this.onSuccess()
- // this.isShow = true
+ this.isShow = true
+ // this.onSuccess()
} else {
// console.log('error submit!!')
return false
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 53110a49..c666b5cd 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -23,7 +23,7 @@
v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))"
type="primary"
size="small"
- @click="handleSubmit"
+ @click="handleSubmit2"
>
{{ $t('trials:researchForm:button:auditPasses') }}
@@ -245,19 +245,6 @@ export default {
// 提交
handleSubmit() {
if (this.userTypeEnumInt === 0) {
- // if (this.$refs['researchParticipants'].list.length === 0 && this.$refs['researchEquipments'].list.length === 0) {
- // this.$alert(this.$t('trials:researchForm:message:saveWarning'))
- // return
- // }
- // var list = this.$refs['researchParticipants'].list
- // var cIdx = list.findIndex(i => parseInt(i.TrialRoleCode) === 1)
- // var pIdx = list.findIndex(i => parseInt(i.TrialRoleCode) === 4)
- // if (cIdx === -1 || pIdx === -1) {
- // // 提交时校验必须crc角色和影像负责人角色至少有1个
- // this.$alert(this.$t('trials:researchForm:message:saveWarning1'))
- // return
- // }
-
this.loading = true
this.$refs['baseResearchInfo'].handleSave(true).then(res => {
this.loading = false
@@ -271,7 +258,7 @@ export default {
},
submit() {
// 是否确认提交
- this.$confirm(this.$t('trials:researchForm:message:submitWarning'), {
+ this.$confirm(this.userTypeEnumInt === 0 ? this.$t('trials:researchForm:message:submitWarning') : this.$t('trials:researchForm:message:submitWarning2'), {
type: 'warning',
distinguishCancelAndClose: true
}).then(() => {
diff --git a/src/views/resumeInfo/components/BasicInfo.vue b/src/views/resumeInfo/components/BasicInfo.vue
index f20e8a81..6e205bef 100644
--- a/src/views/resumeInfo/components/BasicInfo.vue
+++ b/src/views/resumeInfo/components/BasicInfo.vue
@@ -53,13 +53,13 @@
-
-
-
- {{ basicInfo.WeChat }}
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/resumeInfo/components/Employment.vue b/src/views/resumeInfo/components/Employment.vue
index 380098a6..ec46e5d9 100644
--- a/src/views/resumeInfo/components/Employment.vue
+++ b/src/views/resumeInfo/components/Employment.vue
@@ -14,27 +14,27 @@