阅片下载压缩包名称修改

src/components/downloadDicomAndNonedicom/index.vue

@@ -1,39 +1,19 @@
 <template>
-  <el-dialog
+  <el-dialog :visible.sync="visible" :fullscreen="true" :close-on-click-modal="false" :before-close="beforeClose"
-    :visible.sync="visible"
+    :append-to-body="true" v-loading="btnLoading" class="downloadDicomAndNonedicom">
-    :fullscreen="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :append-to-body="true"
-    v-loading="btnLoading"
-    class="downloadDicomAndNonedicom"
-  >
     <span slot="title">{{ title }}</span>
     <div class="top">
       <span>{{ $t('download:top:title') }}</span>
       <div class="btnBox">
-        <el-button
+        <el-button type="primary" size="mini" v-if="hasDicom" @click.stop="getIRReadingDownloadStudyInfo('dicom')">
-          type="primary"
-          size="mini"
-          v-if="hasDicom"
-          @click.stop="getIRReadingDownloadStudyInfo('dicom')"
-        >
           {{ $t('download:button:downloadDicom') }}
         </el-button>
-        <el-button
+        <el-button type="primary" size="mini" v-if="hasNonedicom"
-          type="primary"
+          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')">
-          size="mini"
-          v-if="hasNonedicom"
-          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
-        >
           {{ $t('download:button:downloadNonedicom') }}
         </el-button>
-        <el-button
+        <el-button type="primary" size="mini" v-if="hasDicom || hasNonedicom"
-          type="primary"
+          @click.stop="getIRReadingDownloadStudyInfo('all')">
-          size="mini"
-          v-if="hasDicom || hasNonedicom"
-          @click.stop="getIRReadingDownloadStudyInfo('all')"
-        >
           {{ $t('download:button:downloadAll') }}
         </el-button>
       </div>
@@ -43,16 +23,9 @@
       <div v-html="$t('download:tip:message')"></div>
     </div>
     <!--上传列表@selection-change="handleSelectionChange"-->
-    <el-table
+    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
-      ref="dicomFilesTable"
+      class="dicomFiles-table" @sort-change="handleSortByColumn"
-      v-adaptive="{ bottomOffset: 85 }"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
-      height="100"
-      :data="list"
-      :loading="loading"
-      class="dicomFiles-table"
-      @sort-change="handleSortByColumn"
-      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
-    >
       <!-- <el-table-column
         type="selection"
         width="55"
@@ -60,50 +33,28 @@
       /> -->
       <el-table-column type="index" width="40" />
       <!--受试者-->
-      <el-table-column
+      <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
-        :label="$t('download:table:subjectCode')"
+        show-overflow-tooltip />
-        min-width="130"
-        prop="SubjectCode"
-        show-overflow-tooltip
-      />
       <!--任务名称-->
-      <el-table-column
+      <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
-        :label="$t('download:table:taskName')"
+        sortable="custom" />
-        min-width="130"
-        show-overflow-tooltip
-        prop="TaskBlindName"
-        sortable="custom"
-      />
       <!--检查类型-->
-      <el-table-column
+      <el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
-        :label="$t('download:table:studyType')"
+        sortable="custom">
-        min-width="130"
-        show-overflow-tooltip
-        prop="IsDicom"
-        sortable="custom"
-      >
         <template slot-scope="scope">
           <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('download:table:orginalStudyListNum')" min-width="150" show-overflow-tooltip>
-        :label="$t('download:table:orginalStudyListNum')"
-        min-width="150"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="
-            v-if="
+            (scope.row.IsDicom &&
-              (scope.row.IsDicom &&
+              scope.row.DicomStudyList &&
-                scope.row.DicomStudyList &&
+              scope.row.DicomStudyList.length >= 1) ||
-                scope.row.DicomStudyList.length >= 1) ||
+            (!scope.row.IsDicom &&
-              (!scope.row.IsDicom &&
+              scope.row.NoneDicomStudyList &&
-                scope.row.NoneDicomStudyList &&
+              scope.row.NoneDicomStudyList.length >= 1)
-                scope.row.NoneDicomStudyList.length >= 1)
+          " type="text" @click="handleOpenDialog(scope.row)">
-            "
-            type="text"
-            @click="handleOpenDialog(scope.row)"
-          >
             <span>{{
               scope.row.IsDicom
                 ? scope.row.DicomStudyList.length
@@ -113,37 +64,19 @@
           <span v-else>0</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="150">
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="150"
-      >
         <template slot-scope="scope">
           <!--预览--->
-          <el-button
+          <el-button circle icon="el-icon-view" :title="$t('download:button:preview')"
-            circle
+            @click.stop="preview(scope.row)" />
-            icon="el-icon-view"
-            :title="$t('download:button:preview')"
-            @click.stop="preview(scope.row)"
-          />
           <!--下载--->
-          <el-button
+          <el-button circle icon="el-icon-download" :title="$t('download:button:download')"
-            circle
+            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)" />
-            icon="el-icon-download"
-            :title="$t('download:button:download')"
-            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
-    <study-view
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
-      v-if="model_cfg.visible"
+      :IsDicom="IsDicom" :visitTaskId="modelTaskId" />
-      :model_cfg="model_cfg"
-      :modelList="modelList"
-      :bodyPart="bodyPart"
-      :IsDicom="IsDicom"
-      :visitTaskId="modelTaskId"
-    />
   </el-dialog>
 </template>
 <script>
@@ -358,7 +291,8 @@ export default {
         name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       if (this.IsReadingTaskViewInOrder === 0) {
-        name = `${list[0].TaskBlindName}.zip`
+        // name = `${list[0].TaskBlindName}.zip`
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       list.forEach((data) => {
         if (data.StudyList && data.StudyList.length > 0) {
@@ -370,11 +304,9 @@ export default {
                   series.InstancePathList.forEach((instance) => {
                     let fileName = instance.Path.split('/').pop()
                     let obj = {
-                      name: `${data.SubjectCode}/${
+                      name: `${data.SubjectCode}/${data.TaskBlindName
-                        data.TaskBlindName
+                        }/${this.$fd('IsDicom', true)}/${study.StudyCode
-                      }/${this.$fd('IsDicom', true)}/${
+                        }/${fileName}`,
-                        study.StudyCode
-                      }/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
                     }
                     if (this.IsReadingTaskViewInOrder === 0) {
@@ -500,10 +432,12 @@ export default {
   justify-content: space-between;
   margin: 10px 0;
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }