diff --git a/src/components/common/table/formItem.vue b/src/components/common/table/formItem.vue index 10c2547c..b22f1184 100644 --- a/src/components/common/table/formItem.vue +++ b/src/components/common/table/formItem.vue @@ -3,7 +3,7 @@ @@ -73,7 +73,7 @@ @@ -87,7 +87,7 @@ @@ -92,12 +97,12 @@ const searchFun = () => { popoverVisible.value = false; emit('search', { filterType: seq.value, - filterKey: props.item.key, + filterKey: props.item.searchKey || props.item.key, }); }; const resetFun = () => { - searchForm.value[props.item.key] = ''; + searchForm.value[props.item.searchKey || props.item.key] = ''; searchFun(); }; diff --git a/src/components/common/table/tableFormDia.vue b/src/components/common/table/tableFormDia.vue index 3a00e385..e6fa2798 100644 --- a/src/components/common/table/tableFormDia.vue +++ b/src/components/common/table/tableFormDia.vue @@ -205,6 +205,22 @@ + + +