diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index e0d7a9e15..084a68806 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -159,12 +159,13 @@ const searchFormClick = (searchData) => { if (searchConditionRef.value.filters) { searchData.filters = searchConditionRef.value.filters } else { + searchData.filters = [] Object.keys(searchConditionRef.value).forEach(key => { - searchData.filters = [{ + searchData.filters.push({ action: "==", column: key, value: searchConditionRef.value[key] - }] + }) }); } } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 858220136..93b47537d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -305,7 +305,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ { label: t('ts.创建供应商发货申请'), name: 'supplierdeliver', - hide: isShowMainButton(row, ['3']), + hide: isShowMainButton(row, ['4']), type: 'primary', icon: '', color: '',