diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue index 29f809a9..49e12126 100644 --- a/src/views/email-recompose/index.vue +++ b/src/views/email-recompose/index.vue @@ -180,9 +180,9 @@ export default { this.$i18n.locale = this.$route.query.lang this.setLanguage(this.$route.query.lang) this.$updateDictionary() - if (!this.password.NewUserName) { - this.$alert(this.$t('recompose:message:warning')) - } + // if (!this.password.NewUserName) { + // this.$alert(this.$t('recompose:message:warning')) + // } }, methods: { ...mapMutations({ setLanguage: 'lang/setLanguage' }), @@ -194,8 +194,10 @@ export default { } else { this.$router.push(`/login`) } - this.$i18n.locale = 'zh' - this.setLanguage('zh') + if (!this.$i18n.locale) { + this.$i18n.locale = 'zh' + this.setLanguage('zh') + } this.$updateDictionary() }, save() { diff --git a/src/views/error.vue b/src/views/error.vue index db3aa915..47389a41 100644 --- a/src/views/error.vue +++ b/src/views/error.vue @@ -2,7 +2,8 @@
- 404 + + 404 404 404 @@ -56,8 +57,10 @@ export default { .pic-404 { position: relative; float: left; - width: 400px; + width: 500px; + height: 300px; overflow: hidden; + margin-right: 10px; &__parent { width: 100%; } diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue index 5dd4dce1..88000983 100644 --- a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue +++ b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue @@ -1,14 +1,14 @@ diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue index e914972b..c5e3b65b 100644 --- a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue +++ b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue @@ -50,13 +50,14 @@ - + /> - + /> - + />
- - {{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }} -
- -
- - {{ + $t('trials:trials-list:form:indication:') + }} + {{ $fd('Indication', trialInfo.IndicationEnum) + }}{{ + trialInfo.Indication ? '-' + trialInfo.Indication : '' + }} - {{ trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ') }} - -
-
- - - {{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }} - - -
-
+
+ + + {{ + trialInfo.DeclarationTypeEnumList.map((v) => + $fd('DeclarationType', v) + ).join(', ') + }} + +
+
+ + + {{ + trialInfo.CriterionList && trialInfo.CriterionList.length > 0 + ? trialInfo.CriterionList.join(', ') + : '' + }} + +
+
- - {{$fd('YesOrNoForInt', trialInfo.Expedited)}} + + {{ $fd('YesOrNoForInt', trialInfo.Expedited) }}
- + {{ trialInfo.TotalReviewers }}
- - {{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ') }} -
-
+ + {{ + trialInfo.AttendedReviewerTypeEnumList.map((v) => + $fd('AttendedReviewerType', v) + ).join(', ') + }}
+
@@ -60,7 +93,12 @@
- +
@@ -127,18 +169,30 @@ export default { trialInfo: null, TrialId: '', activeStatus: null, - TrialMaxState: 0 + TrialMaxState: 0, } }, mounted() { this.TrialId = this.$route.query.trialId this.initPage() }, + computed: { + isEN() { + return this.$i18n.locale !== 'zh' + }, + }, methods: { initPage() { - getTrialInfoAndMaxTrialState(this.TrialId).then(res => { + getTrialInfoAndMaxTrialState(this.TrialId).then((res) => { this.trialInfo = res.Result.TrialView - var activeStatus = res.Result.TrialMaxState < 1 ? 0 : res.Result.TrialMaxState < 5 ? 1 : res.Result.TrialMaxState < 8 ? 2 : 3 + var activeStatus = + res.Result.TrialMaxState < 1 + ? 0 + : res.Result.TrialMaxState < 5 + ? 1 + : res.Result.TrialMaxState < 8 + ? 2 + : 3 this.activeStatus = activeStatus this.TrialMaxState = activeStatus }) @@ -147,95 +201,93 @@ export default { this.activeStatus = step }, nextStep(stepName) { - this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1; - if(stepName==='confirmation'){ - this.activeStatus = 3; + this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1 + if (stepName === 'confirmation') { + this.activeStatus = 3 } this.TrialMaxState = this.activeStatus this.$nextTick( - function() { + function () { this.$refs[stepName].getList() }.bind(this) ) - } - - } + }, + }, }