From 36c9bb578f29b1116134801c4b074a40004672ff Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 11 Nov 2025 17:03:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=97=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=AF=E8=BF=9B=E8=A1=8C=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/BasicTable.vue | 9 +++- .../Table/src/components/HeaderCell.vue | 41 ++++++++++++++++--- src/components/Table/src/types/table.ts | 3 +- .../ConfigMaterial/ConfigMaterialInfo.data.ts | 6 ++- .../ConfigMaterial/ConfigMaterialInfoList.vue | 13 +++++- 5 files changed, 61 insertions(+), 11 deletions(-) diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 0f5d266..566decb 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -34,7 +34,7 @@ @@ -122,6 +122,7 @@ 'change', 'columns-change', 'table-redo', + 'handleHeaderSearch', ], setup(props, { attrs, emit, slots, expose }) { const tableElRef = ref(null); @@ -206,6 +207,11 @@ emit ); + function handleHeaderSearch(item){ + console.log("🚀 ~ handleHeaderSearch ~ item:", item) + emit("header-search", item) + } + function handleTableChange(...args) { onTableChange.call(undefined, ...args); emit('change', ...args); @@ -460,6 +466,7 @@ getSummaryProps, showSummaryRef, // update-end--author:liaozhiyang---date:20240425---for:【pull/1201】添加antd的TableSummary功能兼容老的summary(表尾合计) + handleHeaderSearch }; }, }); diff --git a/src/components/Table/src/components/HeaderCell.vue b/src/components/Table/src/components/HeaderCell.vue index 81bfaa8..d00f54f 100644 --- a/src/components/Table/src/components/HeaderCell.vue +++ b/src/components/Table/src/components/HeaderCell.vue @@ -2,13 +2,19 @@ {{ getTitle }} - {{ getTitle }} + + + {{ getTitle }} + + + {{ getTitle }} + diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts index de74399..260de64 100644 --- a/src/components/Table/src/types/table.ts +++ b/src/components/Table/src/types/table.ts @@ -427,7 +427,8 @@ export interface BasicColumn extends ColumnProps { value: string; children?: unknown[] | (((props: Record) => unknown[]) & (() => unknown[]) & (() => unknown[])); }[]; - + //是否搜索 + search?: boolean; // flag?: 'INDEX' | 'DEFAULT' | 'CHECKBOX' | 'RADIO' | 'ACTION'; // update-begin--author:liaozhiyang---date:20240724---for:【issues/6908】多语言无刷新切换时,BasicColumn和FormSchema里面的值不能正常切换 diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts index 8247311..5b9a91c 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts @@ -8,13 +8,15 @@ export const columns: BasicColumn[] = [ { title: '物料名称', align: "center", - dataIndex: 'materialName' + dataIndex: 'materialName', + search: true, }, { title: '物料编码', align: "center", dataIndex: 'materialNo', - width:'100px' + width:'100px', + search: true, }, { title: '规格型号', diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue index 7343709..03c3eed 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -303,7 +303,7 @@
- +