下载功能修改

src/views/trials/trials-inspection/components/pullImage/byTool.vue

@@ -17,7 +17,8 @@
                 <el-form ref="hirAEform" :model="hirAE" label-width="120px">
                     <el-form-item :label="$t('trials:inspection:pullImage:form:hirAEName')">
                         <span>{{ hirAE.CalledAE }}</span>
-                        <i class="el-icon-document-copy copy" @click="copy(hirAE.CalledAE)"></i>
+                        <i class="el-icon-document-copy copy"
+                            @click="copy(`${$t('trials:inspection:pullImage:form:hirAEName')}:${hirAE.CalledAE}\n${$t('trials:inspection:pullImage:form:hirAIP')}:${hirAE.IP}\n${$t('trials:inspection:pullImage:form:hirAPort')}:${hirAE.Port}`)"></i>
                     </el-form-item>
                     <el-form-item :label="$t('trials:inspection:pullImage:form:hirAIP')">
                         <span>{{ hirAE.IP }}</span>

src/views/trials/trials-inspection/components/view-study-list.vue

@@ -135,7 +135,7 @@
       <el-table-column align="center" prop="StudyInstanceUid" :label="$t('trials:audit:table:StudyInstanceUid')"
         show-overflow-tooltip min-width="180" sortable="custom"></el-table-column>
       <!--操作-->
-      <el-table-column :label="$t('common:action:action')" min-width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" min-width="240" fixed="right">
         <template slot-scope="scope">
           <!-- 影像 -->
           <el-button circle icon="el-icon-view" :title="$t('trials:inspection:button:image')"
@@ -149,6 +149,9 @@
           <!-- 诊断报告 -->
           <el-button circle icon="el-icon-document" @click.stop="report(scope.row)"
             :title="$t('trials:inspection:button:diagnosticReport')" disabled />
+          <!-- 下载影像 -->
+          <el-button v-hasPermi="['trials:trialsInspection:downloadImage']" circle icon="el-icon-download"
+            @click="getDownloadPatientStudyInfo([scope.row])" :title="$t('trials:inspection:button:downloadImage')" />
         </template>
       </el-table-column>
     </el-table>

src/views/trials/trials-inspection/index.vue

@@ -169,12 +169,15 @@
         <el-table-column prop="LatestPushTime" :label="$t('trials:inspection:table:latestReceiveTime')"
           show-overflow-tooltip min-width="180" sortable="custom"></el-table-column>
         <!--操作-->
-        <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
+        <el-table-column :label="$t('common:action:action')" min-width="140" fixed="right">
           <template slot-scope="scope">
             <el-button circle icon="el-icon-view" :title="$t('trials:trialsInspection:button:view')"
               @click.stop="handleOpenDialog(scope.row, 'study')" />
             <el-button circle v-hasPermi="['trials:trialsInspection:addTrials']" icon="el-icon-plus"
               :title="$t('trials:inspection:button:addTrials')" @click.stop="handleOpenDialog(scope.row, 'add')" />
+            <!-- 下载影像 -->
+            <el-button v-hasPermi="['trials:trialsInspection:downloadImage']" circle icon="el-icon-download"
+              @click="getDownloadPatientStudyInfo([scope.row])" :title="$t('trials:inspection:button:downloadImage')" />
             <!-- <el-button
               circle
               icon="el-icon-delete"
@@ -336,17 +339,23 @@ export default {
       data.forEach(patient => {
         if (Array.isArray(patient.StudyList) && patient.StudyList.length > 0) {
           patient.StudyList.forEach((study) => {
+            let arr = []
+            study.ModalityList.forEach(item => {
+              if (!arr.includes(item)) {
+                arr.push(item)
+              }
+            })
+            let str = arr.join('_')
+            if (study.StudyDIRPath && !study.dirHas) {
+              study.dirHas = true
+              let obj = {
+                name: `${study.PatientId}/${study.StudyTime.split(' ')[0]}_${str}/DICOMDIR`,
+                url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+              }
+              files.push(obj)
+            }
             if (Array.isArray(study.SeriesList) && study.SeriesList.length > 0) {
               study.SeriesList.forEach((series) => {
-                if (study.StudyDIRPath && !study.dirHas) {
-                  study.dirHas = true
-                  let obj = {
-                    name: `${study.PatientId}/${study.StudyTime.split(' ')[0]}_${series.Modality
-                      }/DICOMDIR`,
-                    url: this.OSSclientConfig.basePath + study.StudyDIRPath,
-                  }
-                  files.push(obj)
-                }
                 if (
                   Array.isArray(series.InstanceList) &&
                   series.InstanceList.length > 0
@@ -354,8 +363,7 @@ export default {
                   series.InstanceList.forEach((instance) => {
                     let fileName = instance.FileName || instance.Path.split('/').pop()
                     let obj = {
-                      name: `${study.PatientId}/${study.StudyTime.split(' ')[0]}_${series.Modality
+                      name: `${study.PatientId}/${study.StudyTime.split(' ')[0]}_${str}/IMAGE/${fileName}`,
-                        }/IMAGE/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
                     }
                     files.push(obj)