diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index 4d5f1f0a..933f435d 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -5,6 +5,7 @@ :close-on-click-modal="false" :before-close="beforeClose" :append-to-body="true" + v-loading="btnLoading" class="downloadDicomAndNonedicom" > {{ title }} @@ -14,7 +15,6 @@ @@ -23,7 +23,6 @@ @@ -32,7 +31,6 @@ {{ $t('download:button:downloadAll') }} @@ -362,7 +360,7 @@ export default { return { files, name } }, handleOpenDialog(item) { - this.model_cfg.title = `${item.SubejctCode || ''}>${item.TaskBlindName}` + this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}` if (item.IsDicom) { this.modelList = item.DicomStudyList } else { diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 0fc3c45a..bb05d2a2 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -137,7 +137,7 @@ -
+
{{ $t('upload:dicom:uploadTitle') }} {{ $store.state.trials.uploadTip }}
@@ -297,7 +297,7 @@ {{ $t('trials:uploadDicomList:table:uploadNow') }}{{ scope.row.dicomInfo.failedFileCount }} / - {{ scope.row.dicomInfo.fileCount }}:[{{ + {{ scope.row.dicomInfo.fileCount }}: [{{ (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2) }}MB/{{ (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2) @@ -626,7 +626,7 @@ export default { }, // 打开弹窗 handleOpenDialog(item, list) { - this.model_cfg.title = `${item.SubejctCode || ''}>${item.TaskBlindName}` + this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}` this.modelList = item[list] this.model_cfg.visible = true }, 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 991d3103..663427b7 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 @@ -407,7 +407,7 @@ {{ $t('trials:uploadDicomList:table:uploadNow') }}{{ scope.row.dicomInfo.failedFileCount }} / - {{ scope.row.dicomInfo.fileCount }}:[{{ + {{ scope.row.dicomInfo.fileCount }}: [{{ (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2) }}MB/{{ (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2) @@ -1679,7 +1679,9 @@ export default { dicomInfo.failedFileCount++ Record.FileCount++ } else { - let path = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${ + let path = `/${params.trialId}/Image/${ + params.subjectId + }/${params.subjectVisitId}/${ dicomInfo.studyUid }/${scope.getGuid( dicomInfo.studyUid +