diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index 659c5c40..0564608d 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -44,6 +44,7 @@ v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" + :loading="loading" class="dicomFiles-table" @sort-change="handleSortByColumn" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }" @@ -185,6 +186,7 @@ export default { data() { return { title: null, + loading: false, list: [], searchData: defaultSearchData(), btnLoading: false, @@ -220,13 +222,16 @@ export default { this.searchData.TrialReadingCriterionId = this.Criterion.TrialReadingCriterionId this.searchData.SubjectCode = this.SubjectCode + this.loading = true let res = await getSubjectImageDownloadSelectList(this.searchData) + this.loading = false if (res.IsSuccess) { this.list = res.Result this.hasDicom = this.list.some((item) => item.IsDicom) this.hasNonedicom = this.list.some((item) => !item.IsDicom) } } catch (err) { + this.loading = false console.log(err) } }, diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue index c258168a..67bad8bc 100644 --- a/src/components/uploadDicomAndNonedicom/index.vue +++ b/src/components/uploadDicomAndNonedicom/index.vue @@ -7,12 +7,19 @@ class="uploadDicomAndNonedicom" > {{ title }} - - + + - + 01001 >Timepoint', + activeName: 'dicom', } }, methods: { diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue index 3bf44785..7b2e343c 100644 --- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue @@ -7,7 +7,7 @@ @@ -22,52 +22,128 @@ /> + > + + + + + + + + +
+ + {{ scope.row.FileCount }} + +
+
+ {{ scope.row.FileCount }} +
+ + +
+ +
+