From 3820146acb6c22f04fb81ef06ceca5866764ab3f Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 6 Aug 2024 16:34:44 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=A8=BD=E6=9F=A5bug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96=E7=AD=89=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/email-manage/index.vue | 2 +- .../components/staffExternalAdd.vue | 6 +- .../trial-summary/audit-record/index.vue | 85 +++++++------------ .../components/uploadDicomFiles2.vue | 2 + 4 files changed, 38 insertions(+), 57 deletions(-) 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..9e002b03 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 @@ -821,39 +821,40 @@ import Pagination from '@/components/Pagination' import BaseContainer from '@/components/BaseContainer' import BaseModel from '@/components/BaseModel' import { getToken } from '@/utils/auth' - +const searchDataDefault = () => { + return { + SortField: 'CreateTime', + Asc: false, + PageIndex: 1, + PageSize: 20, + ModuleType: null, + BlindName: null, + TrialId: '', + TrialSiteId: null, + SubjectId: null, + SubjectInfo: null, + SubjectVisitId: null, + VisitPlanInfo: null, + OptType: null, + ChildrenType: null, + Reason: null, + IsSign: null, + StartTime: null, + EndTime: null, + Description: null, + OpByUserName: null, + BatchId: null, + TrialReadingCriterionId: null, + RoleName:null, + TaskName: '', + CreateUserRealName: '' + } +} export default { components: { BaseContainer, Pagination, BaseModel }, dicts: ['OptType', 'ModuleType', 'ChildrenType'], data() { - const searchDataDefault = () => { - return { - SortField: 'CreateTime', - Asc: false, - PageIndex: 1, - PageSize: 20, - ModuleType: null, - BlindName: null, - TrialId: this.$route.query.trialId, - TrialSiteId: null, - SubjectId: null, - SubjectInfo: null, - SubjectVisitId: null, - VisitPlanInfo: null, - OptType: null, - ChildrenType: null, - Reason: null, - IsSign: null, - StartTime: null, - EndTime: null, - Description: null, - OpByUserName: null, - BatchId: null, - TrialReadingCriterionId: null, - RoleName:null, - TaskName: null - } - } + return { isViewer: true, otherData:[], @@ -1295,30 +1296,7 @@ export default { }) }, handleReset() { - this.searchData = Object.assign(this.searchData, { - SortField: '', - Asc: false, - PageIndex: 1, - PageSize: 20, - ModuleType: null, - BlindName: null, - TrialId: this.$route.query.trialId, - TrialSiteId: null, - SubjectId: null, - SubjectInfo: null, - SubjectVisitId: null, - VisitPlanInfo: null, - OptType: null, - ChildrenType: null, - Reason: null, - IsSign: null, - StartTime: null, - EndTime: null, - Description: null, - OpByUserName: null, - BatchId: null, - RoleName: null - }) + this.searchData = searchDataDefault() this.timeList = [] this.getList() }, @@ -1328,6 +1306,7 @@ export default { }, getList() { this.loading = true + this.searchData.TrialId = this.$route.query.trialId getInspectionList(this.searchData).then((res) => { this.list = res.CurrentPageData // this.list = this.list.map(v => { diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index b8c700a2..1a042ccd 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -213,6 +213,7 @@ name="file" ref="pathClear" :disabled="btnLoading" + title="" webkitdirectory multiple @change="beginScanFiles($event)" @@ -2015,6 +2016,7 @@ export default { opacity: 0; cursor: pointer; } + #inputForm #listWrapper { margin-top: 10px; From 385afa93f0d3a9d2ce5933ba787934203e642ce4 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 6 Aug 2024 17:13:05 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials/trials-panel/trial-summary/audit-record/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9e002b03..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 @@ -
+
{{$t('trials:auditRecord:title:signInfo')}}
@@ -777,7 +777,7 @@ -
+
{{$t('trials:auditRecord:title:signInfo')}}
From f1b0852b51d301e8ea7d5ef9779b70a392bf532e Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 7 Aug 2024 14:54:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?MFA=E5=80=92=E8=AE=A1=E6=97=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MFA/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 0a4c5026281694bd7a3f2f26a0c3201106a80a4e Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 7 Aug 2024 15:32:03 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=A8=A1=E5=9D=97=E4=B8=8B=E8=BD=BD=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enrollment/components/Submission.vue | 32 ++++++++++++++----- .../reading/dicoms/components/DicomCanvas.vue | 2 +- .../dicoms/customize/CustomizeDicomCanvas.vue | 2 +- 3 files changed, 26 insertions(+), 10 deletions(-) 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 From 4ad5462801bf6f45f2c02dab4ebc854f909d1055 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 7 Aug 2024 16:18:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=AD=97=E6=AE=B5=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dictionary/institutions/components/SiteForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dictionary/institutions/components/SiteForm.vue b/src/views/dictionary/institutions/components/SiteForm.vue index 351abb77..f348b047 100644 --- a/src/views/dictionary/institutions/components/SiteForm.vue +++ b/src/views/dictionary/institutions/components/SiteForm.vue @@ -18,7 +18,7 @@ - + From a85cf70df8989ec117d7b9b40d265b2709cd3ad8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 7 Aug 2024 17:27:21 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=AE=80=E5=8E=86=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/resumeInfo/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/resumeInfo/index.vue b/src/views/resumeInfo/index.vue index e5a5dad2..3a801144 100644 --- a/src/views/resumeInfo/index.vue +++ b/src/views/resumeInfo/index.vue @@ -1,14 +1,14 @@