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 2011f24c..2682c576 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 @@ -150,6 +150,7 @@ @@ -931,6 +932,7 @@ export default { if (item.ErrorMesseage) { this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload this.$refs.dicomFilesTable.toggleRowSelection(this.uploadQueues[i]) + this.uploadQueues[i].uploadState.selected = true const msg = `${item.ErrorMesseage}` messageArr.push(msg) } @@ -967,11 +969,22 @@ export default { await this.archiveStudy(index, res.OtherInfo) } } - this.uploadQueues = this.uploadQueues.filter(v => { - return !!v.uploadState.record.Failed.length + console.log(1) + this.$set(this, 'uploadQueues', [...this.uploadQueues.filter(v => { + return !v.uploadState.record || (v.uploadState.record && !!v.uploadState.record.Failed.length) + })]) + console.log(2) + this.$nextTick(() => { + this.selectArr = [] + this.uploadQueues.forEach(v => { + if (v.uploadState.record) { + v.uploadState.selected = false + this.$refs.dicomFilesTable.toggleRowSelection(v, true) + } + }) + this.$refs.pathClear.value = '' + this.btnLoading = false }) - this.$refs.pathClear.value = '' - this.btnLoading = false }).catch(_ => { this.btnLoading = false }) }, objectToQuery() { @@ -1038,6 +1051,7 @@ export default { fileCount: scope.uploadQueues[index].dicomInfo.fileCount, IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload }).then(async res => { + scope.uploadQueues[index].dicomInfo.failedFileCount = 0 let dicomInfo = scope.uploadQueues[index].dicomInfo let seriesNum = scope.uploadQueues[index].seriesList.length let fileNum = scope.uploadQueues[index].fileList.length @@ -1109,7 +1123,6 @@ export default { } else { let path = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}/${o.instanceUid}/${scope.getGuid(dicomInfo.studyUid + v.seriesUid + o.instanceUid + params.trialId)}` let res = await dcmUpload(path, o.file, config) - console.log('imageRes', res) if (!res || !res.url) { params.failedFileCount++ } else { @@ -1222,10 +1235,7 @@ export default { } else { scope.$alert(scope.$t('trials:uploadDicomList:label:uploadFailed')) } - // scope.uploadQueues[index].uploadState.selected = true - scope.uploadQueues[index].uploadState.selected = true scope.uploadQueues[index].uploadState.record = Record - // scope.$refs.dicomFilesTable.toggleRowSelection(scope.uploadQueues[index]) scope.getStudyInfo() if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') { scope.$emit('getList') @@ -1233,13 +1243,15 @@ export default { clearInterval(t) resolve() }).catch((res) => { - scope.uploadQueues[index].uploadState.record = Record reject() + scope.uploadQueues[index].uploadState.record = Record + scope.$alert(scope.$t('trials:uploadDicomList:label:generateLogFailed')) clearInterval(t) }) } else { - scope.$alert(scope.$t('trials:uploadDicomList:label:generateLogFailed')) reject() + scope.uploadQueues[index].uploadState.record = Record + scope.$alert(scope.$t('trials:uploadDicomList:label:generateLogFailed')) clearInterval(t) } }) diff --git a/src/views/trials/trials-workbench/components/spmRereadApproval.vue b/src/views/trials/trials-workbench/components/spmRereadApproval.vue index d025b1dc..d369ead7 100644 --- a/src/views/trials/trials-workbench/components/spmRereadApproval.vue +++ b/src/views/trials/trials-workbench/components/spmRereadApproval.vue @@ -52,7 +52,7 @@ />