|
|
@ -200,11 +200,11 @@ const searchFormClick = (searchData) => { |
|
|
|
// 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters |
|
|
|
// 20240321 修改 判断 searchData 是否有条件 如果有 拼接 |
|
|
|
if (searchData.filters) { |
|
|
|
if (searchConditionRef.value.filters) { |
|
|
|
if (searchConditionRef.value&&searchConditionRef.value.filters) { |
|
|
|
Object.keys(searchConditionRef.value.filters).forEach((key) => { |
|
|
|
searchData.filters.push(searchConditionRef.value.filters[key]) |
|
|
|
}) |
|
|
|
} else { |
|
|
|
} else if(searchConditionRef.value){ |
|
|
|
Object.keys(searchConditionRef.value).forEach((key) => { |
|
|
|
searchData.filters.push({ |
|
|
|
action: '==', |
|
|
@ -216,7 +216,7 @@ const searchFormClick = (searchData) => { |
|
|
|
} else { |
|
|
|
if (searchConditionRef.value.filters) { |
|
|
|
searchData.filters = searchConditionRef.value.filters |
|
|
|
} else { |
|
|
|
} else if(searchConditionRef.value){ |
|
|
|
searchData.filters = [] |
|
|
|
Object.keys(searchConditionRef.value).forEach((key) => { |
|
|
|
searchData.filters.push({ |
|
|
|