diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 3c2a924e4..cc20819b4 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -15,6 +15,7 @@ :schema="formSchema" :is-col="true" @opensearchTable="opensearchTable" + @hiddenFilterButton="hiddenSearchTableFilterButton" @clearSearchInput="clearSearchInput" @onChange="onChange" @onBlur="onBlur" @@ -433,7 +434,9 @@ const opensearchTable = ( searchDetailSchemas ) } - +const hiddenSearchTableFilterButton = ()=>{ + searchTableRef.value.hiddenFilterButton() +} const clearSearchInput = (field)=>{ emit('clearSearchInput',field) } diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index fdfc8441c..535381792 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -55,7 +55,7 @@ export default defineComponent({ vLoading: propTypes.bool.def(false), labelPosition: propTypes.string.def('left'), }, - emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter'], + emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton'], setup(props, { slots, expose, emit }) { // element form 实例 const elFormRef = ref>() @@ -278,7 +278,14 @@ export default defineComponent({ item?.componentProps?.multiple, item?.componentProps?.isConcatDetailSchemas, item?.componentProps?.searchDetailSchemas, - )}}/> + ) + + //隐藏筛选按钮 + if(item?.componentProps?.hiddenFilterButton){ + emit('hiddenFilterButton') + } + + }}/> ) } @@ -316,7 +323,12 @@ export default defineComponent({ item?.componentProps?.multiple, item?.componentProps?.isConcatDetailSchemas, item?.componentProps?.searchDetailSchemas, - )}}/> + ) + //隐藏筛选按钮 + if(item?.componentProps?.hiddenFilterButton){ + emit('hiddenFilterButton') + } + }}/> ) } diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 5cdb3feda..f57fd7360 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -50,9 +50,9 @@ const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 // 列表头部按钮 -const HeadButttondata = [ +const HeadButttondata = ref([ defaultButtons.defaultFilterBtn(null), // 筛选 -] +]) /** 打开弹窗 */ const getListRef = ref() @@ -70,6 +70,9 @@ const multipleBol = ref(false) const searchConditionRef = ref() const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => { + HeadButttondata.value = [ + defaultButtons.defaultFilterBtn(null), // 筛选 + ] dialogTitle.value = titleName tableObjectRef.value = tableObject searchDialogVisible.value = true @@ -79,6 +82,10 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any tableColumns.value = allSchemas.tableColumns } const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any) => { + HeadButttondata.value = [ + defaultButtons.defaultFilterBtn(null), // 筛选 + ] + searchDialogVisible.value = true formFieldRef.value = formField searchFieldRef.value = searchField @@ -112,6 +119,10 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s getList() } +const hiddenFilterButton = ()=>{ + HeadButttondata.value = [] +} + // 筛选提交 const searchFormClick = (searchData) => { console.log(99, rowRef.value) @@ -153,7 +164,7 @@ const searchFormClick = (searchData) => { getListRef.value() // 刷新当前列表 } -defineExpose({ open,openData }) // 提供 open 方法,用于打开弹窗 +defineExpose({ open,openData,hiddenFilterButton }) // 提供 open 方法,用于打开弹窗 // Table 组件 ref const searchTableRef = ref() diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 9fa564e5a..c78a98cee 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -518,6 +518,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( // labelMessage: '信息提示说明!!!', componentProps: { isSearchList: true, // 开启查询弹窗 + hiddenFilterButton:true,//是否隐藏筛选按钮 searchListPlaceholder: '请选择采购员', // 输入框占位文本 searchField: 'id', // 查询弹窗赋值字段 searchTitle: '采购员信息', // 查询弹窗标题