From 1f50eb9f1626d4a6a91343563b9de1be79c0c919 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Sat, 11 May 2024 18:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dicomAE/index.vue            | 45 ++++++++++++++-----
 src/views/system/notice/index.vue             | 22 ++++++++-
 .../components/research-trials-list.vue       | 10 +++++
 src/views/trials/trials-list/index.vue        |  3 ++
 .../hirVisit/components/current-study.vue     |  9 ++++
 .../hirVisit/components/studyInfo.vue         | 11 +++++
 .../subject-list/components/patient-list.vue  |  4 ++
 7 files changed, 91 insertions(+), 13 deletions(-)

diff --git a/src/views/system/dicomAE/index.vue b/src/views/system/dicomAE/index.vue
index d9d3e51..e1810e6 100644
--- a/src/views/system/dicomAE/index.vue
+++ b/src/views/system/dicomAE/index.vue
@@ -43,6 +43,9 @@
         height="100"
         :data="list"
         class="table"
+        ref="dicomAeTable"
+        @sort-change="handleSortChange"
+        :default-sort="{ prop: 'CreateTime', order: 'descending' }"
       >
         <!--AE Title-->
         <el-table-column
@@ -50,6 +53,7 @@
           prop="CalledAE"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         />
         <!--IP-->
         <el-table-column
@@ -57,6 +61,7 @@
           prop="IP"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         />
         <!--Port-->
         <el-table-column
@@ -64,6 +69,7 @@
           prop="Port"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         />
         <!--Modality-->
         <el-table-column
@@ -71,6 +77,7 @@
           prop="Modality"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         />
         <!--Description-->
         <el-table-column
@@ -78,6 +85,7 @@
           prop="Description"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         />
         <!--测试状态-->
         <el-table-column
