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 @@ - + - + - + - + - + - + - + - + - + - + - + - + - +