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' }"
>
{{
@@ -98,6 +107,7 @@
prop="CreateTime"
min-width="120"
show-overflow-tooltip
+ sortable="custom"
/>
{
+ 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"
>
@@ -128,6 +131,7 @@
:label="$t('system:notice:table:NoticeType')"
prop="NoticeTypeEnum"
min-width="100"
+ sortable="custom"
show-overflow-tooltip
>
@@ -156,6 +160,7 @@
:label="$t('system:notice:table:NoticeState')"
prop="NoticeStateEnum"
min-width="100"
+ sortable="custom"
show-overflow-tooltip
>
@@ -184,6 +189,7 @@
:label="$t('system:notice:table:ApplicableProject')"
prop="ApplicableProjectEnum"
min-width="100"
+ sortable="custom"
show-overflow-tooltip
>
@@ -201,7 +207,7 @@
@@ -217,6 +223,7 @@
prop="NoticeModeEnum"
min-width="100"
show-overflow-tooltip
+ sortable="custom"
>
{{
@@ -235,6 +242,7 @@
prop="StartDate"
min-width="240"
show-overflow-tooltip
+ sortable="custom"
>
{{ scope.row.StartDate }}
@@ -245,18 +253,21 @@
prop="PublishUserName"
min-width="100"
show-overflow-tooltip
+ sortable="custom"
/>
{{ scope.row.EndDate ? scope.row.EndDate : scope.row.CreateTime }}
@@ -268,6 +279,7 @@
prop="FileName"
min-width="120"
show-overflow-tooltip
+ sortable="custom"
>
@@ -38,6 +39,7 @@
:label="$t('trials:trials-list:table:researchNumber')"
show-overflow-tooltip
min-width="120"
+ sortable
>
{{ $fd("sex", scope.row.Sex) }}
@@ -91,6 +99,7 @@
:label="$t('trials:trials-list:table:status')"
show-overflow-tooltip
min-width="100"
+ sortable
>
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' }"
>
@@ -222,6 +223,7 @@
:label="$t('trials:trials-list:table:UnSubmitCount')"
show-overflow-tooltip
v-if="hasPermi(['role:pm'])"
+ sortable="custom"
/>
@@ -29,6 +30,7 @@
align="center"
prop="PatientIdStr"
:label="$t('trials:uploadDicomList:table:pId')"
+ sortable
show-overflow-tooltip
>
@@ -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"
>
@@ -51,6 +55,7 @@
align="center"
prop="Modalities"
:label="$t('trials:audit:table:modality')"
+ sortable
show-overflow-tooltip
>
@@ -58,6 +63,7 @@
align="center"
prop="SeriesCount"
:label="$t('trials:audit:table:seriesCount')"
+ sortable
show-overflow-tooltip
>
@@ -65,6 +71,7 @@
align="center"
prop="InstanceCount"
:label="$t('trials:audit:table:instanceCount')"
+ sortable
show-overflow-tooltip
>
@@ -72,6 +79,7 @@
align="center"
prop="StudyTime"
:label="$t('trials:audit:table:studyDate')"
+ sortable
show-overflow-tooltip
>
@@ -79,6 +87,7 @@
align="center"
prop="VisitName"
:label="$t('trials:hirVisit:table:ownershipVisit')"
+ sortable
show-overflow-tooltip
>
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' }"
>
{{ 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
/>
{{ $fd("sex", scope.row.PatientSex) }}