diff --git a/src/views/dictionary/institutions/components/HospitalForm.vue b/src/views/dictionary/institutions/components/HospitalForm.vue index 504d4c89..70d647af 100644 --- a/src/views/dictionary/institutions/components/HospitalForm.vue +++ b/src/views/dictionary/institutions/components/HospitalForm.vue @@ -9,8 +9,19 @@ >
- - + + @@ -20,10 +31,16 @@ - + - + @@ -45,10 +62,22 @@
-
+
- Cancel - Save + Cancel + Save
@@ -63,14 +92,14 @@ export default { type: Object, default() { return {} - } + }, }, model: { type: Object, default() { return {} - } - } + }, + }, }, data() { return { @@ -87,23 +116,36 @@ export default { Province: '', ProvinceCN: '', City: '', - CityCN: '' + CityCN: '', }, siteList: [], rules: { - HospitalNameCN: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }], - UniversityAffiliated: [{ max: 100, message: 'The maximum length is 100' }], - UniversityAffiliatedCN: [{ max: 100, message: 'The maximum length is 100' }], - Country: [{ required: true, message: 'Please specify', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' }], - CountryCN: [{ max: 50, message: 'The maximum length is 50' }], - Province: [{ required: true, message: 'Please specify', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' }], - ProvinceCN: [{ max: 50, message: 'The maximum length is 50' }], - City: [{ required: true, message: 'Please specify', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' }], - CityCN: [{ max: 50, message: 'The maximum length is 50' }] - } + HospitalNameCN: [ + { required: true, message: 'Please specify', trigger: 'blur' }, + { max: 50, message: 'The maximum length is 50' }, + ], + UniversityAffiliated: [ + { max: 100, message: 'The maximum length is 100' }, + ], + UniversityAffiliatedCN: [ + { max: 100, message: 'The maximum length is 100' }, + ], + Country: [{ max: 50, message: 'The maximum length is 50' }], + CountryCN: [ + { required: true, message: 'Please specify', trigger: 'blur' }, + { max: 50, message: 'The maximum length is 50' }, + ], + Province: [{ max: 50, message: 'The maximum length is 50' }], + ProvinceCN: [ + { required: true, message: 'Please specify', trigger: 'blur' }, + { max: 50, message: 'The maximum length is 50' }, + ], + City: [{ max: 50, message: 'The maximum length is 50' }], + CityCN: [ + { required: true, message: 'Please specify', trigger: 'blur' }, + { max: 50, message: 'The maximum length is 50' }, + ], + }, } }, mounted() { @@ -114,7 +156,7 @@ export default { }, methods: { siteChange(v) { - this.siteList.forEach(o => { + this.siteList.forEach((o) => { if (o.Id === v) { this.form.CityCN = o.City this.form.HospitalNameCN = o.SiteNameCN @@ -125,34 +167,37 @@ export default { }) }, getAllSiteList() { - getAllSiteList().then(res => { - this.siteList = res.Result - console.log(this.siteList) - }).catch(() => { - reject() - }) + getAllSiteList() + .then((res) => { + this.siteList = res.Result + console.log(this.siteList) + }) + .catch(() => { + reject() + }) }, handleSave() { - this.$refs.hospitalForm.validate(valid => { + this.$refs.hospitalForm.validate((valid) => { if (!valid) return this.btnLoading = true - addOrUpdateHospital(this.form).then(res => { - this.btnLoading = false - if (res.IsSuccess) { - this.$message.success('Saved successfully') - this.$refs['hospitalForm'].resetFields() - this.$emit('getList') - this.$emit('close') - } - }).catch(() => { - this.btnLoading = false - }) + addOrUpdateHospital(this.form) + .then((res) => { + this.btnLoading = false + if (res.IsSuccess) { + this.$message.success('Saved successfully') + this.$refs['hospitalForm'].resetFields() + this.$emit('getList') + this.$emit('close') + } + }) + .catch(() => { + this.btnLoading = false + }) }) }, handleCancel() { this.$emit('close') - } - } - + }, + }, } diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue index 85da0264..99c39408 100644 --- a/src/views/reviewers/components/EducationTraining.vue +++ b/src/views/reviewers/components/EducationTraining.vue @@ -569,22 +569,30 @@ :label="$t('system:EducationTraining:table:Hospital')" prop="Hospital" > - - - - {{ isEN ? item.HospitalName : item.HospitalNameCN }} - - - + + + + + + + + { + this.hospitalSelectList.push({ + value: item.HospitalName, + ...item, + }) + this.hospitalSelectListCN.push({ + value: item.HospitalNameCN, + ...item, + }) + }) + }, + deep: true, + }, + }, mounted() { this.initPage() store.dispatch('global/getHospital') }, methods: { + handleSelect(value) { + const item = value + if (item) { + this.postgraduateForm.Hospital = item.HospitalName + this.postgraduateForm.HospitalCN = item.HospitalNameCN + } + }, + querySearch(queryString, cb) { + var hospitalList = this.hospitalSelectList + var results = queryString + ? hospitalList.filter(this.createFilter(queryString)) + : hospitalList + // 调用 callback 返回建议列表的数据 + cb(results) + }, + querySearchCN(queryString, cb) { + var hospitalList = this.hospitalSelectListCN + var results = queryString + ? hospitalList.filter(this.createFilter(queryString, false)) + : hospitalList + // 调用 callback 返回建议列表的数据 + cb(results) + }, + createFilter(queryString, isEN = true) { + return (hospitalList) => { + if (isEN) { + return ( + hospitalList.HospitalName.toLowerCase().indexOf( + queryString.toLowerCase() + ) >= 0 + ) + } else { + return ( + hospitalList.HospitalNameCN.toLowerCase().indexOf( + queryString.toLowerCase() + ) >= 0 + ) + } + } + }, initPage() { const id = this.$route.query.Id || this.reviewerId if (id) { diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue index 7378bd26..95dad9bb 100644 --- a/src/views/reviewers/components/Employment.vue +++ b/src/views/reviewers/components/Employment.vue @@ -14,27 +14,32 @@ - - - - {{ isEN ? item.HospitalName : item.HospitalNameCN }} - - - + v-model="employmentForm.HospitalName" + :fetch-suggestions="querySearch" + @select="handleSelect" + placeholder="Please specify in English" + @change="handleChange" + > + + + + + @@ -43,12 +48,25 @@ + + + + + @@ -59,15 +77,23 @@ + + + + + - + @@ -321,14 +347,34 @@ export default { Physician: '', PhysicianCN: '', PhysicianOriginal: null, + HospitalName: '', + HospitalNameCN: '', WorkPartTime: null, WorkPartTimeEn: null, + UniversityAffiliated: null, + UniversityAffiliatedCN: null, + City: null, + CityCN: null, }, UniversityAffiliated: '', City: '', Province: '', Country: '', employmentRules: { + HospitalName: [ + { + required: true, + message: this.$t('common:ruleMessage:specify'), + trigger: ['blur', 'change'], + }, + ], + HospitalNameCN: [ + { + required: true, + message: this.$t('common:ruleMessage:specify'), + trigger: ['blur', 'change'], + }, + ], DepartmentId: [ { required: true, @@ -435,6 +481,8 @@ export default { otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5', loading: false, dictionaryList: {}, + hospitalSelectList: [], + hospitalSelectListCN: [], } }, computed: { @@ -446,7 +494,83 @@ export default { mounted() { this.initEmployment() }, + watch: { + hospitalList: { + handler() { + if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0) + return false + this.hospitalSelectList = [] + this.hospitalList.forEach((item) => { + this.hospitalSelectList.push({ + value: item.HospitalName, + ...item, + }) + this.hospitalSelectListCN.push({ + value: item.HospitalNameCN, + ...item, + }) + }) + }, + deep: true, + }, + }, methods: { + handleSelect(value) { + const item = value + if (item) { + this.employmentForm.HospitalName = item.HospitalName + this.employmentForm.HospitalNameCN = item.HospitalNameCN + this.employmentForm.UniversityAffiliated = item.UniversityAffiliated + this.employmentForm.City = item.City + this.employmentForm.UniversityAffiliatedCN = item.UniversityAffiliatedCN + this.employmentForm.CityCN = item.CityCN + } else { + this.employmentForm.UniversityAffiliated = null + this.employmentForm.City = null + this.employmentForm.UniversityAffiliatedCN = null + this.employmentForm.CityCN = null + } + }, + handleChange(v) { + if (v) return + this.employmentForm.UniversityAffiliated = null + this.employmentForm.City = null + this.employmentForm.UniversityAffiliatedCN = null + this.employmentForm.CityCN = null + }, + querySearch(queryString, cb) { + var hospitalList = this.hospitalSelectList + var results = queryString + ? hospitalList.filter(this.createFilter(queryString)) + : hospitalList + // 调用 callback 返回建议列表的数据 + cb(results) + }, + querySearchCN(queryString, cb) { + var hospitalList = this.hospitalSelectListCN + var results = queryString + ? hospitalList.filter(this.createFilter(queryString, false)) + : hospitalList + // 调用 callback 返回建议列表的数据 + cb(results) + }, + createFilter(queryString, isEN = true) { + return (hospitalList) => { + if (isEN) { + return ( + hospitalList.HospitalName.toLowerCase().indexOf( + queryString.toLowerCase() + ) >= 0 + ) + } else { + return ( + hospitalList.HospitalNameCN.toLowerCase().indexOf( + queryString.toLowerCase() + ) >= 0 + ) + } + } + }, RankChange(val) { var o = this.$d.Rank.find((v) => { return v.id === val @@ -515,6 +639,14 @@ export default { : '' param.HospitalId = this.employmentForm.HospitalId + param.HospitalName = this.employmentForm.HospitalName + param.HospitalNameCN = this.employmentForm.HospitalNameCN + param.UniversityAffiliated = this.employmentForm.UniversityAffiliated + param.UniversityAffiliatedCN = + this.employmentForm.UniversityAffiliatedCN + param.City = this.employmentForm.City + param.CityCN = this.employmentForm.CityCN + updateEmploymentInfo(param) .then((res) => { this.isDisabled = false @@ -551,9 +683,22 @@ export default { PositionOther, PositionOtherCN, HospitalId, + HospitalName, + HospitalNameCN, WorkPartTime, WorkPartTimeEn, + UniversityAffiliated, + UniversityAffiliatedCN, + City, + CityCN, } = res.Result + this.employmentForm.HospitalName = HospitalName + this.employmentForm.HospitalNameCN = HospitalNameCN + this.employmentForm.UniversityAffiliated = UniversityAffiliated + this.employmentForm.UniversityAffiliatedCN = UniversityAffiliatedCN + this.employmentForm.City = City + this.employmentForm.CityCN = CityCN + this.employmentForm.WorkPartTime = WorkPartTime this.employmentForm.WorkPartTimeEn = WorkPartTimeEn this.employmentForm.Id = id diff --git a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue index 68e68dd9..1a013d03 100644 --- a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue +++ b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue @@ -150,20 +150,32 @@ - - - - {{ isEN ? item.HospitalName : item.HospitalNameCN }} - - - + + + + { Major: '', MajorCN: '', HospitalId: null, + HospitalCN: null, + Hospital: null, School: '', SchoolCN: '', City: '', @@ -418,6 +432,7 @@ export default { }, loading: false, daterange: [], + hospitalSelectList: [], } }, computed: { @@ -426,7 +441,55 @@ export default { mounted() { store.dispatch('global/getHospital') }, + watch: { + hospitalList: { + handler() { + if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0) + return false + this.hospitalSelectList = [] + this.hospitalList.forEach((item) => { + if (this.isEN) { + this.hospitalSelectList.push({ + value: item.HospitalName, + ...item, + }) + } else { + this.hospitalSelectList.push({ + value: item.HospitalNameCN, + ...item, + }) + } + }) + }, + deep: true, + }, + }, methods: { + querySearch(queryString, cb) { + var hospitalList = this.hospitalSelectList + var results = queryString + ? hospitalList.filter(this.createFilter(queryString)) + : hospitalList + // 调用 callback 返回建议列表的数据 + cb(results) + }, + createFilter(queryString) { + return (hospitalList) => { + if (this.isEN) { + return ( + hospitalList.HospitalName.toLowerCase().indexOf( + queryString.toLowerCase() + ) >= 0 + ) + } else { + return ( + hospitalList.HospitalNameCN.toLowerCase().indexOf( + queryString.toLowerCase() + ) >= 0 + ) + } + } + }, openEdit(row) { this.form = defaultForm() this.daterange = [] @@ -458,6 +521,11 @@ export default { if (this.reviewerId) { this.form.DoctorId = this.reviewerId } + let data = Object.assign({}, this.form) + if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) { + data.Hospital = data.HospitalId + data.HospitalId = null + } this.loading = true let res = await addOrUpdatePostgraduateInfo(this.form) this.loading = false diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue index 1bf054c1..af424e38 100644 --- a/src/views/reviewers/curriculumVitae/components/info/info.vue +++ b/src/views/reviewers/curriculumVitae/components/info/info.vue @@ -209,25 +209,35 @@
- - - - {{ isEN ? item.HospitalName : item.HospitalNameCN }} - - - + @change="handleChange" + > + + + - + - + { RankOther: '', RankOtherCN: '', HospitalId: '', + HospitalName: null, + HospitalNameCN: null, WorkPartTime: null, WorkPartTimeEn: null, UniversityAffiliated: null, @@ -616,11 +632,18 @@ export default { trigger: 'blur', }, ], - HospitalId: [ + HospitalName: [ { required: true, - message: this.$t('common:ruleMessage:select'), - trigger: 'blur', + message: this.$t('common:ruleMessage:specify'), + trigger: ['blur', 'change'], + }, + ], + HospitalNameCN: [ + { + required: true, + message: this.$t('common:ruleMessage:specify'), + trigger: ['blur', 'change'], }, ], UniversityAffiliated: [ @@ -648,16 +671,72 @@ export default { loading: false, dictionaryList: {}, otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5', + hospitalSelectList: [], } }, computed: { ...mapGetters(['hospitalList']), }, + watch: { + hospitalList: { + handler() { + if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0) + return false + this.hospitalSelectList = [] + this.hospitalList.forEach((item) => { + if (this.isEN) { + this.hospitalSelectList.push({ + value: item.HospitalName, + ...item, + }) + } else { + this.hospitalSelectList.push({ + value: item.HospitalNameCN, + ...item, + }) + } + }) + }, + deep: true, + }, + }, mounted() { this.getDicData() store.dispatch('global/getHospital') }, methods: { + handleChange(v) { + if (v) return + this.form.UniversityAffiliated = null + this.form.City = null + this.form.UniversityAffiliatedCN = null + this.form.CityCN = null + }, + querySearch(queryString, cb) { + var hospitalList = this.hospitalSelectList + var results = queryString + ? hospitalList.filter(this.createFilter(queryString)) + : hospitalList + // 调用 callback 返回建议列表的数据 + cb(results) + }, + createFilter(queryString) { + return (hospitalList) => { + if (this.isEN) { + return ( + hospitalList.HospitalName.toLowerCase().indexOf( + queryString.toLowerCase() + ) >= 0 + ) + } else { + return ( + hospitalList.HospitalNameCN.toLowerCase().indexOf( + queryString.toLowerCase() + ) >= 0 + ) + } + } + }, openEdit() { this.form = defaultForm() Object.keys(this.form).forEach((key) => { @@ -666,8 +745,6 @@ export default { } }) this.model_cfg.visible = true - console.log(this.form) - console.log(this.DATA) }, handleCancle() { this.form = defaultForm() @@ -680,8 +757,13 @@ export default { if (this.reviewerId) { this.form.Id = this.reviewerId } + let data = Object.assign({}, this.form) + if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) { + data.HospitalName = data.HospitalId + data.HospitalId = null + } this.loading = true - let res = await addOrUpdateDoctorBasicInfoAndEmployment(this.form) + let res = await addOrUpdateDoctorBasicInfoAndEmployment(data) this.loading = false if (res.IsSuccess) { this.$emit('update:reviewerId', res.Result.Id) @@ -701,13 +783,18 @@ export default { }) .catch(() => {}) }, - handleHospitalChange(value) { - const item = this.hospitalList.filter((item) => item.Id === value) - if (item.length) { - this.form.UniversityAffiliated = item[0].UniversityAffiliated - this.form.City = item[0].City - this.form.UniversityAffiliatedCN = item[0].UniversityAffiliatedCN - this.form.CityCN = item[0].CityCN + handleSelect(value) { + const item = value + if (item) { + this.form.UniversityAffiliated = item.UniversityAffiliated + this.form.City = item.City + this.form.UniversityAffiliatedCN = item.UniversityAffiliatedCN + this.form.CityCN = item.CityCN + } else { + this.form.UniversityAffiliated = null + this.form.City = null + this.form.UniversityAffiliatedCN = null + this.form.CityCN = null } }, },