From bd024773bd7f36eab401213e03dfdf8e93f181e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= Date: Fri, 1 Mar 2024 13:33:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 6 +- src/layout/components/topLang.vue | 54 +++++++++ src/views/reviewers/components/Employment.vue | 12 +- src/views/trials/trials-workbench/index.vue | 104 +++++++++--------- 4 files changed, 116 insertions(+), 60 deletions(-) create mode 100644 src/layout/components/topLang.vue diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 88bcd754..b07a3ad2 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -40,6 +40,7 @@ + @@ -50,12 +51,15 @@ import {mapGetters, mapMutations} from 'vuex' import Breadcrumb from '@/components/Breadcrumb' import Hamburger from '@/components/Hamburger' import Screenfull from '@/components/Screenfull' +import TopLang from './topLang' + export default { components: { Breadcrumb, Hamburger, - Screenfull + Screenfull, + TopLang }, data() { return { diff --git a/src/layout/components/topLang.vue b/src/layout/components/topLang.vue new file mode 100644 index 00000000..9a18a56f --- /dev/null +++ b/src/layout/components/topLang.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue index 74d09e22..94808624 100644 --- a/src/views/reviewers/components/Employment.vue +++ b/src/views/reviewers/components/Employment.vue @@ -376,9 +376,9 @@ export default { this.loading = true this.isDisabled = true const param = {} - var o = this.$d.PhysicianOriginal.find(v => { - return v.id === this.employmentForm.PhysicianId - }) + // var o = this.$d.PhysicianOriginal.find(v => { + // return v.id === this.employmentForm.PhysicianId + // }) param.Id = this.$route.query.Id param.DepartmentId = this.employmentForm.DepartmentId param.DepartmentOther = this.employmentForm.DepartmentId === this.otherId ? this.employmentForm.DepartmentOther : '' @@ -386,9 +386,9 @@ export default { param.RankId = this.employmentForm.RankId param.RankOther = this.employmentForm.RankId === this.otherId ? this.employmentForm.RankOther : '' param.RankOtherCN = this.employmentForm.RankId === this.otherId ? this.employmentForm.RankOtherCN : '' - param.PhysicianId = this.employmentForm.PhysicianId - param.Physician = o.label !== '其它' && o.label !== 'Other' ? o.raw.Value : this.employmentForm.Physician - param.PhysicianCN = o.label !== '其它' && o.label !== 'Other' ? o.raw.ValueCN : this.employmentForm.PhysicianCN + // param.PhysicianId = this.employmentForm.PhysicianId + // param.Physician = o.label !== '其它' && o.label !== 'Other' ? o.raw.Value : this.employmentForm.Physician + // param.PhysicianCN = o.label !== '其它' && o.label !== 'Other' ? o.raw.ValueCN : this.employmentForm.PhysicianCN param.PositionId = this.employmentForm.PositionId param.PositionOther = this.employmentForm.PositionId === this.otherId ? this.employmentForm.PositionOther : '' param.PositionOtherCN = this.employmentForm.PositionId === this.otherId ? this.employmentForm.PositionOtherCN : '' diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue index e5441f39..52641d85 100644 --- a/src/views/trials/trials-workbench/index.vue +++ b/src/views/trials/trials-workbench/index.vue @@ -9,127 +9,125 @@ - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -141,80 +139,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + From 7101276aab8b5157983ba52c0b08de4caef22861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= Date: Fri, 1 Mar 2024 14:53:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/components/Account.vue | 78 +++++++++--------- src/views/system/user/components/UserInfo.vue | 35 ++++---- src/views/system/user/edit/index.vue | 80 +++++++++---------- 3 files changed, 96 insertions(+), 97 deletions(-) diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue index 4deb34e4..6d4b96bb 100644 --- a/src/views/system/user/components/Account.vue +++ b/src/views/system/user/components/Account.vue @@ -1,39 +1,39 @@ - - + + diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue index 37105f03..4582db64 100644 --- a/src/views/system/user/components/UserInfo.vue +++ b/src/views/system/user/components/UserInfo.vue @@ -9,41 +9,41 @@ >
- Basic Information + {{ $t('system:userlist:title:Information') }}
- + - + - + - + - + Male Female - + - + - + - + - +
- Affiliation + {{ $t('system:userlist:title:Affiliation') }}
- Internal - External + {{ $t('system:userlist:title:Internal') }} + {{ $t('system:userlist:title:External') }} - + - - + - + diff --git a/src/views/system/user/edit/index.vue b/src/views/system/user/edit/index.vue index c37fa343..2be70da6 100644 --- a/src/views/system/user/edit/index.vue +++ b/src/views/system/user/edit/index.vue @@ -1,40 +1,40 @@ - - + + From 4d63318d8b0346f3cefe569ef3b2dfc7d410ef28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= Date: Fri, 1 Mar 2024 15:14:00 +0800 Subject: [PATCH 3/4] 1 --- src/views/trials/trials-panel/setting/visit-plan/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/setting/visit-plan/index.vue b/src/views/trials/trials-panel/setting/visit-plan/index.vue index 6f0a6834..19539b68 100644 --- a/src/views/trials/trials-panel/setting/visit-plan/index.vue +++ b/src/views/trials/trials-panel/setting/visit-plan/index.vue @@ -286,7 +286,7 @@ export default { }) }, handleAdd() { - this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: 0, VisitWindowRight: 0, Description: '' } + this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -3, VisitWindowRight: 3, Description: '' } this.timer = new Date().getTime() if (this.list.length === 0) { this.row.VisitName = 'Baseline' From 19bc56bb66568b1622b073eb6fb8739d6468dbf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= Date: Mon, 4 Mar 2024 14:43:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UploadFile/index.vue | 4 +- src/layout/components/topLang.vue | 2 +- src/views/reviewers/components/Agreements.vue | 66 ++++---- src/views/reviewers/components/BasicInfo.vue | 20 +-- .../reviewers/components/Credentials.vue | 8 +- .../components/EducationTraining.vue | 95 ++++++----- src/views/reviewers/components/Employment.vue | 16 +- .../reviewers/components/GcpCertificate.vue | 10 +- .../components/ResearchPublication.vue | 11 +- src/views/reviewers/components/Resumes.vue | 46 ++--- src/views/reviewers/components/Setting.vue | 68 ++++---- src/views/reviewers/components/Specialty.vue | 9 +- .../reviewers/components/TrialExperience.vue | 44 ++--- src/views/reviewers/edit.vue | 25 ++- src/views/system/login-log/index.vue | 19 ++- src/views/system/notice/components/from.vue | 38 ++--- src/views/system/notice/index.vue | 84 ++++----- src/views/system/role/components/RoleForm.vue | 5 +- src/views/system/role/index.vue | 37 ++-- src/views/system/role/role.js | 159 +++++++++--------- src/views/system/user/list/index.vue | 4 +- 21 files changed, 385 insertions(+), 385 deletions(-) diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue index cf3c72c7..9de9ce32 100644 --- a/src/components/UploadFile/index.vue +++ b/src/components/UploadFile/index.vue @@ -14,8 +14,8 @@ :on-exceed="handleExceed" accept=".pdf" > - Upload - (must be in pdf format. 1/2 pages, please confirm information integrity) + {{ $t('system:GcpCertificate:upload:Upload') }} + {{$t('system:GcpCertificate:tap:must2') }} diff --git a/src/layout/components/topLang.vue b/src/layout/components/topLang.vue index 9a18a56f..540e4bd1 100644 --- a/src/layout/components/topLang.vue +++ b/src/layout/components/topLang.vue @@ -44,7 +44,7 @@ export default { this.$i18n.locale = lang this.setLanguage(lang) this.$updateDictionary() - // window.location.reload() + window.location.reload() } } } diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue index 7226c696..c8a72918 100644 --- a/src/views/reviewers/components/Agreements.vue +++ b/src/views/reviewers/components/Agreements.vue @@ -1,21 +1,21 @@ diff --git a/src/views/reviewers/components/BasicInfo.vue b/src/views/reviewers/components/BasicInfo.vue index 2ebdca92..7340d1ca 100644 --- a/src/views/reviewers/components/BasicInfo.vue +++ b/src/views/reviewers/components/BasicInfo.vue @@ -15,31 +15,31 @@ > - + - + - + - + - + - + - + - + @@ -106,7 +106,7 @@ --> - + Save + > {{ $t('common:button:save') }} diff --git a/src/views/reviewers/components/Credentials.vue b/src/views/reviewers/components/Credentials.vue index 996aefc2..5e2af223 100644 --- a/src/views/reviewers/components/Credentials.vue +++ b/src/views/reviewers/components/Credentials.vue @@ -2,7 +2,7 @@
-

Diploma of the highest medical degree 最高医学学位毕业证书 +

{{$t('system:Credentials:title:Diploma of the highest medical degree')}}

@@ -12,7 +12,7 @@ -

Medical Qualification Certificate 医师资格证 +

{{$t('system:Credentials:title:Medical Qualification Certificate')}} @@ -22,7 +22,7 @@ -

Practice License 医师执业证 +

{{$t('system:Credentials:title:Practice License')}} @@ -31,7 +31,7 @@

-
Modality Certificate 大型医用设备上岗证
+
{{$t('system:Credentials:title:Modality Certificate')}}

CT diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue index 0ae527fe..7366de55 100644 --- a/src/views/reviewers/components/EducationTraining.vue +++ b/src/views/reviewers/components/EducationTraining.vue @@ -1,8 +1,9 @@ - + - + - + - +

-

Postgraduate Training (in chronological order)

- Add +

{{ $t('system:reviewer:title:Postgraduate') }}

+ + {{ $t('common:button:add') }}
- + @@ -106,32 +110,32 @@ {{ scope.row.MajorCN?`${scope.row.Major} / ${scope.row.MajorCN}`:scope.row.Major }} - + - + - + - + - + - +