Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -290,7 +290,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span v-if="!scope.row.dicomInfo.failedFileCount">
+          <span v-if="!scope.row.dicomInfo.failedFileCount && !scope.row.dicomInfo.isInit">
             {{$t('trials:uploadDicomList:table:status1')}}</span>
           <span style="color:#409eff" v-else-if="!scope.row.dicomInfo.failedFileCount && scope.row.dicomInfo.isInit && btnLoading">{{$t('trials:uploadDicomList:table:status2')}}</span>
           <span style="color:#409eff" v-else-if="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record">{{$t('trials:uploadDicomList:table:status2')}}</span>
@@ -759,7 +759,8 @@ export default {
                   SubjectInfo: {},
                   failedFileCount: 0,
                   fileSize: 0,
-                  fileCount: 0
+                  fileCount: 0,
+                  isInit: false
                 },
 
                 uploadState: {
@@ -1101,7 +1102,7 @@ export default {
             IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload
           }).then(async res => {
             scope.uploadQueues[index].dicomInfo.failedFileCount = 0
-            scope.uploadQueues[index].isInit = true
+            scope.$set(scope.uploadQueues[index].dicomInfo, 'isInit', true)
             let dicomInfo = scope.uploadQueues[index].dicomInfo
             let seriesNum = scope.uploadQueues[index].seriesList.length
             let fileNum = scope.uploadQueues[index].fileList.length
@@ -1165,7 +1166,7 @@ export default {
                   return new Promise(async resolve1 => {
                     try {
                       let o = v.instanceList[ii]
-                      let name = `${v.instanceList[ii].instanceUid}_${v.instanceList[ii].file.webkitRelativePath}`
+                      let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`
                       if (o.isReUpload) {
                         dicomInfo.failedFileCount++
                         Record.Existed.push(name)
@@ -1368,8 +1369,15 @@ export default {
       })
         .then(() => {
           this.$refs.uploadForm.reset()
-          this.selectArr = []
           this.uploadQueues.splice(index, 1)
+          this.uploadQueues.forEach((v, i) => {
+            if (v.uploadState.record) {
+              v.uploadState.selected = false
+              this.$refs.dicomFilesTable.toggleRowSelection(v, true)
+            }
+            v.studyIndex = i
+          })
+          this.handleSelectionChange(this.uploadQueues)
         })
     },
     // 当选择项发生变化时收集待上传文件数据