|
|
@ -181,14 +181,15 @@ const opensearchTable = ( |
|
|
|
let filters:any[] = [] |
|
|
|
searchCondition.forEach((item) => { |
|
|
|
// 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取 |
|
|
|
// 20231127 row[item.value]?row[item.value] 修改为 row?row[item.value] 返回'null' 为了查询不到任何数据 |
|
|
|
if (item.isMainValue) { |
|
|
|
_searchCondition[item.key] = formRef.value.formModel[item.value] |
|
|
|
? formRef.value.formModel[item.value] |
|
|
|
: props.detailData |
|
|
|
? props.detailData[item.value] |
|
|
|
: row[item.value] |
|
|
|
: row |
|
|
|
? row[item.value] |
|
|
|
: '' |
|
|
|
: 'null' |
|
|
|
} else { |
|
|
|
// 扩展 转换为筛选条件进行查询 |
|
|
|
if (item.isSearch) { |
|
|
|