|
@@ -179,7 +179,7 @@ const loading = ref(false)
|
|
|
const getData = async () => {
|
|
|
loading.value = true
|
|
|
try {
|
|
|
- const res = await getPersonSearchPage(Object.assign(queryParams.value, query.value))
|
|
|
+ const res = await getPersonSearchPage({...queryParams.value, ...query.value})
|
|
|
if (!res?.list?.length) {
|
|
|
items.value = []
|
|
|
total.value = 0
|
|
@@ -220,7 +220,7 @@ const handleSearch = (key, value) => {
|
|
|
}
|
|
|
|
|
|
const checkValue = (obj) => {
|
|
|
- return Object.values(obj).some(value => {
|
|
|
+ return Object.values(obj).some(value => {
|
|
|
return value !== null && value !== undefined && value !== '' && (Array.isArray(value) ? value.length > 0 : true)
|
|
|
})
|
|
|
}
|