diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue index c93bc99a..212fbd72 100644 --- a/src/views/reviewers/components/Agreements.vue +++ b/src/views/reviewers/components/Agreements.vue @@ -1,45 +1,92 @@ @@ -151,25 +305,43 @@ diff --git a/src/views/reviewers/components/BasicInfo.vue b/src/views/reviewers/components/BasicInfo.vue index 80a76aad..27651faa 100644 --- a/src/views/reviewers/components/BasicInfo.vue +++ b/src/views/reviewers/components/BasicInfo.vue @@ -15,31 +15,62 @@ > - - + + - - + + - - + + - - + + - + - - + + - + - - + + - - - - - + + + + + - + - + - - + + {{ $t('common:button:save') }} + > + {{ $t('common:button:save') }} @@ -142,6 +200,15 @@ import { getBasicInfo, addOrUpdateDoctorBasicInfo } from '@/api/reviewers' import { changeURLStatic } from '@/utils/history.js' import { getBasicDataSelects } from '@/api/dictionary/dictionary' export default { + props: { + reviewerId: { + type: String, + }, + isSystem: { + type: Boolean, + default: true, + }, + }, data() { return { basicInfo: { @@ -156,58 +223,58 @@ export default { EMail: '', WeChat: '', Introduction: '', - Nation: 0 + Nation: 0, }, rules: { FirstName: [ { required: true, message: 'Please enter FirstName', - trigger: 'blur' + trigger: 'blur', }, - { max: 50, message: 'The maximum length is 50' } + { max: 50, message: 'The maximum length is 50' }, ], LastName: [ { required: true, message: 'Please enter LastName', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' } + { max: 50, message: 'The maximum length is 50' }, ], ChineseName: [{ max: 50, message: 'The maximum length is 50' }], Sex: [ - { required: true, message: 'Please select gender', trigger: 'blur' } + { required: true, message: 'Please select gender', trigger: 'blur' }, ], TitleIds: [ - { required: true, message: 'Please select Title', trigger: 'blur' } + { required: true, message: 'Please select Title', trigger: 'blur' }, ], Phone: [ { required: true, message: 'Please enter phone number', - trigger: 'blur' + trigger: 'blur', }, - { max: 20, min: 7, message: 'The length is 7 to 20' } + { max: 20, min: 7, message: 'The length is 7 to 20' }, ], EMail: [ { required: true, message: 'Please input the email address', - trigger: 'blur' + trigger: 'blur', }, { type: 'email', message: 'Please input the correct email address', - trigger: 'blur,change' + trigger: 'blur,change', }, - { max: 50, message: 'The maximum length is 50' } + { max: 50, message: 'The maximum length is 50' }, ], - WeChat: [{ max: 50, message: 'The maximum length is 50' }] + WeChat: [{ max: 50, message: 'The maximum length is 50' }], }, isDisabled: false, loading: false, genderOptions: [ { label: 'Male', value: 0 }, - { label: 'Female', value: 1 } + { label: 'Female', value: 1 }, ], - dictionaryList: {} + dictionaryList: {}, } }, mounted() { @@ -227,7 +294,12 @@ export default { this.$message.success('Saved successfully') if (!this.id) { this.basicInfo.Id = res.Result.Id - changeURLStatic('Id', res.Result.Id) + if (this.isSystem) { + changeURLStatic('Id', res.Result.Id) + } + if (!this.reviewerId) { + this.$emit('update:reviewerId', res.Result.Id) + } this.basicInfo.ReviewerCode = res.Result.ReviewerCode } }) @@ -241,27 +313,29 @@ export default { async initForm() { await this.getDicData() - const id = this.$route.query.Id + const id = this.$route.query.Id || this.reviewerId if (id) { this.loading = true - getBasicInfo(id).then((res) => { - // eslint-disable-next-line no-unused-vars - const { TitleList, ...param } = res.Result - this.basicInfo = param - this.loading = false - }).catch(() => { - this.loading = false - }) + getBasicInfo(id) + .then((res) => { + // eslint-disable-next-line no-unused-vars + const { TitleList, ...param } = res.Result + this.basicInfo = param + this.loading = false + }) + .catch(() => { + this.loading = false + }) } }, getDicData() { - getBasicDataSelects(['Title']).then(res => { - this.dictionaryList = { ...res.Result } - }).catch(() => { - - }) - } - } + getBasicDataSelects(['Title']) + .then((res) => { + this.dictionaryList = { ...res.Result } + }) + .catch(() => {}) + }, + }, } diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue index 476ab668..72d1abee 100644 --- a/src/views/reviewers/components/EducationTraining.vue +++ b/src/views/reviewers/components/EducationTraining.vue @@ -2,8 +2,14 @@

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

- - {{ $t('common:button:add') }} + + {{ $t('common:button:add') }}
- + - + - + - + - + - + -
+

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

- - {{ $t('common:button:add') }} + + {{ $t('common:button:add') }}
- + - + - + - + - + - + - + @@ -150,8 +299,18 @@ width="40%" :close-on-click-modal="false" > - - + + - + - - + + - + - + - + - + - + - + - + - + - - - - - - - - - - - - + - + - + - + + + + + + + + + + + - {{ $t('common:button:save') }} + {{ $t('common:button:save') }} @@ -248,8 +473,18 @@ width="40%" :close-on-click-modal="false" > - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - {{ $t('common:button:save') }} + {{ $t('common:button:save') }}
diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue index 24bbeea7..d8b0a888 100644 --- a/src/views/reviewers/components/Employment.vue +++ b/src/views/reviewers/components/Employment.vue @@ -1,7 +1,7 @@ diff --git a/src/views/reviewers/components/Setting.vue b/src/views/reviewers/components/Setting.vue index a3b17759..0fb8c0c4 100644 --- a/src/views/reviewers/components/Setting.vue +++ b/src/views/reviewers/components/Setting.vue @@ -1,80 +1,144 @@ diff --git a/src/views/reviewers/components/Specialty.vue b/src/views/reviewers/components/Specialty.vue index 5a636f12..36f14e1b 100644 --- a/src/views/reviewers/components/Specialty.vue +++ b/src/views/reviewers/components/Specialty.vue @@ -1,7 +1,7 @@ + + + + + + + + + +