|
@@ -20,7 +20,6 @@
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
:showPagination="false"
|
|
|
- :scroll="{ y: tableHeight }"
|
|
|
bordered>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
@@ -52,7 +51,6 @@ export default {
|
|
|
components: { STable, VSelect, editRuleModal },
|
|
|
data () {
|
|
|
return {
|
|
|
- tableHeight: 0,
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
@@ -64,9 +62,6 @@ export default {
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
- if (this.tableHeight == 0) {
|
|
|
- this.tableHeight = window.innerHeight - 502
|
|
|
- }
|
|
|
return promoRuleQueryList({ promoActiveSn: this.$route.params.sn }).then(res => {
|
|
|
const data = res.data
|
|
|
for (var i = 0; i < data.length; i++) {
|