@@ -85,6 +93,7 @@
           prop="IsTestOK"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         >
           <template slot-scope="scope">
             <el-tag :type="scope.row.IsTestOK ? 'success' : 'danger'">{{
@@ -98,6 +107,7 @@
           prop="CreateTime"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         />
         <!--最后测试时间-->
         <el-table-column
@@ -105,6 +115,7 @@
           prop="LatestTestTime"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         />
         <el-table-column
           :label="$t('system:dicom:table:action')"
@@ -154,19 +165,24 @@
 import Pagination from "@/components/Pagination";
 import editDicom from "./components/edit-dicom";
 import { getDicomAEList, deleteDiicomAE, testConnect } from "@/api/dicomAE.js";
+const defaultSearchData = () => {
+  return {
+    CalledAE: null,
+    IP: null,
+    Port: null,
+    PageIndex: 1,
+    PageSize: 10,
+    SortField: "CreateTime",
+    Asc: false,
+  };
+};
 export default {
   name: "dicomAE",
   components: { Pagination, editDicom },
   data() {
     return {
       // 查询
-      searchData: {
-        CalledAE: null,
-        IP: null,
-        Port: null,
-        PageIndex: 1,
-        PageSize: 10,
-      },
+      searchData: defaultSearchData(),
       total: 0,
       // 列表
       loading: false,
@@ -181,6 +197,14 @@ export default {
     this.getList();
   },
   methods: {
+    // 表格排序
+    handleSortChange(sort) {
+      this.searchData.SortField = sort.prop;
+      if (sort.order === "ascending") this.searchData.Asc = true;
+      if (sort.order === "descending") this.searchData.Asc = false;
+      if (!sort.order) this.searchData.SortField = null;
+      this.getList();
+    },
     // 获取列表
     async getList() {
       let data = {};
@@ -201,11 +225,8 @@ export default {
     },
     // 重置
     reset() {
-      Object.keys(this.searchData).forEach((key) => {
-        this.searchData[key] = null;
-      });
-      this.searchData.PageIndex = 1;
-      this.searchData.PageSize = 10;
+      this.searchData = defaultSearchData();
+      this.$refs.dicomAeTable.clearSort();
       this.getList();
     },
     // 打开弹框
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index df69d5a..abd7b40 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -104,12 +104,15 @@
         height="100"
         :data="list"
         class="table"
+        ref="noticeTable"
+        @sort-change="handleSortChange"
       >
         <el-table-column type="index" width="50" />
         <el-table-column
           :label="$t('system:notice:table:NoticeLevel')"
           prop="NoticeLevelEnum"
           min-width="120"
+          sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -128,6 +131,7 @@
           :label="$t('system:notice:table:NoticeType')"
           prop="NoticeTypeEnum"
           min-width="100"
+          sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -156,6 +160,7 @@
           :label="$t('system:notice:table:NoticeState')"
           prop="NoticeStateEnum"
           min-width="100"
+          sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -184,6 +189,7 @@
           :label="$t('system:notice:table:ApplicableProject')"
           prop="ApplicableProjectEnum"
           min-width="100"
+          sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -201,7 +207,7 @@
         <el-table-column
           :label="$t('system:notice:table:NoticeUserTypeList')"
           prop="NoticeUserTypeList"
-          min-width="80"
+          min-width="100"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -217,6 +223,7 @@
           prop="NoticeModeEnum"
           min-width="100"
           show-overflow-tooltip
+          sortable="custom"
         >
           <template slot-scope="scope">
             {{
@@ -235,6 +242,7 @@
           prop="StartDate"
           min-width="240"
           show-overflow-tooltip
+          sortable="custom"
         >
           <template slot-scope="scope">
             {{ scope.row.StartDate }}
@@ -245,18 +253,21 @@
           prop="PublishUserName"
           min-width="100"
           show-overflow-tooltip
+          sortable="custom"
         />
         <el-table-column
           :label="$t('system:notice:table:PublishedTime')"
           prop="PublishedTime"
           min-width="160"
           show-overflow-tooltip
+          sortable="custom"
         />
         <el-table-column
           :label="$t('system:notice:table:UpdateTime')"
           prop="UpdateTime"
           min-width="160"
           show-overflow-tooltip
+          sortable="custom"
         >
           <template slot-scope="scope">
             {{ scope.row.EndDate ? scope.row.EndDate : scope.row.CreateTime }}
@@ -268,6 +279,7 @@
           prop="FileName"
           min-width="120"
           show-overflow-tooltip
+          sortable="custom"
         >
           <template slot-scope="scope">
             <a
@@ -393,6 +405,14 @@ export default {
     this.getList();
   },
   methods: {
+    // 表格排序
+    handleSortChange(sort) {
+      this.searchData.SortField = sort.prop;
+      if (sort.order === "ascending") this.searchData.Asc = true;
+      if (sort.order === "descending") this.searchData.Asc = false;
+      if (!sort.order) this.searchData.SortField = null;
+      this.getList();
+    },
     handlePush(row) {
       this.loading = true;
       var params = { ...row };
diff --git a/src/views/trials/trials-inspection/components/research-trials-list.vue b/src/views/trials/trials-inspection/components/research-trials-list.vue
index 6985073..7d3c4b7 100644
--- a/src/views/trials/trials-inspection/components/research-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/research-trials-list.vue
@@ -30,6 +30,7 @@
       :data="list"
       stripe
       height="100"
+      :default-sort="{ prop: 'CreateTime', order: 'descending' }"
     >
       <el-table-column type="index" width="40" />
       <!--研究方案号-->
@@ -38,6 +39,7 @@
         :label="$t('trials:trials-list:table:researchNumber')"
         show-overflow-tooltip
         min-width="120"
+        sortable
       ></el-table-column>
       <!--试验名称-->
       <el-table-column
@@ -45,6 +47,7 @@
         :label="$t('trials:trials-list:table:experimentName')"
         show-overflow-tooltip
         min-width="120"
+        sortable
       ></el-table-column>
       <!--申办方-->
       <el-table-column
@@ -52,6 +55,7 @@
         :label="$t('trials:trials-list:table:sponsor')"
         show-overflow-tooltip
         min-width="120"
+        sortable
       ></el-table-column>
       <!--匹配受试者编号-->
       <el-table-column
@@ -59,6 +63,7 @@
         :label="$t('trials:inspectionTrials:table:subjectId')"
         show-overflow-tooltip
         min-width="140"
+        sortable
       ></el-table-column>
       <!--姓名-->
       <el-table-column
@@ -66,6 +71,7 @@
         :label="$t('trials:researchStaff:table:Name')"
         show-overflow-tooltip
         min-width="120"
+        sortable
       ></el-table-column>
       <!--年龄-->
       <el-table-column
@@ -73,6 +79,7 @@
         :label="$t('trials:subject:table:age')"
         show-overflow-tooltip
         min-width="120"
+        sortable
       ></el-table-column>
       <!--性别-->
       <el-table-column
@@ -80,6 +87,7 @@
         :label="$t('trials:subject:table:gender')"
         show-overflow-tooltip
         min-width="100"
+        sortable
       >
         <template slot-scope="scope">
           <span>{{ $fd("sex", scope.row.Sex) }}</span>
@@ -91,6 +99,7 @@
         :label="$t('trials:trials-list:table:status')"
         show-overflow-tooltip
         min-width="100"
+        sortable
       >
         <template slot-scope="scope">
           <el-tag
@@ -111,6 +120,7 @@
         :label="$t('trials:staff:table:joinTime')"
         show-overflow-tooltip
         min-width="140"
+        sortable
       ></el-table-column>
       <!--操作-->
       <el-table-column :label="$t('common:action:action')" min-width="100">
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index d939ecf..a6c4442 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -100,6 +100,7 @@
         height="100"
         @sort-change="handleSortChange"
         @row-click="handleDetail"
+        :default-sort="{ prop: 'createTime', order: 'descending' }"
       >
         <!-- <el-table-column type="selection" align="left" width="45" /> -->
         <el-table-column width="40">
@@ -222,6 +223,7 @@
           :label="$t('trials:trials-list:table:UnSubmitCount')"
           show-overflow-tooltip
           v-if="hasPermi(['role:pm'])"
+          sortable="custom"
         />
         <!--待阅片数量-->
         <el-table-column
@@ -229,6 +231,7 @@
           :label="$t('trials:trials-list:table:UnReadCount')"
           show-overflow-tooltip
           v-if="hasPermi(['role:pm', 'role:pi', 'role:sr'])"
+          sortable="custom"
         />
         <!--到期日-->
         <el-table-column
diff --git a/src/views/trials/trials-panel/hirVisit/components/current-study.vue b/src/views/trials/trials-panel/hirVisit/components/current-study.vue
index f09f5c4..012d23d 100644
--- a/src/views/trials/trials-panel/hirVisit/components/current-study.vue
+++ b/src/views/trials/trials-panel/hirVisit/components/current-study.vue
@@ -22,6 +22,7 @@
         stripe
         v-adaptive="{ bottomOffset: 60 }"
         height="300"
+        :default-sort="{ prop: 'StudyTime', order: 'descending' }"
       >
         <!-- <el-table-column type="selection" align="center" width="45" /> -->
         <!--患者编号-->
@@ -29,6 +30,7 @@
           align="center"
           prop="PatientIdStr"
           :label="$t('trials:uploadDicomList:table:pId')"
+          sortable
           show-overflow-tooltip
         ></el-table-column>
         <!-- 患者姓名 -->
@@ -36,6 +38,7 @@
           prop="PatientName"
           :label="$t('trials:uploadDicomList:table:patientName')"
           min-width="80"
+          sortable
           show-overflow-tooltip
         />
         <!--检查描述-->
@@ -44,6 +47,7 @@
           prop="Description"
           :label="$t('trials:inspection:table:studyDescription')"
           show-overflow-tooltip
+          sortable
           min-width="100"
         ></el-table-column>
         <!--检查类型-->
@@ -51,6 +55,7 @@
           align="center"
           prop="Modalities"
           :label="$t('trials:audit:table:modality')"
+          sortable
           show-overflow-tooltip
         ></el-table-column>
         <!--序列数量-->
@@ -58,6 +63,7 @@
           align="center"
           prop="SeriesCount"
           :label="$t('trials:audit:table:seriesCount')"
+          sortable
           show-overflow-tooltip
         ></el-table-column>
         <!--图像数量-->
@@ -65,6 +71,7 @@
           align="center"
           prop="InstanceCount"
           :label="$t('trials:audit:table:instanceCount')"
+          sortable
           show-overflow-tooltip
         ></el-table-column>
         <!--检查日期-->
@@ -72,6 +79,7 @@
           align="center"
           prop="StudyTime"
           :label="$t('trials:audit:table:studyDate')"
+          sortable
           show-overflow-tooltip
         ></el-table-column>
         <!--所属访视-->
@@ -79,6 +87,7 @@
           align="center"
           prop="VisitName"
           :label="$t('trials:hirVisit:table:ownershipVisit')"
+          sortable
           show-overflow-tooltip
         ></el-table-column>
         <!--操作-->
diff --git a/src/views/trials/trials-panel/hirVisit/components/studyInfo.vue b/src/views/trials/trials-panel/hirVisit/components/studyInfo.vue
index d2addd1..b21b69d 100644
--- a/src/views/trials/trials-panel/hirVisit/components/studyInfo.vue
+++ b/src/views/trials/trials-panel/hirVisit/components/studyInfo.vue
@@ -18,6 +18,7 @@
       style="width: 100%"
       v-adaptive="{ bottomOffset: 60 }"
       height="300"
+      :default-sort="{ prop: 'StudyTime', order: 'descending' }"
     >
       <!-- 患者编号 -->
       <el-table-column
@@ -25,6 +26,7 @@
         :label="$t('trials:uploadDicomList:table:pId')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       />
       <!-- 患者姓名 -->
       <el-table-column
@@ -32,6 +34,7 @@
         :label="$t('trials:uploadDicomList:table:patientName')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       />
       <!-- 检查编号 -->
       <el-table-column
@@ -39,16 +42,19 @@
         :label="$t('trials:uploadedDicoms:table:studyId')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="ModalityForEdit"
         :label="$t('trials:audit:table:modality')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="Modalities"
         :label="$t('trials:audit:table:modality1')"
+        sortable
       />
       <!--检查描述-->
       <el-table-column
@@ -57,6 +63,7 @@
         :label="$t('trials:inspection:table:studyDescription')"
         show-overflow-tooltip
         min-width="100"
+        sortable
       ></el-table-column>
       <!-- 序列数量 -->
       <el-table-column
@@ -64,6 +71,7 @@
         :label="$t('trials:uploadedDicoms:table:seriesCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 图像数量 -->
       <el-table-column
@@ -71,6 +79,7 @@
         :label="$t('trials:uploadedDicoms:table:instanceCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 检查日期 -->
       <el-table-column
@@ -78,6 +87,7 @@
         :label="$t('trials:uploadedDicoms:table:studyDate')"
         min-width="120"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           {{ moment(scope.row.StudyTime).format("YYYY-MM-DD") }}
@@ -88,6 +98,7 @@
         prop="UploadedTime"
         :label="$t('trials:uploadedDicoms:table:uploadedTime')"
         min-width="80"
+        sortable
         show-overflow-tooltip
       />
       <el-table-column
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue b/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue
index 7217076..f2fe138 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue
@@ -96,6 +96,7 @@
             :label="$t('trials:uploadDicomList:table:pId')"
             show-overflow-tooltip
             min-width="140"
+            sortable="custom"
           ></el-table-column>
           <!--患者姓名-->
           <el-table-column
@@ -103,6 +104,7 @@
             :label="$t('trials:uploadDicomList:table:patientName')"
             show-overflow-tooltip
             min-width="140"
+            sortable="custom"
           ></el-table-column>
           <!--出生日期-->
           <el-table-column
@@ -110,6 +112,7 @@
             :label="$t('trials:inspection:table:birthdate')"
             show-overflow-tooltip
             min-width="140"
+            sortable="custom"
           ></el-table-column>
           <!--性别-->
           <el-table-column
@@ -117,6 +120,7 @@
             :label="$t('trials:trials-myinfo:form:gender')"
             show-overflow-tooltip
             min-width="140"
+            sortable="custom"
           >
             <template slot-scope="scope">
               <span>{{ $fd("sex", scope.row.PatientSex) }}</span>