Browse Source

样式修改

lilei 4 years ago
parent
commit
90e4ea0be4

+ 5 - 4
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -104,7 +104,6 @@ export default {
     return {
       advanced: false, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
-      tableHeight: 0,
       // 查询参数
       queryParam: {
         beginDate: getDate.getCurrMonthDays().starttime,
@@ -137,9 +136,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
-        }
         return salesPromoList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -162,6 +158,11 @@ export default {
       productTotal: null
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 430 : 375)
+    }
+  },
   methods: {
     //  创建时间  change
     dateChange (date) {

+ 5 - 4
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -108,7 +108,6 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       productType: [],
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
@@ -138,9 +137,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return salesDetailPromoList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -160,6 +156,11 @@ export default {
       productTotal: null
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 430 : 375)
+    }
+  },
   methods: {
     //  时间  change
     dateChange (date) {

+ 3 - 3
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -32,9 +32,9 @@
         <a-button id="promotionRulesList-add" type="primary" v-if="$hasPermissions('B_promotionRules_add')" class="button-error" @click="openModal=true">新增</a-button>
       </div>
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <!-- <a-alert type="info" showIcon style="margin-bottom:15px">
         <div slot="message">合计: <strong>{{ total }}</strong>条</div>
-      </a-alert>
+      </a-alert> -->
       <!-- 列表 -->
       <s-table
         class="sTable"
@@ -129,7 +129,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 450
+          this.tableHeight = window.innerHeight - 380
         }
         return promoActiveList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data