|
|
@ -104,7 +104,7 @@ |
|
|
|
<ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" /> |
|
|
|
</template> |
|
|
|
</Dialog> |
|
|
|
<SearchTableItem ref="searchTableRef" v-if="isSearchTableItem" @searchTableSuccess="searchTableSuccess" /> |
|
|
|
<SearchTableItem ref="searchTableRef" v-if="isSearchTableItemBol || isSearchTableItem" @searchTableSuccess="searchTableSuccess" /> |
|
|
|
<SearchTable ref="searchTableRef" v-else @searchTableSuccess="searchTableSuccess" /> |
|
|
|
</template> |
|
|
|
<script setup lang="ts"> |
|
|
@ -361,6 +361,7 @@ const buttonTableClick = async (val, row) => { |
|
|
|
// type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的 |
|
|
|
// searchCondition 查询条件 |
|
|
|
const searchTableRef = ref() |
|
|
|
const isSearchTableItemBol = ref(false) |
|
|
|
const opensearchTable = ( |
|
|
|
formField, |
|
|
|
searchField, |
|
|
@ -370,10 +371,13 @@ const opensearchTable = ( |
|
|
|
searchCondition, |
|
|
|
multiple, |
|
|
|
type, |
|
|
|
row |
|
|
|
row, |
|
|
|
headerItem |
|
|
|
) => { |
|
|
|
const _searchCondition = {} |
|
|
|
// 判断查询条件中,是否存在指向主表的数据 |
|
|
|
isSearchTableItemBol.value = headerItem?.tableForm?.isSearchTableItem? true:false |
|
|
|
nextTick(() => { |
|
|
|
console.log('searchCondition',searchCondition) |
|
|
|
if (searchCondition && searchCondition.length > 0) { |
|
|
|
// 转换筛选条件所需 |
|
|
@ -435,6 +439,7 @@ const opensearchTable = ( |
|
|
|
row, |
|
|
|
_searchCondition |
|
|
|
) |
|
|
|
}) |
|
|
|
} |
|
|
|
// 弹层确定返回所选数据 |
|
|
|
// val : 弹层列表row 数据 |
|
|
@ -644,7 +649,8 @@ const inpuFocus = (headerItem, row, index) => { |
|
|
|
headerItem.tableForm.searchCondition, |
|
|
|
headerItem.tableForm.multiple, |
|
|
|
'tableForm', |
|
|
|
row |
|
|
|
row, |
|
|
|
headerItem, |
|
|
|
) |
|
|
|
} |
|
|
|
/** |
|
|
|