Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test

src/views/information/memberPointInfo/index.vue

@@ -61,6 +61,7 @@
           lass="content"
           style="width: 100%;"
           :row-class-name="tableRowClassName"
+          @sort-change="sortChange"
         >
           <el-table-column type="selection" />
 
@@ -80,16 +81,19 @@
             align="center"
             prop="pointCount"
             label="子点位总数"
+            sortable="custom"
           />
           <el-table-column
             align="center"
             prop="waitPointCount"
             label="待激活点位总数"
+            sortable="custom"
           />
           <el-table-column
             align="center"
             prop="repPvBalance"
             label="复购业绩余额"
+            sortable="custom"
           />
 
         </el-table>
@@ -117,7 +121,9 @@ const initParmas = {
   pageNum: 1,
   pageSize: 50,
   memberSettlePeriodId: '',
-  memberCode: ''
+  memberCode: '',
+  sort: '',
+  sortColumn: ''
 }
 export default {
   name: 'MemberPointInfo',
@@ -191,6 +197,8 @@ export default {
         ...initParmas
       }
       this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0].pkId
+      // 清除表格排序状态
+      this.$refs.table.clearSort()
       this.handleSearch()
     },
     tableRowClassName({ row, rowIndex }) {
@@ -203,6 +211,27 @@ export default {
     },
     copyContent(content) {
       // this.$message.success('复制成功')
+    },
+    // 处理表格排序
+    sortChange({ column, prop, order }) {
+      if (order) {
+        // 根据字段名映射到后端需要的排序字段名
+        const sortColumnMap = {
+          pointCount: 'POINT_COUNT',
+          waitPointCount: 'WAIT_POINT_COUNT',
+          repPvBalance: 'REP_PV_BALANCE'
+        }
+
+        this.queryParams.sortColumn = sortColumnMap[prop] || ''
+        this.queryParams.sort = order === 'ascending' ? 'ASC' : 'DESC'
+      } else {
+        // 取消排序
+        this.queryParams.sortColumn = ''
+        this.queryParams.sort = ''
+      }
+
+      // 重新加载数据
+      this.handleSearch()
     }
 
   }
@@ -225,10 +254,6 @@ export default {
 ::v-deep .el-date-editor .el-range__icon{
   margin-top: -10px;
 }
-::v-deep .el-input__inner{
-  //height:28px;
-  //line-height: 28px;
-}
 ::v-deep .el-form-item__label{
   color: #333;
   font-weight: inherit;