diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 925840fa2..83153f2cf 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -359,10 +359,28 @@ const handleExport = async () => { // 筛选提交 const searchFormClick = (searchData) => { - tableObject.params = { - isSearch: true, - filters: searchData.filters + tableObject.params.isSearch = true + console.log('searchData',searchData.filters); + if(!searchData.filters){//重置的时候应用 + searchData.filters = [] + } + let filters = [...searchData.filters] + if(!filters.find(item=>item.column=='business_type')){ + if ( routeName.value == 'DeliverJobMain') { + filters = [...filters,{ + action:'==', + column:'business_type', + value:'Deliver', + }] + } else if ( routeName.value == 'ZZBJDeliverJobMain') { + filters = [...filters,{ + action:'==', + column:'business_type', + value:'ZZBJDeliver', + }] + } } + tableObject.params.filters = filters getList() // 刷新当前列表 } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index c38bee76b..6c3944f96 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -200,10 +200,28 @@ const handlePoint = async (row) => { // 筛选提交 const searchFormClick = (searchData) => { - tableObject.params = { - isSearch: true, - filters: searchData.filters + tableObject.params.isSearch = true + console.log('searchData',searchData.filters); + if(!searchData.filters){//重置的时候应用 + searchData.filters = [] + } + let filters = [...searchData.filters] + if(!filters.find(item=>item.column=='business_type')){ + if ( routeName.value == 'DeliverRecordMain') { + filters = [...filters,{ + action:'==', + column:'business_type', + value:'Deliver', + }] + } else if ( routeName.value == 'ZZBJDeliverRecordMain') { + filters = [...filters,{ + action:'==', + column:'business_type', + value:'ZZBJDeliver', + }] + } } + tableObject.params.filters = filters getList() // 刷新当前列表 }