From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #

---
 zy-asrs-admin/src/views/base/orderSettle/index.vue |  138 ++++++++++++++++++++++++++-------------------
 1 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/zy-asrs-admin/src/views/base/orderSettle/index.vue b/zy-asrs-admin/src/views/base/orderSettle/index.vue
index 792fe0d..22df7d3 100644
--- a/zy-asrs-admin/src/views/base/orderSettle/index.vue
+++ b/zy-asrs-admin/src/views/base/orderSettle/index.vue
@@ -6,6 +6,7 @@
 import { logout } from '@/config.js';
 import EditView from './edit.vue'
 import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
 const context = getCurrentInstance()?.appContext.config.globalProperties;
 
 const router = useRouter();
@@ -16,64 +17,83 @@
 const searchInput = ref("")
 const editChild = ref(null)
 
+const state = reactive({
+  selectedRowKeys: [],
+  loading: false,
+});
+
 let tableData = ref([]);
 getPage();
 
+const {
+  getColumnSearchProps,
+  handleResizeColumn,
+} = useTableSearch();
+
 const columns = [
-        {
-            title: formatMessage('db.man_order_settle.settle', '璁㈠崟鐘舵��'),
-            dataIndex: 'settle',
-            width: 140,
-            ellipsis: true,
-        },
-        {
-            title: formatMessage('db.man_order_settle.name', '鐘舵�佹弿杩�'),
-            dataIndex: 'name',
-            width: 140,
-            ellipsis: true,
-        },
-        {
-            title: formatMessage('db.man_order_settle.flag', '鏍囪瘑'),
-            dataIndex: 'flag',
-            width: 140,
-            ellipsis: true,
-        },
-        {
-            title: formatMessage('db.man_order_settle.status', '鐘舵��'),
-            dataIndex: 'status$',
-            width: 140,
-            ellipsis: true,
-        },
-        {
-            title: formatMessage('db.man_order_settle.create_time', '娣诲姞鏃堕棿'),
-            dataIndex: 'createTime$',
-            width: 140,
-            ellipsis: true,
-        },
-        {
-            title: formatMessage('db.man_order_settle.create_by', '娣诲姞浜哄憳'),
-            dataIndex: 'createBy$',
-            width: 140,
-            ellipsis: true,
-        },
-        {
-            title: formatMessage('db.man_order_settle.update_time', '淇敼鏃堕棿'),
-            dataIndex: 'updateTime$',
-            width: 140,
-            ellipsis: true,
-        },
-        {
-            title: formatMessage('db.man_order_settle.update_by', '淇敼浜哄憳'),
-            dataIndex: 'updateBy$',
-            width: 140,
-            ellipsis: true,
-        },
-        {
-            title: formatMessage('db.man_order_settle.memo', '澶囨敞'),
-            dataIndex: 'memo',
-            width: 140,
-            ellipsis: true,
-        },
+  {
+    title: formatMessage('db.man_order_settle.settle', '璁㈠崟鐘舵��'),
+    dataIndex: 'settle',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('settle'),
+  },
+  {
+    title: formatMessage('db.man_order_settle.name', '鐘舵�佹弿杩�'),
+    dataIndex: 'name',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('name'),
+  },
+  {
+    title: formatMessage('db.man_order_settle.flag', '鏍囪瘑'),
+    dataIndex: 'flag',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('flag'),
+  },
+  {
+    title: formatMessage('db.man_order_settle.status', '鐘舵��'),
+    dataIndex: 'status$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('status$'),
+  },
+  {
+    title: formatMessage('db.man_order_settle.create_time', '娣诲姞鏃堕棿'),
+    dataIndex: 'createTime$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('createTime$'),
+  },
+  {
+    title: formatMessage('db.man_order_settle.create_by', '娣诲姞浜哄憳'),
+    dataIndex: 'createBy$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('createBy$'),
+  },
+  {
+    title: formatMessage('db.man_order_settle.update_time', '淇敼鏃堕棿'),
+    dataIndex: 'updateTime$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('updateTime$'),
+  },
+  {
+    title: formatMessage('db.man_order_settle.update_by', '淇敼浜哄憳'),
+    dataIndex: 'updateBy$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('updateBy$'),
+  },
+  {
+    title: formatMessage('db.man_order_settle.memo', '澶囨敞'),
+    dataIndex: 'memo',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('memo'),
+  },
 
   {
     title: formatMessage('common.operation', '鎿嶄綔'),
@@ -84,10 +104,7 @@
   },
 ];
 
-const state = reactive({
-  selectedRowKeys: [],
-  loading: false,
-});
+
 const hasSelected = computed(() => state.selectedRowKeys.length > 0);
 const start = () => {
   state.loading = true;
@@ -103,6 +120,7 @@
 };
 
 function getPage() {
+  state.loading = true;
   post('/api/orderSettle/page', {
     current: currentPage,
     pageSize: pageSize,
@@ -112,6 +130,8 @@
     if (result.code == 200) {
       let data = result.data;
       tableData.value = data;
+
+      state.loading = false;
     } else if (result.code === 401) {
       message.error(result.msg);
       logout()
@@ -197,7 +217,7 @@
     <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
       :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
       :pagination="{ total: tableData.total, onChange: onPageChange }"
-      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
+      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
       <template #bodyCell="{ column, text, record }">
         <template v-if="column.dataIndex === 'oper'">
           <div style="display: flex;justify-content: space-evenly;">

--
Gitblit v1.9.1