From e0087c482e91e713a3426deba6d5080bdd7104eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com>
Date: Thu, 30 Apr 2026 17:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/BasicTable/index.vue  |  3 ++-
 .../views/shuJuTianBao/shengPiJiLu/index.vue  | 21 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/BasicTable/index.vue b/frontend/src/components/BasicTable/index.vue
index aaedb59..983aec4 100644
--- a/frontend/src/components/BasicTable/index.vue
+++ b/frontend/src/components/BasicTable/index.vue
@@ -103,10 +103,11 @@ const getList = async (filter?: Record<string, any>) => {
   try {
     // 合并基础分页参数、外部搜索参数和临时参数
     const params = {
-      // ...props.searchParams,
+      ...props.searchParams,
       skip: page.value,
       take: size.value,
       filter: filter,
+      
       // 如果后端需要 skip/take 格式，可以在此转换
       // skip: (page.value - 1) * size.value,
       // take: size.value,
diff --git a/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue b/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
index e5a7112..c88c381 100644
--- a/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
+++ b/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
@@ -3,7 +3,7 @@
         <!-- 搜索区域组件，具体 props 需根据实际子组件调整 -->
         <GuoYuSheShiShuJuTianBaoSearch @search-finish="handleSearchFinish" @reset="handleReset" />
         <!-- 主表格 -->
-        <BasicTable ref="tableRef" :columns="columns" :list-url="queryPageList" :search-params="{}"  :scroll-y="500" >
+        <BasicTable ref="tableRef" :columns="columns" :list-url="queryPageList" :search-params="{sort:paramsTab.sort}" :scroll-y="500">
             <!-- 使用 bodyCell 插槽自定义单元格渲染 -->
             <template #bodyCell="{ column, record }">
                 <template v-if="column.key === 'action' || column.dataIndex === 'action'">
@@ -27,7 +27,8 @@
             <div class="approval-log-modal-content">
                 <ApprovalLogSearch :action-type-dict="actionTypeDict" @search-finish="handleApprovalLogSearch"
                     @reset="handleApprovalLogReset" />
-                <BasicTable ref="approvalLogTableRef" :columns="approvalLogColumns" :list-url="getApprovalLogList" :scroll-y="500" >
+                <BasicTable ref="approvalLogTableRef" :columns="approvalLogColumns" :list-url="getApprovalLogList"
+                    :scroll-y="500">
                     <template #bodyCell="{ column, record }">
                         <template v-if="column.dataIndex === 'action'">
                             {{ handName(record.action, actionTypeDict) }}
@@ -42,7 +43,8 @@
             <div class="change-log-modal-content">
                 <ChangeLogSearch :operation-type-dict="operationTypeDict" @search-finish="handleChangeLogSearch"
                     @reset="handleChangeLogReset" />
-                <BasicTable ref="changeLogTableRef" :columns="changeLogColumns" :list-url="getApprovalChangeLogList" :scroll-y="500" >
+                <BasicTable ref="changeLogTableRef" :columns="changeLogColumns" :list-url="getApprovalChangeLogList"
+                    :scroll-y="500">
                     <template #bodyCell="{ column, record }">
                         <template v-if="column.dataIndex === 'operationType'">
                             {{ handName(record.operationType, operationTypeDict) }}
@@ -61,7 +63,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, onMounted,h } from 'vue';
+import { ref, reactive, onMounted, h } from 'vue';
 import { queryPageList, getApprovalLogList, getApprovalChangeLogList } from '@/api/shengPiJiLu';
 import { Tag } from "ant-design-vue"; // 确保导入 Tag
 import BasicTable from "@/components/BasicTable/index.vue";
@@ -176,6 +178,7 @@ const handleSearchFinish = (values: any) => {
     const filter = {
         logic: "and",
         filters: filters,
+        
     };
     tableRef.value?.getList(filter);
 };
@@ -413,6 +416,16 @@ const handName = (val: any, arr: any) => {
     })
     return dictName1
 }
+//搜索相关弹框
+const paramsTab = ref({
+    sort: [
+            {
+                field: "applyTime",
+                dir: "desc",
+                needSortFlag: true
+            },
+        ],
+})
 </script>
 
 <style scoped lang="scss">