Merge branch 'lihuilin/feature-20250623164044-金币前端' into milestone-20250623-金币前端

src/views/audit/refundAudit.vue

@@ -64,7 +64,7 @@
       任务金币：{{ stats.taskGolds.toFixed(2) }}金币
     </div>
 
-    <el-table :data="tableData" height="540px">
+    <el-table :data="tableData" height="540px" @sort-change="handleSortChange">
       <el-table-column type="index" label="序号" width="60" />
       <el-table-column prop="name" label="姓名" width="120" />
       <el-table-column prop="jwcode" label="精网号" width="120" />
@@ -88,7 +88,7 @@
       </el-table-column>
       <el-table-column prop="freeGold" label="免费金币" width="120" sortable="custom">
         <template #default="{ row }">
-          {{ (row.freeJune + row.freeDecember) / 100}}
+          {{ (row.freeJune + row.freeDecember) / 100 }}
         </template>
       </el-table-column>
       <el-table-column prop="taskGold" label="任务金币" width="120" sortable="custom">
@@ -173,7 +173,7 @@ const searchForm = ref({
   market: '',
   startTime: '',
   endTime: '',
-  auditStatus: '0',
+  auditStatus: '0'
 })
 const checkTab = ref('pending') // 能否不用STATUS常量，0是待审批，1是已通过，2是驳回，参数status需要Integer
 const dateRange = ref([])
@@ -212,18 +212,6 @@ const rules = reactive({
   reason: [{ required: true, message: '请输入驳回理由', trigger: 'blur' }]
 })
 
-// 获取用户信息
-// const getAdminInfo = async () => {
-//   try {
-//     const res = await API({ url: '' })
-//     adminInfo.value = res
-//     if (res.market !== '总部') {
-//       searchForm.value.market = res.market
-//     }
-//   } catch (error) {
-//     console.error('获取用户信息失败', error)
-//   }
-// }
 const handlePageSizeChange = function (val) {
   pagination.value.pageSize = val
   get()
@@ -234,6 +222,28 @@ const handleCurrentChange = function (val) {
   get()
   console.log('aaaaaaaaaaaaaaa这是pageNum改变调用')
 }
+// 处理排序事件
+const handleSortChange = (column) => {
+  if (column.prop === 'sumGold') {
+    sortField.value = 'sum_gold'
+  } else if (column.prop === 'permanentGold') {
+    sortField.value = 'permanent_gold'
+  } else if (column.prop === 'freeGold') {
+    sortField.value = 'free_gold'
+  }else if (column.prop === 'taskGold') {
+    sortField.value = 'task_gold'
+  }else if (column.prop === 'createTime') {
+    sortField.value = 'create_time'
+  }else if (column.prop === 'auditTime') {
+    sortField.value = 'audit_time'
+  } else {
+    sortField.value = ''
+  }
+  sortOrder.value = column.order === 'ascending' ? 'asc' : 'desc'
+  console.log('排序字段：', sortField.value)
+  console.log('排序方式：', sortOrder.value)
+  get()
+}
 // 显示驳回对话框
 const showRejectDialog = (row) => {
   scopeValue.value = row
@@ -276,14 +286,16 @@ const get = async function (val) {
       pageNum: pagination.value.pageNum,
       pageSize: pagination.value.pageSize,
       refundAudit: {
-        ...searchForm.value
+        ...searchForm.value,
+        sortField:sortField.value,
+        sortOrder:sortOrder.value
       }
     }
     console.log('看看传给后端的参数：', params)
     const res = await API({ url: '/audit/selectRefund', data: params })
     tableData.value = res.list || []
     pagination.value.total = res.total || 0
-    console.log('查全部的total', pagination.value.total,res.total)
+    console.log('查全部的total', pagination.value.total, res.total)
   } catch (error) {
     console.error('获取数据失败', error)
   }
@@ -351,7 +363,7 @@ const getStats = async () => {
     stats.value.permanentGolds = res.permanentGolds / 100
     stats.value.freeGolds = res.freeGolds / 100
     stats.value.taskGolds = res.taskGolds / 100
-    console.log('see see stats和搜索对象', stats.value,params)
+    console.log('see see stats和搜索对象', stats.value, params)
   } catch (error) {
     console.log('请求失败', error)
   }
@@ -371,9 +383,11 @@ const resetSearch = function () {
     jwcode: '',
     refundType: '',
     goodsName: '',
-    market: adminInfo.value.market === '总部' ? '' : adminInfo.value.market,
+    market: '',
     startTime: '',
-    endTime: ''
+    endTime: '',
+  sortField:'',
+  sortOrder:'',
   }
   dateRange.value = []
 }
@@ -381,16 +395,8 @@ const resetSearch = function () {
 // 今天
 const getToday = function () {
   const today = new Date()
-  const startTime = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate()
-  )
-  const endTime = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() + 1
-  )
+  const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate())
+  const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
   dateRange.value = [startTime, endTime]
   console.log('dateRange', dateRange.value)
   get()
@@ -402,16 +408,8 @@ const getToday = function () {
 const getYesterday = function () {
   const yesterday = new Date()
   yesterday.setDate(yesterday.getDate() - 1)
-  const startTime = new Date(
-    yesterday.getFullYear(),
-    yesterday.getMonth(),
-    yesterday.getDate()
-  )
-  const endTime = new Date(
-    yesterday.getFullYear(),
-    yesterday.getMonth(),
-    yesterday.getDate() + 1
-  )
+  const startTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate())
+  const endTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate() + 1)
   dateRange.value = [startTime, endTime]
   console.log('dateRange', dateRange.value)
   get()
@@ -422,16 +420,8 @@ const getYesterday = function () {
 // 近7天
 const get7Days = function () {
   const today = new Date()
-  const startTime = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() - 6
-  )
-  const endTime = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() + 1
-  )
+  const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6)
+  const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
   dateRange.value = [startTime, endTime]
   console.log('dateRange', dateRange.value)
   get()