Merge branch 'master' of http://47.107.245.0:3000/xiongxing/kyj-yanglao-web-new

src/components/Table2/index.vue

@@ -6,6 +6,7 @@
     :maxHeight="props.height ? props.height : tableHeight()"
     @selection-change="handleSelectionChange"
     @row-click="handleRowClick"
+    @sort-change="handleSortChange"
   >
     <el-table-column width="35" v-if="isResolve || isRadio" fixed>
       <template #default="scope">
@@ -40,6 +41,7 @@
         :formatter="item.format ? (item.format2 ? dateFormatter : dateFormatter2) : undefined"
         :width="item.width"
         :fixed="item.fixed ? true : false"
+        :sortable="item.sortable || false"
       />
       <!-- 字典值渲染 -->
       <el-table-column
@@ -645,6 +647,7 @@ const emit = defineEmits([
   'print',
   'selectionChange',
   'row-click',
+  'sortChange',
   'checkIn',
   'upload',
   'check',
@@ -681,6 +684,10 @@ const handleRowClick = (row) => {
   emit('row-click', row)
 }
 
+const handleSortChange = (val) => {
+  emit('sortChange', val)
+}
+
 const handleCheckIn = (row) => {
   emit('checkIn', row)
 }

src/views/elderly/elder/column.ts

@@ -156,7 +156,8 @@ export const ElderFileColumns = reactive([
     label: '入住日期',
     field: 'checkInTime',
     format: true,
-    width: 150
+    width: 150,
+    sortable:'custom'
   },
   {
     label: '退住日期',
@@ -196,7 +197,8 @@ export const ElderFileColumns = reactive([
   {
     label: '合同号',
     field: 'contractNumber',
-    width: 150
+    width: 150,
+    sortable:'custom'
   },
   {
     label: '档案号',

src/views/elderly/elder/elder-file/index.vue

@@ -58,6 +58,7 @@
       :queryParams="queryParams"
       @edit="openForm"
       @detail="openDetail"
+      @sort-change="handleSortChange"
     />
 
     <!-- 分页 -->
@@ -151,6 +152,8 @@ const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据
 const queryParams = reactive({
+  prop: '',
+  order: '',
   pageNo: 1,
   pageSize: 10,
   elderName: undefined,
@@ -276,6 +279,22 @@ const openDetail = (row: any = {}) => {
   })
 }
 
+const handleSortChange = (val) => {
+  queryParams.prop = val.prop
+  if(val.order === 'ascending'){
+    queryParams.order = 'asc'
+  }else if(val.order === 'descending'){
+    queryParams.order = 'desc'
+  }else{
+    queryParams.order = ''
+  }
+  if (queryParams.pageNo === 1) {
+    getList()
+  } else {
+    queryParams.pageNo = 1
+  }
+}
+
 const ids = ref([])
 const handleSelection = (val) => {
   ids.value = val.map(item => item.id)