pacs拉取问题修复

src/views/trials/trials-inspection/components/pull-image-list.vue

@@ -225,7 +225,31 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" width="40" />
+      <el-table-column type="index" width="40">
+        <template slot-scope="scope">
+          <span
+            style="
+              display: flex;
+              align-items: center;
+              justify-content: flex-end;
+            "
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="$t('trials:inspection:pullImage:tip:has')"
+              placement="top"
+              style="margin-right: 3px"
+            >
+              <i
+                v-if="scope.row.IsStudyExist"
+                class="el-icon-success icon-i"
+              ></i>
+            </el-tooltip>
+            <span>{{ scope.$index + 1 }}</span>
+          </span>
+        </template>
+      </el-table-column>
       <!--patientID-->
       <el-table-column
         prop="PatientID"
@@ -247,7 +271,7 @@
         prop="PatientSex"
         :label="$t('trials:inspection:pullImage:table:patientSex')"
         show-overflow-tooltip
-        min-width="120"
+        min-width="80"
         sortable="custom"
       >
         <template slot-scope="scope">
@@ -302,13 +326,13 @@
         sortable="custom"
       />
       <!--bodyPartExamined-->
-      <el-table-column
+      <!-- <el-table-column
         prop="BodyPartExamined"
         :label="$t('trials:inspection:pullImage:table:bodyPartExamined')"
         show-overflow-tooltip
         min-width="120"
         sortable="custom"
-      />
+      /> -->
       <!--studyDescription-->
       <el-table-column
         prop="StudyDescription"
@@ -331,7 +355,8 @@
         <template slot-scope="scope">
           <el-button
             circle
-            icon="el-icon-download"
+            icon="el-icon-refresh"
+            class="refreshBtn"
             :title="$t('trials:inspection:button:pull')"
             @click.stop="pullImage(scope.row)"
           />
@@ -456,8 +481,10 @@ export default {
             onClick: (picker) => {
               const end = new Date()
               const start = new Date()
-              if (!this.timeFrame || this.timeFrame > 30) {
+              let month = this.$moment().subtract(1, 'months')
-                start.setTime(start.getTime() - 3600 * 1000 * 24 * 29)
+              let day = this.$moment().diff(month, 'day')
+              if (!this.timeFrame || this.timeFrame > day) {
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * (day - 1))
               } else {
                 start.setTime(
                   start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
@@ -472,8 +499,10 @@ export default {
             onClick: (picker) => {
               const end = new Date()
               const start = new Date()
-              if (!this.timeFrame || this.timeFrame > 90) {
+              let month = this.$moment().subtract(3, 'months')
-                start.setTime(start.getTime() - 3600 * 1000 * 24 * 89)
+              let day = this.$moment().diff(month, 'day')
+              if (!this.timeFrame || this.timeFrame > day) {
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * (day - 1))
               } else {
                 start.setTime(
                   start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
@@ -563,7 +592,10 @@ export default {
             let message = this.$t(
               'trials:inspection:pullImage:confirm:limit50'
             ).replace('xx', MaxStudyCount)
-            this.$confirm(message)
+            this.$confirm(message, 'hahaha', {
+              type: 'warning',
+              showCancelButton: false,
+            })
           }
         }
       } catch (err) {
@@ -577,7 +609,7 @@ export default {
         CalledAE: null,
         IP: null,
         Port: null,
-        // PacsTypeEnum: 2,
+        PacsTypeEnum: 2,
         PageIndex: 1,
         PageSize: 1000,
         SortField: 'CreateTime',
@@ -635,10 +667,10 @@ export default {
     // 表格排序
     handleSortByColumn(sort) {
       if (sort.order === 'ascending') {
-        this.list.sort((a, b) => a[sort.prop] - b[sort.prop])
+        this.list.sort((a, b) => (a[sort.prop] > b[sort.prop] ? 1 : -1))
       }
       if (sort.order === 'descending') {
-        this.list.sort((a, b) => b[sort.prop] - a[sort.prop])
+        this.list.sort((a, b) => (b[sort.prop] > a[sort.prop] ? 1 : -1))
       }
       this.paging()
     },
@@ -669,13 +701,19 @@ export default {
           }
         })
         let message = this.$t('trials:inspection:pullImage:confirm:pull')
+        let patientMessage = ''
         if (isPullList.length > 0) {
-          message =
+          isPullList.forEach((key) => {
-            isPullList.join('<br/>') +
+            patientMessage += `患者：${r[key].PatientName}，检查申请号：${r[key].AccessionNumber}<br/>`
-            '<br/>' +
+          })
-            this.$t('trials:inspection:pullImage:message:isHasPull') +
+          if (patientMessage) {
-            ',' +
+            message =
-            message
+              patientMessage +
+              '<br/>' +
+              this.$t('trials:inspection:pullImage:message:isHasPull') +
+              '，' +
+              message
+          }
         }
         let confirm = await this.$confirm(message, '', {
           dangerouslyUseHTMLString: true,
@@ -700,4 +738,18 @@ export default {
     },
   },
 }
-</script>
+</script>
+<style lang="scss" scoped>
+.icon-i {
+  color: #67c23a;
+  cursor: pointer;
+}
+.refreshBtn {
+  // transform: rotate(0);
+  transition: 0.5s;
+  &:hover {
+    transform: rotate(180deg);
+    transition: 0.5s;
+  }
+}
+</style>

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

@@ -69,6 +69,15 @@
       :default-sort="{ prop: 'StudyTime', order: 'descending' }"
     >
       <el-table-column type="index" width="40" />
+      <!--检查申请号-->
+      <el-table-column
+        align="center"
+        prop="AccessionNumber"
+        :label="$t('trials:inspection:table:AccessionNumber')"
+        show-overflow-tooltip
+        min-width="120"
+        sortable="custom"
+      ></el-table-column>
       <!--检查描述-->
       <el-table-column
         align="center"