diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index ae708f0f..0814cf64 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -302,7 +302,10 @@ /> {{ $t('trials:uploadDicomList:table:uploadNow') - }}{{ scope.row.dicomInfo.failedFileCount }}/{{ scope.row.dicomInfo.fileCount }} ({{ + }}{{ scope.row.dicomInfo.failedFileCount }}/{{ + scope.row.dicomInfo.fileCount + }} + ({{ (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2) }}MB/{{ (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2) @@ -483,6 +486,10 @@ export default { return {} }, }, + VisitTaskId: { + type: String, + default: '', + }, }, components: { 'study-view': studyView, @@ -556,6 +563,9 @@ export default { TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId, SubjectCode: this.SubjectCode, } + if (this.VisitTaskId) { + params.VisitTaskId = this.VisitTaskId + } this.loading = true let res = await getSubjectImageUploadList(params) this.loading = false diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue index 7b767b4e..1b3d5633 100644 --- a/src/components/uploadDicomAndNonedicom/index.vue +++ b/src/components/uploadDicomAndNonedicom/index.vue @@ -18,6 +18,7 @@ :SubjectId="SubjectId" :SubjectCode="SubjectCode" :Criterion="Criterion" + :VisitTaskId="VisitTaskId" /> @@ -60,6 +62,10 @@ export default { return {} }, }, + VisitTaskId: { + type: String, + default: '', + }, }, data() { return { diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue index 1ba2b9fd..9b54496c 100644 --- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue @@ -63,7 +63,7 @@ + /> @@ -122,7 +122,7 @@ + /> @@ -394,6 +394,10 @@ export default { return {} }, }, + VisitTaskId: { + type: String, + default: '', + }, }, data() { return { @@ -452,6 +456,9 @@ export default { this.searchData.TrialReadingCriterionId = this.Criterion.TrialReadingCriterionId this.searchData.SubjectCode = this.SubjectCode + if (this.VisitTaskId) { + this.searchData.VisitTaskId = this.VisitTaskId + } this.loading = true let res = await getIRUploadTaskNoneDicomStudyList(this.searchData) this.loading = false diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue index 70704988..2192fa44 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -719,6 +719,7 @@ :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible" + :VisitTaskId="taskId" /> {}) }, openUploadImage(status) { - const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask) + const idx = this.visitTaskList.findIndex((i) => i.IsCurrentTask) if (idx > -1) { this.taskId = this.visitTaskList[idx].VisitTaskId } diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue index dd903904..0fec6a0c 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue @@ -367,9 +367,7 @@ v-model="form.ImageDownloadEnum" :disabled=" isConfirm || - !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) || - form.IsReadingTaskViewInOrder === 0 || - form.IsReadingTaskViewInOrder === 1 + !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) " >