|
|
@ -410,6 +410,21 @@ const opensearchTable = ( |
|
|
|
// searchCondition.forEach((item) => { |
|
|
|
// 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取 |
|
|
|
if (searchCondition[i].isMainValue) { |
|
|
|
if(searchCondition[i].isFilterValue){ |
|
|
|
//后端接口需要拼入到filters中 |
|
|
|
filters.push({ |
|
|
|
action: searchCondition[i].action, |
|
|
|
column: searchCondition[i].key, |
|
|
|
value: formRef.value.formModel[searchCondition[i].value] |
|
|
|
? formRef.value.formModel[searchCondition[i].value] |
|
|
|
: props.detailData |
|
|
|
? props.detailData[searchCondition[i].value] |
|
|
|
: row |
|
|
|
? row[searchCondition[i].value] |
|
|
|
: '' |
|
|
|
}) |
|
|
|
}else{ |
|
|
|
|
|
|
|
_searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value] |
|
|
|
? formRef.value.formModel[searchCondition[i].value] |
|
|
|
: props.detailData |
|
|
@ -431,6 +446,8 @@ const opensearchTable = ( |
|
|
|
) |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} else if (searchCondition[i].isTableRowValue) { |
|
|
|
if (searchCondition[i].required) { |
|
|
|
if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) { |
|
|
|