lilei 3 år sedan
förälder
incheckning
d7bc240532

+ 1 - 1
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -117,7 +117,7 @@ export default {
     }
   },
   mounted () {
-    this.tableHeight = window.innerHeight - 380
+    this.tableHeight = window.innerHeight - 370
     this.getList()
   },
   methods: {

+ 7 - 1
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="marketingDivisionSetList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
-      <div class="table-operator">
+      <div class="table-operator" style="border: 0;">
         <a-button id="marketingDivisionSetList-add" type="primary" v-if="$hasPermissions('B_marketingDivisionSet_add')" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
@@ -14,6 +14,7 @@
         :columns="columns"
         :showPagination="false"
         :data="loadData"
+        :scroll="{ y: tableHeight }"
         bordered>
         <!-- 市区 -->
         <template slot="cityArea" slot-scope="text, record">
@@ -85,6 +86,11 @@ export default {
       itemId: null //  当前产品id
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - 260
+    }
+  },
   methods: {
     //  重置
     resetSearchForm () {

+ 7 - 6
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -57,9 +57,9 @@
         <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" class="button-error" @click="handleAdd">新增</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"
@@ -116,7 +116,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
@@ -148,9 +147,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
-        }
         return dealerQueryList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -169,6 +165,11 @@ export default {
       isAudit: false
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 430 : 375)
+    }
+  },
   methods: {
     //  重置列表
     resetSearchForm () {

+ 1 - 1
src/views/dealerManagement/rebateSettings/list.vue

@@ -91,7 +91,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 320
         }
         return queryRebatePage(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 5 - 4
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -71,7 +71,6 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         supplierName: '',
         product: {
@@ -98,9 +97,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 320
-        }
         return supplierProductList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -113,6 +109,11 @@ export default {
       }
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 370 : 310)
+    }
+  },
   methods: {
     //  重置
     resetSearchForm () {

+ 8 - 2
src/views/supplierManagement/supplierInfo/list.vue

@@ -22,9 +22,9 @@
         <a-button id="supplierInfoList-add" type="primary" v-if="$hasPermissions('B_supplierInfo_add')" class="button-error" @click="handleEdit()">新增</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"
@@ -33,6 +33,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ y: tableHeight }"
         bordered>
         <!-- 状态 -->
         <template slot="enabledFlag" slot-scope="text, record">
@@ -101,6 +102,11 @@ export default {
       }
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - 380
+    }
+  },
   methods: {
     //  重置
     resetSearchForm () {