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 @@
-
+