diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue index 4642b0a8..73310696 100644 --- a/src/components/MFA/index.vue +++ b/src/components/MFA/index.vue @@ -167,6 +167,7 @@ export default { this.timer = setInterval(() => { this.second--; if (this.second <= 0) { + this.flag = false; clearInterval(this.timer); this.timer = null; } @@ -201,7 +202,7 @@ export default { margin-right: 5px; } } -::v-deep .el-dialog__header{ +::v-deep .el-dialog__header { font-weight: bold; } \ No newline at end of file diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue index b6baaeaf..22e268b1 100644 --- a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue +++ b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue @@ -231,7 +231,13 @@ export default { window.open(href, '_blank') }, handleDownloadAll() { - this.dialogVisible = true + // 英文环境直接下载 + if (process.env.NODE_ENV === 'usa') { + this.language = 2 + this.handleDownloadResumes() + } else { + this.dialogVisible = true + } }, getFileData(fileUrl) { return new Promise((resolve, reject) => { @@ -285,11 +291,16 @@ export default { language: this.language }).then(async res => { this.selectTable = {}; - for (let i = 0; res.Result.length > i; i++) { - let item = res.Result[i] - await this.handleBatchDown(item) - } this.dialogVisible = false + if (!res.Result || res.Result.length === 0) { + this.$alert(this.$t('trials:seletctedReviews:table:noResume')) + }else{ + for (let i = 0; res.Result.length > i; i++) { + let item = res.Result[i] + await this.handleBatchDown(item) + } + } + }).catch(err=>{ this.dialogVisible = false; this.selectTable= {}; @@ -305,9 +316,14 @@ export default { downloadResume(this.$route.query.trialId, this.language, arr).then(res => { window.open(res.Result) }) }, handleDownload(row) { - // this.downloadResume([row.Id]) - this.dialogVisible = true; - this.selectTable = row; + this.selectTable = row + // 英文环境直接下载 + if (process.env.NODE_ENV === 'usa') { + this.language = 2 + this.handleDownloadResumes() + } else { + this.dialogVisible = true + } } } } diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue index 6b44c1af..367eb35e 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -1054,7 +1054,7 @@ export default { this.stack.studyId = dicomSeries.studyId this.stack.seriesNumber = dicomSeries.seriesNumber this.stack.imageIds = dicomSeries.imageIds - this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0 + this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0 this.stack.imageIdIndex = dicomSeries.imageIdIndex this.stack.firstImageLoading = true this.stack.visitTaskId = dicomSeries.visitTaskId diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue index 6d0f7af5..319140db 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue @@ -1038,7 +1038,7 @@ export default { this.stack.studyId = dicomSeries.studyId this.stack.seriesNumber = dicomSeries.seriesNumber this.stack.imageIds = dicomSeries.imageIds - this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0 + this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0 this.stack.imageIdIndex = dicomSeries.imageIdIndex this.stack.firstImageLoading = true this.stack.visitTaskId = dicomSeries.visitTaskId diff --git a/src/views/trials/trials-panel/setting/email-manage/index.vue b/src/views/trials/trials-panel/setting/email-manage/index.vue index a1eafb8f..d3b01b3d 100644 --- a/src/views/trials/trials-panel/setting/email-manage/index.vue +++ b/src/views/trials/trials-panel/setting/email-manage/index.vue @@ -8,7 +8,7 @@ ref="emailRulesForm" v-loading="loading" :model="form" - style="width:800px;" + style="width:800px;margin-top: 10px;" :rules="rules" label-width="230px" size="small" diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue index bcdc0f18..6d68152e 100644 --- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue +++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue @@ -144,9 +144,9 @@ export default { { min: 0, max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`, trigger: 'blur' } ], UserTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }], - Phone: [ - { required: false, validator: checkPhone, trigger: ['blur'] } - ], + // Phone: [ + // { required: false, validator: checkPhone, trigger: ['blur'] } + // ], Email: [ { required: true, validator: validateEmail, trigger: ['blur'] } ] diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue index 198bc486..de50ee7c 100644 --- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue +++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue @@ -439,7 +439,7 @@ -