From 5f14e63a2400456055086632e027951086114648 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 06 十二月 2024 15:07:04 +0800
Subject: [PATCH] #

---
 zy-asrs-admin/src/views/config/matField/index.vue |   63 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/zy-asrs-admin/src/views/config/matField/index.vue b/zy-asrs-admin/src/views/config/matField/index.vue
index d785f2d..97bf9aa 100644
--- a/zy-asrs-admin/src/views/config/matField/index.vue
+++ b/zy-asrs-admin/src/views/config/matField/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,8 +17,18 @@
 const searchInput = ref("")
 const editChild = ref(null)
 
+const state = reactive({
+  selectedRowKeys: [],
+  loading: false,
+});
+
 let tableData = ref([]);
 getPage();
+
+const {
+  getColumnSearchProps,
+  handleResizeColumn,
+} = useTableSearch();
 
 const columns = [
   {
@@ -25,66 +36,84 @@
     dataIndex: 'name',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('name'),
   },
   {
     title: formatMessage('db.man_mat_field.type', '绫诲瀷'),
     dataIndex: 'type',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('type'),
   },
   {
     title: formatMessage('db.man_mat_field.describe', '鎻忚堪'),
     dataIndex: 'describe',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('describe'),
   },
   {
     title: formatMessage('db.man_mat_field.language', '鍥介檯鍖朓D'),
     dataIndex: 'language',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('language'),
   },
   {
     title: formatMessage('db.man_mat_field.unique', '绱㈠紩'),
     dataIndex: 'unique$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('unique$'),
+  },
+  {
+    title: formatMessage('db.man_mat_field.field_type', '瀛楁绫诲瀷'),
+    dataIndex: 'fieldType$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('fieldType$'),
   },
   {
     title: formatMessage('db.man_mat_field.status', '鐘舵��'),
     dataIndex: 'status$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('status$'),
   },
-  {
-    title: formatMessage('db.man_mat_field.create_time', '娣诲姞鏃堕棿'),
-    dataIndex: 'createTime$',
-    width: 140,
-    ellipsis: true,
-  },
-  {
-    title: formatMessage('db.man_mat_field.create_by', '娣诲姞浜哄憳'),
-    dataIndex: 'createBy$',
-    width: 140,
-    ellipsis: true,
-  },
+  // {
+  //   title: formatMessage('db.man_mat_field.create_time', '娣诲姞鏃堕棿'),
+  //   dataIndex: 'createTime$',
+  //   width: 140,
+  //   ellipsis: true,
+  //   ...getColumnSearchProps('createTime$'),
+  // },
+  // {
+  //   title: formatMessage('db.man_mat_field.create_by', '娣诲姞浜哄憳'),
+  //   dataIndex: 'createBy$',
+  //   width: 140,
+  //   ellipsis: true,
+  //   ...getColumnSearchProps('createBy$'),
+  // },
   {
     title: formatMessage('db.man_mat_field.update_time', '淇敼鏃堕棿'),
     dataIndex: 'updateTime$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('updateTime$'),
   },
   {
     title: formatMessage('db.man_mat_field.update_by', '淇敼浜哄憳'),
     dataIndex: 'updateBy$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('updateBy$'),
   },
   {
     title: formatMessage('db.man_mat_field.memo', '澶囨敞'),
     dataIndex: 'memo',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('memo'),
   },
 
   {
@@ -96,10 +125,6 @@
   },
 ];
 
-const state = reactive({
-  selectedRowKeys: [],
-  loading: false,
-});
 const hasSelected = computed(() => state.selectedRowKeys.length > 0);
 const start = () => {
   state.loading = true;
@@ -115,6 +140,8 @@
 };
 
 function getPage() {
+  state.loading = true;
+
   post('/api/matField/page', {
     current: currentPage,
     pageSize: pageSize,
@@ -124,6 +151,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()
@@ -209,7 +238,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