From 04fd71bcdd2f4d13f7fcb1f59952f6decdbb3d65 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 09 九月 2024 08:23:32 +0800
Subject: [PATCH] #

---
 zy-asrs-admin/src/views/loc/locDetl/index.vue |   52 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 42d8260..df7c012 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/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();
@@ -19,6 +20,11 @@
 let tableData = ref([]);
 getColumns();
 getPage();
+
+const {
+  getColumnSearchProps,
+  handleResizeColumn,
+} = useTableSearch();
 
 const state = reactive({
   selectedRowKeys: [],
@@ -45,85 +51,99 @@
     dataIndex: 'locId$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('locId$'),
   },
   {
     title: formatMessage('db.man_loc_detl.loc_no', '搴撲綅鍙�'),
     dataIndex: 'locNo',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('locNo'),
   },
   {
-    title: formatMessage('db.man_loc_detl.mat_id', '鐗╂枡'),
+    title: formatMessage('db.man_loc_detl.mat_id', '鍟嗗搧'),
     dataIndex: 'matId$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('matId$'),
   },
   {
-    title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
+    title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
     dataIndex: 'matnr',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('matnr'),
   },
   {
     title: formatMessage('db.man_loc_detl.order_no', '璁㈠崟鍙�'),
     dataIndex: 'orderNo',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('orderNo'),
   },
   {
     title: formatMessage('db.man_loc_detl.batch', '鎵瑰彿'),
     dataIndex: 'batch',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('batch'),
   },
   {
     title: formatMessage('db.man_loc_detl.anfme', '鏁伴噺'),
     dataIndex: 'anfme',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('anfme'),
   },
   {
     title: formatMessage('db.man_loc_detl.status', '鐘舵��'),
     dataIndex: 'status$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('status$'),
   },
-  {
-    title: formatMessage('db.man_loc_detl.create_time', '娣诲姞鏃堕棿'),
-    dataIndex: 'createTime$',
-    width: 140,
-    ellipsis: true,
-  },
-  {
-    title: formatMessage('db.man_loc_detl.create_by', '娣诲姞浜哄憳'),
-    dataIndex: 'createBy$',
-    width: 140,
-    ellipsis: true,
-  },
+  // {
+  //   title: formatMessage('db.man_loc_detl.create_time', '娣诲姞鏃堕棿'),
+  //   dataIndex: 'createTime$',
+  //   width: 140,
+  //   ellipsis: true,
+  //   ...getColumnSearchProps('createTime$'),
+  // },
+  // {
+  //   title: formatMessage('db.man_loc_detl.create_by', '娣诲姞浜哄憳'),
+  //   dataIndex: 'createBy$',
+  //   width: 140,
+  //   ellipsis: true,
+  //   ...getColumnSearchProps('createBy$'),
+  // },
   {
     title: formatMessage('db.man_loc_detl.update_time', '淇敼鏃堕棿'),
     dataIndex: 'updateTime$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('updateTime$'),
   },
   {
     title: formatMessage('db.man_loc_detl.update_by', '淇敼浜哄憳'),
     dataIndex: 'updateBy$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('updateBy$'),
   },
   {
     title: formatMessage('db.man_loc_detl.memo', '澶囨敞'),
     dataIndex: 'memo',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('memo'),
   },
 ];
 
 //鍔犺浇鎵╁睍瀛楁
 async function getColumns() {
   let fieldResp = await post('/api/matField/list', {
-    unique: 1
+    unique: 1,
+    fieldType: 1
   })
   let fieldResult = fieldResp.data;
   let tmp = state.columns;
@@ -252,7 +272,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="state.columns">
+      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.columns" @resizeColumn="handleResizeColumn">
       <template #bodyCell="{ column, text, record }">
         <template v-if="column.dataIndex === 'oper'">
           <div style="display: flex;justify-content: space-evenly;">

--
Gitblit v1.9.1