排序

src/views/content_manage/course_manage/LiveCourse.vue

@@ -9,7 +9,7 @@
                 <div class="common-title-box">
                     <h3>直播课</h3>
                     <div class="btn-box">
-                        <el-button type="primary" size="small" @click="handleEdit">创建课程</el-button>
+                        <el-button type="primary" size="small" @click="handleEdit()">创建课程</el-button>
                     </div>
                 </div>
                 <div class="search-box">

src/views/content_manage/course_manage/RecordedCourse.vue

@@ -9,7 +9,7 @@
                 <div class="common-title-box">
                     <h3>录播课</h3>
                     <div class="btn-box">
-                        <el-button type="primary" size="small" @click="handleEdit">创建课程</el-button>
+                        <el-button type="primary" size="small" @click="handleEdit()">创建课程</el-button>
                     </div>
                 </div>
                 <div class="search-box">

src/views/content_manage/newspaper_manage/index.vue

@@ -9,7 +9,7 @@
                 <div class="common-title-box">
                     <h3>报纸管理</h3>
                     <div class="btn-box">
-                        <el-button type="primary" size="small" @click="handleEdit">创建报纸</el-button>
+                        <el-button type="primary" size="small" @click="handleEdit()">创建报纸</el-button>
                     </div>
                 </div>
                 <div class="search-box">
@@ -442,7 +442,17 @@ export default {
                     name: this.dataSort.prop,
                     asc: true
                 })
+            }else{
+                order_column_list = [{
+                    name: 'create_time',
+                    asc: false
+                }]
             }
+        }else{
+            order_column_list = [{
+                name: 'create_time',
+                asc: false
+            }]
         }
         let data = {
             key_word: this.searchInput.trim(),

src/views/organize_manage/PersonList.vue

@@ -76,6 +76,8 @@
                         :data="tableData"
                         style="width: 100%"
                         key="table"
+                        @sort-change="handleSort"
+                        :default-sort = dataSort
                         :max-height="tableHeight"
                         @selection-change="handleSelectionChange">
                         <el-table-column
@@ -83,7 +85,7 @@
                             width="40">
                         </el-table-column>
                         <el-table-column
-                            prop="name"
+                            prop="user_name"
                             label="用户名"
                             sortable="custom"
                             min-width="132"
@@ -200,13 +202,15 @@
                         style="width: 100%"
                         :max-height="tableHeight"
                         key="auditTable"
+                        @sort-change="handleSort"
+                        :default-sort = dataSorts
                         @selection-change="handleSelectionChange">
                         <el-table-column
                             type="selection"
                             width="40">
                         </el-table-column>
                         <el-table-column
-                            prop="name"
+                            prop="user_name"
                             label="用户名"
                             sortable="custom"
                             min-width="132"
@@ -439,7 +443,9 @@ export default {
         pageNumbers: window.localStorage.getItem('pageNumber-check')?Number(window.localStorage.getItem('pageNumber-check')):1,
         importFlag: false, // 批量导入flag
         info: null, 
-        total_count: 0
+        total_count: 0,
+        dataSort: {},
+        dataSorts: {}
     }
   },
   //计算属性 类似于data概念
