diff --git a/public/error.html b/public/error.html index 155c50e2..4c05b498 100644 --- a/public/error.html +++ b/public/error.html @@ -23,8 +23,8 @@ -
- +
+
@@ -148,7 +148,7 @@ left: 50%; top: 50%; transform: translate(-50%,-50%); - width: 1200px; + width: 1100px; height: 600px; box-sizing: border-box; background: rgb(255, 255, 255); @@ -179,7 +179,12 @@ .login-container .login-body .login-l .login-image img{ height: 100%; } - + .login-container .login-body .login-l .login-image-usa { + width: 100%; + display: flex; + align-items: center; + justify-content: flex-end; + } .login-container .login-body .login-r{ position: relative; float: left; diff --git a/public/errorEN.html b/public/errorEN.html index 455de101..b1139766 100644 --- a/public/errorEN.html +++ b/public/errorEN.html @@ -23,8 +23,8 @@
-
- +
+
@@ -104,7 +104,7 @@ left: 50%; top: 50%; transform: translate(-50%,-50%); - width: 1200px; + width: 1100px; height: 600px; box-sizing: border-box; background: rgb(255, 255, 255); @@ -135,7 +135,12 @@ .login-container .login-body .login-l .login-image img{ height: 100%; } - + .login-container .login-body .login-l .login-image-usa { + width: 100%; + display: flex; + align-items: center; + justify-content: flex-end; + } .login-container .login-body .login-r{ position: relative; float: left; diff --git a/public/error_assets/login-bg.svg b/public/error_assets/login-bg.svg new file mode 100644 index 00000000..f65c3c32 --- /dev/null +++ b/public/error_assets/login-bg.svg @@ -0,0 +1,793 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/api/admin.js b/src/api/admin.js index 05e82744..dbd9acf4 100644 --- a/src/api/admin.js +++ b/src/api/admin.js @@ -309,3 +309,11 @@ export function rePublishEvent(params) { params }) } +// userId获取doctorId +export function useUserIDGetDoctorID(data) { + return request({ + url: `/TrialSiteSurvey/useUserIDGetDoctorID`, + method: 'post', + data + }) +} diff --git a/src/api/reviewers.js b/src/api/reviewers.js index e1fda283..d7b084f1 100644 --- a/src/api/reviewers.js +++ b/src/api/reviewers.js @@ -321,4 +321,12 @@ export function addOrUpdateResearchPublicationInfo(param) { method: 'post', data: param }) +} +// 发送简历采集邮件 +export function doctorSendEmail(param) { + return request({ + url: `/Doctor/sendEmail`, + method: 'post', + data: param + }) } \ No newline at end of file diff --git a/src/styles/index.scss b/src/styles/index.scss index 9700fe12..375cad02 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -149,6 +149,7 @@ body .el-table th.gutter { } .el-dialog__body { + margin-top: 15px; height: calc(100% - 70px); padding: 0 20px; @@ -347,6 +348,7 @@ body .el-table th.gutter { background: #000; z-index: 3999; } -.el-message-box__wrapper{ + +.el-message-box__wrapper { z-index: 9999 !important; } \ No newline at end of file diff --git a/src/views/dictionary/institutions/components/SiteForm.vue b/src/views/dictionary/institutions/components/SiteForm.vue index f348b047..b86d9ff3 100644 --- a/src/views/dictionary/institutions/components/SiteForm.vue +++ b/src/views/dictionary/institutions/components/SiteForm.vue @@ -14,11 +14,17 @@ - + - + @@ -46,7 +52,7 @@ v-model="form.HospitalId" clearable placeholder="Please select" - style="width:100%;" + style="width: 100%" >
-
+
- Cancel - Save + Cancel + Save
@@ -91,8 +109,8 @@ export default { type: Object, default() { return {} - } - } + }, + }, }, data() { return { @@ -111,50 +129,42 @@ export default { ContactName: '', ContactPhone: '', UniqueCode: '', - Address: '' + Address: '', }, rules: { SiteName: [ { required: true, message: 'Please specify', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' } + // { max: 50, message: 'The maximum length is 50' } ], SiteNameCN: [ { required: true, message: 'Please specify', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' } + // { max: 50, message: 'The maximum length is 50' } ], SiteCode: [ { required: true, message: 'Please specify', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' } + { max: 50, message: 'The maximum length is 50' }, ], Country: [ { required: true, message: 'Please specify', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' } + { max: 50, message: 'The maximum length is 50' }, ], City: [ { required: true, message: 'Please specify', trigger: 'blur' }, - { max: 50, message: 'The maximum length is 50' } + { max: 50, message: 'The maximum length is 50' }, ], // HospitalId: [ // { required: true, message: 'Please specify', trigger: 'blur' } // ], Address: [ - { required: true, message: 'Please specify', trigger: 'blur' } + { required: true, message: 'Please specify', trigger: 'blur' }, ], - DirectorName: [ - { max: 50, message: 'The maximum length is 50' } - ], - DirectorPhone: [ - { max: 50, message: 'The maximum length is 50' } - ], - ContactName: [ - { max: 50, message: 'The maximum length is 50' } - ], - ContactPhone: [ - { max: 50, message: 'The maximum length is 50' } - ] + DirectorName: [{ max: 50, message: 'The maximum length is 50' }], + DirectorPhone: [{ max: 50, message: 'The maximum length is 50' }], + ContactName: [{ max: 50, message: 'The maximum length is 50' }], + ContactPhone: [{ max: 50, message: 'The maximum length is 50' }], }, loading: false, - show: false + show: false, } }, mounted() { @@ -163,20 +173,22 @@ export default { }, methods: { handleSave() { - this.$refs.siteForm.validate(valid => { + this.$refs.siteForm.validate((valid) => { if (!valid) return this.btnLoading = true - addOrUpdateSite(this.form).then(res => { - this.btnLoading = false - if (res.IsSuccess) { - this.$message.success('Saved successfully') - this.$refs['siteForm'].resetFields() - this.$emit('getList') - this.$emit('close') - } - }).catch(() => { - this.btnLoading = false - }) + addOrUpdateSite(this.form) + .then((res) => { + this.btnLoading = false + if (res.IsSuccess) { + this.$message.success('Saved successfully') + this.$refs['siteForm'].resetFields() + this.$emit('getList') + this.$emit('close') + } + }) + .catch(() => { + this.btnLoading = false + }) }) }, handleCancel() { @@ -189,8 +201,7 @@ export default { if (Object.keys(this.data).length && this.data.Id) { this.form = { ...this.data } } - } - } - + }, + }, } diff --git a/src/views/dictionary/template/email/components/EmailForm.vue b/src/views/dictionary/template/email/components/EmailForm.vue index 05704515..826fe320 100644 --- a/src/views/dictionary/template/email/components/EmailForm.vue +++ b/src/views/dictionary/template/email/components/EmailForm.vue @@ -23,6 +23,17 @@ + + + + + + @@ -329,6 +340,7 @@ export default { IsEnable: true, IsAutoSend: true, CriterionTypeEnum: null, + EmailDelaySeconds: null, }, rules: { Code: [{ required: true, message: 'Please select', trigger: ['blur'] }], diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue index d8b0a888..998bb368 100644 --- a/src/views/reviewers/components/Employment.vue +++ b/src/views/reviewers/components/Employment.vue @@ -212,96 +212,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
+ +
+ + +
{{ $t('system:reviewer:title:pay') }}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('common:button:save') }} + + + +
+ +
+ + \ No newline at end of file diff --git a/src/views/reviewers/components/ResearchPublication.vue b/src/views/reviewers/components/ResearchPublication.vue index 1e9beac5..d079c1fb 100644 --- a/src/views/reviewers/components/ResearchPublication.vue +++ b/src/views/reviewers/components/ResearchPublication.vue @@ -7,6 +7,7 @@ :model="researchForm" size="small" > +
{{ $t('system:reviewer:title:Research') }}
@@ -55,9 +56,10 @@ +
{{ $t('system:reviewer:title:Publications') }}
- + - - - +
{{ $t('system:reviewer:title:AH') }}
@@ -184,3 +184,13 @@ export default { }, } + diff --git a/src/views/reviewers/components/Summarize.vue b/src/views/reviewers/components/Summarize.vue new file mode 100644 index 00000000..1647a81d --- /dev/null +++ b/src/views/reviewers/components/Summarize.vue @@ -0,0 +1,132 @@ + + + \ No newline at end of file diff --git a/src/views/reviewers/curriculumVitae/components/file/certificate.vue b/src/views/reviewers/curriculumVitae/components/file/certificate.vue index 9b473438..752f7fa7 100644 --- a/src/views/reviewers/curriculumVitae/components/file/certificate.vue +++ b/src/views/reviewers/curriculumVitae/components/file/certificate.vue @@ -269,7 +269,9 @@ export default { openBox() { this.model_cfg.visible = true }, - handleCancle() {}, + handleCancle() { + this.model_cfg.visible = false + }, handleRemoveFile(row) { this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue index 82d771ef..ff940e23 100644 --- a/src/views/reviewers/curriculumVitae/components/info/info.vue +++ b/src/views/reviewers/curriculumVitae/components/info/info.vue @@ -6,26 +6,22 @@ @@ -227,6 +229,7 @@ export default { SummarizeInfo: {}, TrialExperienceView: {}, }, + dom: null, } }, computed: { @@ -240,15 +243,21 @@ export default { if (sessionStorage.getItem('reviewerId')) { this.reviewerId = sessionStorage.getItem('reviewerId') this.getDetail() + } else if (this.$route.query.id) { + this.reviewerId = this.$route.query.id + sessionStorage.setItem('reviewerId', this.reviewerId) + this.getDetail() } }, mounted() { + this.dom = document.getElementById('main') // 监听滚动事件 - window.addEventListener('scroll', this.onScroll) + this.dom.addEventListener('scroll', this.onScroll) }, destroy() { // 必须移除监听器，不然当该vue组件被销毁了，监听器还在就会出错 - window.removeEventListener('scroll', this.onScroll) + this.dom.removeEventListener('scroll', this.onScroll) + this.dom = null }, methods: { ...mapMutations({ setLanguage: 'lang/setLanguage' }), @@ -271,8 +280,8 @@ export default { const navContent = document.getElementById(key) if (navContent) { const scrollTop = navContent.offsetTop - document.body.scrollTop = scrollTop - document.documentElement.scrollTop = scrollTop + document.getElementById('main').scrollTop = scrollTop + // document.documentElement.scrollTop = scrollTop } }, onScroll() { @@ -284,8 +293,7 @@ export default { offsetTopArr.push(item.offsetTop) }) // 获取当前文档流的 scrollTop - const scrollTop = - document.documentElement.scrollTop || document.body.scrollTop + const scrollTop = document.getElementById('main').scrollTop // 定义当前点亮的导航下标 let navItem = null for (let n = 0; n < offsetTopArr.length; n++) { @@ -308,13 +316,17 @@ export default { } diff --git a/src/views/reviewers/new.vue b/src/views/reviewers/new.vue index bc31179a..67882132 100644 --- a/src/views/reviewers/new.vue +++ b/src/views/reviewers/new.vue @@ -17,6 +17,12 @@ > + + + + + + @@ -75,6 +84,7 @@ diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue index c0fa962a..1c084b27 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue @@ -118,15 +118,7 @@ export default { this.loading = false }) break - case 4: - searchData.ReadingExportType = 0 - getCommonEvaluationList_Export(searchData) - .then((res) => {}) - .catch(() => { - this.loading = false - }) - break - case 5: + case 1: searchData.ReadingExportType = 1 getCommonEvaluationList_Export(searchData) .then((res) => {}) @@ -134,7 +126,7 @@ export default { this.loading = false }) break - case 6: + case 2: searchData.ReadingExportType = 2 getCommonEvaluationList_Export(searchData) .then((res) => {}) @@ -142,6 +134,22 @@ export default { this.loading = false }) break + case 3: + searchData.ReadingExportType = 3 + getCommonEvaluationList_Export(searchData) + .then((res) => {}) + .catch(() => { + this.loading = false + }) + break + case 4: + searchData.ReadingExportType = 4 + getCommonEvaluationList_Export(searchData) + .then((res) => {}) + .catch(() => { + this.loading = false + }) + break case 7: getCommonJudgeRatioList_Export(searchData) .then((res) => {})