Merge remote-tracking branch 'origin/master' into feature/bfi-api-rate
# Conflicts: # src/views/payment/receipt-flow.vue
This commit is contained in:
@@ -45,11 +45,13 @@
|
||||
<div class="invoice-page__search-actions">
|
||||
<el-button type="primary" @click="handleSearch">查询</el-button>
|
||||
<el-button @click="resetSearch">重置</el-button>
|
||||
<el-tooltip :content="searchExpanded ? '折叠' : '展开'" placement="top">
|
||||
<el-button text @click="searchExpanded = !searchExpanded">
|
||||
<el-icon><component :is="searchExpanded ? ArrowUp : ArrowDown" /></el-icon>
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<el-button
|
||||
v-if="showSearchToggle"
|
||||
text
|
||||
:icon="searchExpanded ? ArrowUp : ArrowDown"
|
||||
@click="searchExpanded = !searchExpanded"
|
||||
>{{ searchExpanded ? '收起' : '展开' }}</el-button
|
||||
>
|
||||
</div>
|
||||
</el-form>
|
||||
</section>
|
||||
@@ -256,6 +258,9 @@ export default {
|
||||
ArrowUp,
|
||||
query: emptyQuery(),
|
||||
searchExpanded: false,
|
||||
// 与 avue-crud 一致:搜索项数量超过 searchIndex(默认一行 4 项)时才显示“展开/收起”
|
||||
searchIndex: 4,
|
||||
searchItemCount: 5,
|
||||
searchVisible: true,
|
||||
tableSize: 'default',
|
||||
approvalStatusOptions: api.approvalStatusOptions,
|
||||
@@ -275,6 +280,9 @@ export default {
|
||||
visibleColumns() {
|
||||
return this.columns.filter(column => this.visibleColumnKeys.includes(column.prop));
|
||||
},
|
||||
showSearchToggle() {
|
||||
return this.searchItemCount > this.searchIndex;
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.loadOrganizationOptions();
|
||||
|
||||
Reference in New Issue
Block a user