@@ -450,12 +456,53 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    handleSort(value){
+        let dataSort = {
+            prop: value.prop,
+            order: value.order
+        }
+        if(this.tabsIndex===0){
+            this.dataSort = dataSort
+        }else{
+            this.dataSorts = dataSort
+        }
+        this.getList()
+    },
     // 查询列表
     getList(page){
         if(page){
             this.pageNumber = page
         }
         let MethodName = "/OrgServer/Manager/PageQuery/PageQueryPersonList";
+        let order_column_list = []
+        if(this.tabsIndex===0){
+            if(this.dataSort != {}){
+                if(this.dataSort.order=='descending'){
+                    order_column_list = [this.dataSort.prop + ':desc']
+                }else if(this.dataSort.order=='ascending'){
+                    // 升序不传值
+                    order_column_list = [this.dataSort.prop]
+                }else{
+                    order_column_list = ['register_time:desc']
+                }
+            }else{
+                order_column_list = ['register_time:desc']
+            }
+        }else{
+            if(this.dataSorts != {}){
+                if(this.dataSort.order=='descending'){
+                    order_column_list = [this.dataSorts.prop + ':desc']
+                }else if(this.dataSort.order=='ascending'){
+                    // 升序不传值
+                    order_column_list = [this.dataSorts.prop]
+                }else{
+                    order_column_list = ['apply_time:desc']
+                }
+            }else{
+                order_column_list = ['apply_time:desc']
+            }
+        }
+        
         let data = {
             org_id: this.id,
             search_content:this.searchInput.trim(),
@@ -464,7 +511,8 @@ export default {
             audit_status:this.tabsIndex===1?this.searchAuditStatus:-1,
             page_capacity:this.tabsIndex===0?this.pageSize:this.pageSizes,
             cur_page:this.tabsIndex===0?this.pageNumber:this.pageNumbers,
-            list_type: this.tabsIndex*1
+            list_type: this.tabsIndex*1,
+            order_column_list: order_column_list
         }
         getLogin(MethodName, data)
         .then((res) => {
@@ -596,7 +644,7 @@ export default {
     },
     handleChangeTabs(value){
         this.tabsIndex = value
-        this.pageNumber = 1
+        // this.pageNumber = 1
         this.getList()
     },
     // 批量导入

src/views/organize_manage/index.vue

@@ -9,7 +9,7 @@
                 <div class="common-title-box">
                     <h3>机构列表</h3>
                     <div class="btn-box">
-                        <el-button type="primary" size="small" @click="handleEdit">创建机构</el-button>
+                        <el-button type="primary" size="small" @click="handleEdit()">创建机构</el-button>
                     </div>
                 </div>
                 <div class="search-box">
@@ -68,6 +68,8 @@
                     class="search-table"
                     :data="tableData"
                     style="width: 100%"
+                    @sort-change="handleSort"
+                    :default-sort = dataSort
                     :max-height="tableHeight">
                     <el-table-column
                         prop="name"
@@ -83,7 +85,8 @@
                     <el-table-column
                         prop="person_count_audited"
                         label="成员数"
-                        width="85">
+                        sortable="custom"
+                        width="90">
                     </el-table-column>
                     <el-table-column
                         prop="status"
@@ -261,7 +264,8 @@ export default {
         pageSize: window.localStorage.getItem('pageSize')?Number(window.localStorage.getItem('pageSize')):10, 
         pageNumber: window.localStorage.getItem('pageNumber')?Number(window.localStorage.getItem('pageNumber')):1,
         tableHeight: "", // 表格高度
-        total_count: 0
+        total_count: 0,
+        dataSort: {}
     }
   },
   //计算属性 类似于data概念
@@ -272,12 +276,33 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    handleSort(value){
+        let dataSort = {
+            prop: value.prop,
+            order: value.order
+        }
+        this.dataSort = dataSort
+        this.getList()
+    },
     // 查询列表
     getList(page){
         if(page){
             this.pageNumber = page
         }
         let MethodName = "/OrgServer/Manager/PageQuery/PageQueryOrgList";
+        let order_column_list = []
+        if(this.dataSort != {}){
+            if(this.dataSort.order=='descending'){
+                order_column_list = [this.dataSort.prop + ':desc']
+            }else if(this.dataSort.order=='ascending'){
+                // 升序不传值
+                order_column_list = [this.dataSort.prop]
+            }else{
+                order_column_list = ['create_time:desc']
+            }
+        }else{
+            order_column_list = ['create_time:desc']
+        }
         let data = {
             name: this.searchInput.trim(),
             type: this.searchType,
@@ -285,7 +310,8 @@ export default {
             area_id: this.searchArea,
             creator_id: this.searchCreator,
             page_capacity:this.pageSize,
-            cur_page:this.pageNumber
+            cur_page:this.pageNumber,
+            order_column_list: order_column_list
         }
         getLogin(MethodName, data)
         .then((res) => {

src/views/people_manage/index.vue

@@ -9,7 +9,7 @@
                 <div class="common-title-box">
                     <h3>人员列表</h3>
                     <div class="btn-box">
-                        <el-button type="primary" size="small" @click="handleEdit">创建用户</el-button>
+                        <el-button type="primary" size="small" @click="handleEdit()">创建用户</el-button>
                     </div>
                 </div>
                 <div class="search-box">
@@ -48,6 +48,8 @@
                     class="search-table"
                     :data="tableData"
                     style="width: 100%"
+                    @sort-change="handleSort"
+                    :default-sort = dataSort
                     :max-height="tableHeight">
                     <el-table-column
                         prop="user_name"
@@ -224,7 +226,8 @@ export default {
         pageSize: window.localStorage.getItem('pageSize')?Number(window.localStorage.getItem('pageSize')):10, 
         pageNumber: window.localStorage.getItem('pageNumber')?Number(window.localStorage.getItem('pageNumber')):1,
         tableHeight: "", // 表格高度
-        total_count: 0
+        total_count: 0,
+        dataSort: {}
     }
   },
   //计算属性 类似于data概念
@@ -235,18 +238,40 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    handleSort(value){
+        let dataSort = {
+            prop: value.prop,
+            order: value.order
+        }
+        this.dataSort = dataSort
+        this.getList()
+    },
     // 查询列表
     getList(page){
         if(page){
             this.pageNumber = page
         }
         let MethodName = "/OrgServer/Manager/PageQuery/PageQuerySysUserList";
+        let order_column_list = []
+        if(this.dataSort != {}){
+            if(this.dataSort.order=='descending'){
+                order_column_list = [this.dataSort.prop + ':desc']
+            }else if(this.dataSort.order=='ascending'){
+                // 升序不传值
+                order_column_list = [this.dataSort.prop]
+            }else{
+                order_column_list = ['create_time:desc']
+            }
+        }else{
+            order_column_list = ['create_time:desc']
+        }
         let data = {
             search_content:this.searchInput.trim(),
             account_type:this.searchType,
             status:this.searchStatus,
             page_capacity:this.pageSize,
-            cur_page:this.pageNumber
+            cur_page:this.pageNumber,
+            order_column_list: order_column_list
         }
         getLogin(MethodName, data)
         .then((res) => {