|
@ -519,12 +519,20 @@ const opensearchTable = ( |
|
|
// searchCondition.forEach((item) => { |
|
|
// searchCondition.forEach((item) => { |
|
|
// 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取 |
|
|
// 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取 |
|
|
if (searchCondition[i].isMainValue) { |
|
|
if (searchCondition[i].isMainValue) { |
|
|
|
|
|
console.log(99,searchCondition[i].paramsFrom) |
|
|
if (searchCondition[i].isFilterValue) { |
|
|
if (searchCondition[i].isFilterValue) { |
|
|
//后端接口需要拼入到filters中 |
|
|
//后端接口需要拼入到filters中 |
|
|
filters.push({ |
|
|
filters.push({ |
|
|
action: searchCondition[i].action, |
|
|
action: searchCondition[i].action, |
|
|
column: searchCondition[i].key, |
|
|
column: searchCondition[i].key, |
|
|
value: formRef.value.formModel[searchCondition[i].value] |
|
|
value: |
|
|
|
|
|
searchCondition[i].paramsFrom == 'form' |
|
|
|
|
|
? formRef.value.formModel[searchCondition[i].value] |
|
|
|
|
|
: searchCondition[i].paramsFrom == 'detailData' |
|
|
|
|
|
? props.detailData[searchCondition[i].value] |
|
|
|
|
|
: searchCondition[i].paramsFrom == 'tableForm' |
|
|
|
|
|
? row[searchCondition[i].value] |
|
|
|
|
|
: formRef.value.formModel[searchCondition[i].value] |
|
|
? formRef.value.formModel[searchCondition[i].value] |
|
|
? formRef.value.formModel[searchCondition[i].value] |
|
|
: props.detailData |
|
|
: props.detailData |
|
|
? props.detailData[searchCondition[i].value] |
|
|
? props.detailData[searchCondition[i].value] |
|
@ -533,9 +541,14 @@ const opensearchTable = ( |
|
|
: '' |
|
|
: '' |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
_searchCondition[searchCondition[i].key] = formRef.value.formModel[ |
|
|
_searchCondition[searchCondition[i].key] = |
|
|
searchCondition[i].value |
|
|
searchCondition[i].paramsFrom == 'form' |
|
|
] |
|
|
? formRef.value.formModel[searchCondition[i].value] |
|
|
|
|
|
: searchCondition[i].paramsFrom == 'detailData' |
|
|
|
|
|
? props.detailData[searchCondition[i].value] |
|
|
|
|
|
: searchCondition[i].paramsFrom == 'tableForm' |
|
|
|
|
|
? row[searchCondition[i].value] |
|
|
|
|
|
:formRef.value.formModel[ searchCondition[i].value] |
|
|
? formRef.value.formModel[searchCondition[i].value] |
|
|
? formRef.value.formModel[searchCondition[i].value] |
|
|
: props.detailData |
|
|
: props.detailData |
|
|
? props.detailData[searchCondition[i].value] |
|
|
? props.detailData[searchCondition[i].value] |
|
|