|
@@ -2,7 +2,7 @@
|
|
<div>
|
|
<div>
|
|
<a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
<a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
<!-- 搜索条件 -->
|
|
<!-- 搜索条件 -->
|
|
- <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
|
|
|
+ <div class="table-page-search-wrapper" ref="tableSearch1">
|
|
<a-form-model
|
|
<a-form-model
|
|
id="rebateDetailReport-form"
|
|
id="rebateDetailReport-form"
|
|
ref="ruleForm"
|
|
ref="ruleForm"
|
|
@@ -98,7 +98,8 @@
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
- :style="{ height: tableHeight+84.5+'px' }"
|
|
|
|
|
|
+ :pageSize="30"
|
|
|
|
+ :style="{ height: tableHeight+75+'px' }"
|
|
:scroll="{ x: 2200,y: tableHeight-20 }"
|
|
:scroll="{ x: 2200,y: tableHeight-20 }"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
bordered>
|
|
bordered>
|
|
@@ -213,10 +214,7 @@ export default {
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
advanced (newValue, oldValue) {
|
|
advanced (newValue, oldValue) {
|
|
- const _this = this
|
|
|
|
- this.$nextTick(() => { // 页面渲染完成后的回调
|
|
|
|
- _this.setTableH()
|
|
|
|
- })
|
|
|
|
|
|
+ this.setTableH()
|
|
},
|
|
},
|
|
'$store.state.app.winHeight' (newValue, oldValue) { // 窗口变更时,需同时更改表格高度
|
|
'$store.state.app.winHeight' (newValue, oldValue) { // 窗口变更时,需同时更改表格高度
|
|
this.setTableH()
|
|
this.setTableH()
|
|
@@ -307,16 +305,15 @@ export default {
|
|
pageInit () {
|
|
pageInit () {
|
|
this.disabled = false
|
|
this.disabled = false
|
|
this.spinning = false
|
|
this.spinning = false
|
|
- this.setTableStartH()
|
|
|
|
|
|
+ this.setTableH()
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
- const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 265
|
|
|
|
|
|
+ this.$nextTick(() => { // 页面渲染完成后的回调
|
|
|
|
+ const tableSearchH = this.$refs.tableSearch1.offsetHeight
|
|
|
|
+ console.log(tableSearchH)
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 250
|
|
|
|
+ })
|
|
},
|
|
},
|
|
- setTableStartH () {
|
|
|
|
- const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 360
|
|
|
|
- }
|
|
|
|
},
|
|
},
|
|
mounted () {
|
|
mounted () {
|
|
if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
|
|
if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
|