浏览代码

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into deploy_0804

lilei 3 年之前
父节点
当前提交
edfad7c821
共有 45 个文件被更改,包括 212 次插入172 次删除
  1. 1 1
      src/components/Menu/SideMenu.vue
  2. 1 1
      src/components/MultiTab/MultiTab.vue
  3. 1 1
      src/components/Table/index.js
  4. 19 16
      src/components/global.less
  5. 0 1
      src/components/index.less
  6. 1 1
      src/config/defaultSettings.js
  7. 1 1
      src/layouts/BasicLayout.vue
  8. 5 4
      src/views/allocationManagement/transferOut/list.vue
  9. 6 0
      src/views/basicData/transferTypeManagement/list.vue
  10. 1 1
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  11. 7 1
      src/views/dealerManagement/marketingDivisionSet/list.vue
  12. 7 6
      src/views/dealerManagement/merchantInfoManagement/list.vue
  13. 1 1
      src/views/dealerManagement/rebateSettings/list.vue
  14. 8 7
      src/views/financialManagement/financialCollection/list.vue
  15. 6 5
      src/views/financialManagement/returnConfirmation/list.vue
  16. 1 1
      src/views/financialManagement/warehousingConfirmation/list.vue
  17. 4 5
      src/views/inventoryManagement/inventoryQuery/list.vue
  18. 3 4
      src/views/inventoryManagement/inventoryWarning/list.vue
  19. 7 1
      src/views/power/OperateJournal/OperateJournal.vue
  20. 7 6
      src/views/productManagement/priceChangeRecord/list.vue
  21. 3 4
      src/views/productManagement/productInfo/list.vue
  22. 1 1
      src/views/productManagement/productLaunchAudit/list.vue
  23. 10 9
      src/views/productManagement/productLevel/list.vue
  24. 3 4
      src/views/productManagement/productOfflineAudit/list.vue
  25. 7 6
      src/views/productManagement/productPricing/list.vue
  26. 6 5
      src/views/productManagement/productUniversal/list.vue
  27. 5 4
      src/views/promotionRulesManagement/orderStatistics/list.vue
  28. 5 4
      src/views/promotionRulesManagement/productStatistics/list.vue
  29. 3 3
      src/views/promotionRulesManagement/promotionRules/list.vue
  30. 4 0
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  31. 2 4
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  32. 2 2
      src/views/reportData/actualSalesReport/list.vue
  33. 2 2
      src/views/reportData/salesAmountReport/list.vue
  34. 2 2
      src/views/reportData/salesSlipReport/list.vue
  35. 1 1
      src/views/salesManagement/backorder/list.vue
  36. 5 4
      src/views/salesManagement/examineVerify/list.vue
  37. 3 4
      src/views/salesManagement/outboundOrder/list.vue
  38. 5 4
      src/views/salesManagement/pushOrderManagement/list.vue
  39. 25 24
      src/views/salesManagement/salesQuery/list.vue
  40. 5 4
      src/views/salesManagement/salesReturn/list.vue
  41. 5 4
      src/views/salesManagement/shortageStatisticsC/list.vue
  42. 5 4
      src/views/salesManagement/shortageStatisticsP/list.vue
  43. 3 3
      src/views/setting/noticeManagement/list.vue
  44. 5 4
      src/views/supplierManagement/associatedProductDetails/list.vue
  45. 8 2
      src/views/supplierManagement/supplierInfo/list.vue

+ 1 - 1
src/components/Menu/SideMenu.vue

@@ -12,7 +12,7 @@
       :theme="theme"
       :mode="mode"
       @select="onSelect"
-      style="padding: 16px 0px;"></s-menu>
+      style="padding: 10px 0px;"></s-menu>
   </a-layout-sider>
 
 </template>

+ 1 - 1
src/components/MultiTab/MultiTab.vue

@@ -160,7 +160,7 @@ export default {
             hideAdd
             type={'editable-card'}
             v-model={this.activeKey}
-            tabBarStyle={{ background: '#FFF', margin: 0, paddingLeft: '16px', paddingTop: '1px' }}
+            tabBarStyle={{ background: '#FFF', margin: 0, paddingLeft: '10px', paddingTop: '1px' }}
             {...{ on: { edit: onEdit } }}>
             {panes}
           </a-tabs>

+ 1 - 1
src/components/Table/index.js

@@ -11,7 +11,7 @@ export default {
 
       localLoading: false,
       localDataSource: [],
-      localPagination: Object.assign({}, this.pagination)
+      localPagination: Object.assign({'show-total':total => `共 ${total} 条`}, this.pagination)
     }
   },
   props: Object.assign({}, T.props, {

+ 19 - 16
src/components/global.less

@@ -18,7 +18,7 @@ body {
   &.tablet {
     .ant-layout-content {
       .content {
-        margin: 24px 0 0;
+        margin: 12px 0 0;
       }
     }
 
@@ -61,7 +61,7 @@ body {
   
   .trigger {
     font-size: 20px;
-    line-height: 64px;
+    line-height: 44px;
     padding: 0 24px;
     cursor: pointer;
     transition: color 0.3s;
@@ -94,7 +94,7 @@ body {
       position: fixed;
       z-index: 8;
       width: 100%;
-      top: 64px;
+      top: 44px;
       right:0;
       margin: auto;
     }
@@ -147,7 +147,7 @@ body {
       position: fixed;
       z-index: 8;
       width: 100%;
-      top: 64px;
+      top: 44px;
       right:0;
       margin: auto;
       &.ant-header-side-opened {
@@ -161,13 +161,16 @@ body {
   }
 
   .header {
-    height: 64px;
+    height: 44px;
     padding: 0 12px 0 0;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
     position: relative;
   }
-
+  .ant-layout-header{
+    height: 44px;
+    line-height: 44px;
+  }
   .header,
   .top-nav-header-index {
     .user-wrapper {
@@ -227,9 +230,9 @@ body {
           }
 
           .logo.top-nav-header {
-            flex: 0 0 56px;
+            flex: 0 0 36px;
             text-align: center;
-            line-height: 58px;
+            line-height: 38px;
             h1 {
               display: none;
             }
@@ -279,14 +282,14 @@ body {
       margin: auto;
       padding-left: 0;
       display: flex;
-      height: 64px;
+      height: 44px;
 
       .ant-menu.ant-menu-horizontal {
         max-width: 835px;
         flex: 0 1 835px;
         border: none;
-        height: 64px;
-        line-height: 64px;
+        height: 44px;
+        line-height: 44px;
       }
 
       .header-index-left {
@@ -296,9 +299,9 @@ body {
         .logo.top-nav-header {
           flex: 0 0 auto;
           width: auto;
-          height: 64px;
+          height: 44px;
           position: relative;
-          line-height: 64px;
+          line-height: 44px;
           transition: all 0.3s;
           overflow: hidden;
 
@@ -324,7 +327,7 @@ body {
       .header-index-right {
         flex: 0 0 238px;
         align-self: flex-end;
-        height: 64px;
+        height: 44px;
         overflow: hidden;
 
         .content-box {
@@ -414,10 +417,10 @@ body {
   
   .logo {
     position: relative;
-    height: 64px;
+    height: 44px;
     padding-left: 10px;
     overflow: hidden;
-    line-height: 64px;
+    line-height: 44px;
     background: #002140;
     transition: all .3s;
 

+ 0 - 1
src/components/index.less

@@ -4,7 +4,6 @@
 @ant-pro-prefix             : ant-pro;
 @ant-global-sider-zindex    : 106;
 @ant-global-header-zindex   : 105;
-
 .ant-input-disabled{
   color: #666;
   background-color: #f8f8f8;

+ 1 - 1
src/config/defaultSettings.js

@@ -19,7 +19,7 @@ export default {
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu
   fixedHeader: true, // sticky header
-  fixSiderbar: false, // sticky siderbar
+  fixSiderbar: true, // sticky siderbar
   autoHideHeader: false, //  auto hide header
   colorWeak: false,
   multiTab: true,

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -39,7 +39,7 @@
         @toggle="toggle"
       />
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: multiTab&&fixedHeader ? '105px' : (!multiTab&&fixedHeader?'65px':'0') }">
+      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: multiTab&&fixedHeader ? '85px' : (!multiTab&&fixedHeader?'45px':'0') }">
         <transition name="page-transition">
           <route-view/>
         </transition>

+ 5 - 4
src/views/allocationManagement/transferOut/list.vue

@@ -131,7 +131,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       time: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
         moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
@@ -165,9 +164,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -184,6 +180,11 @@ export default {
       openModal: false //  新增编辑  弹框
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    }
+  },
   methods: {
     //  创建时间  change
     dateChange (date) {

+ 6 - 0
src/views/basicData/transferTypeManagement/list.vue

@@ -17,6 +17,7 @@
         size="default"
         :rowKey="(record) => record.id"
         :columns="columns"
+        :scroll="{ y: tableHeight }"
         :data="loadData"
         bordered>
         <!-- 操作 -->
@@ -76,6 +77,11 @@ export default {
       nowData: null //  当前记录数据
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - 310
+    }
+  },
   methods: {
     //  新增/编辑
     handleEdit (row) {

+ 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

+ 8 - 7
src/views/financialManagement/financialCollection/list.vue

@@ -110,9 +110,9 @@
         </a-form>
       </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"
@@ -175,7 +175,6 @@ export default {
         dealerCitySn: undefined,
         dealerCountySn: undefined
       },
-      tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       auditDate: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
@@ -200,9 +199,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return salesReceiptList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -220,6 +216,11 @@ export default {
       addrDistrictList: [] //  区下拉
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 440 : 330)
+    }
+  },
   methods: {
     //  审核时间  change
     dateAuditChange (date) {
@@ -333,7 +334,7 @@ export default {
 <style lang="less">
   .financialCollectionList-wrap{
     .sTable{
-      margin-top: 20px;
+      margin-top: 10px;
     }
 	.active{
 		color: #ed1c24;

+ 6 - 5
src/views/financialManagement/returnConfirmation/list.vue

@@ -106,7 +106,6 @@ export default {
         grabFlag: undefined,
         billStatus: undefined //  状态
       },
-      tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       advanced: false,
       columns: [
@@ -125,9 +124,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return salesReturnFinancialList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -142,6 +138,11 @@ export default {
       itemSn: ''
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 375 : 320)
+    }
+  },
   methods: {
     //  创建时间  change
     dateChange (date) {
@@ -214,7 +215,7 @@ export default {
 <style lang="less">
   .returnConfirmationList-wrap{
     .sTable{
-      margin-top: 20px;
+      margin-top: 10px;
     }
 	.active{
 		color: #ed1c24;

+ 1 - 1
src/views/financialManagement/warehousingConfirmation/list.vue

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

+ 4 - 5
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -115,7 +115,7 @@
             class="button-warning"
             @click="goWarehouseDetail(record)"
             id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
-			<span v-if="!$hasPermissions('B_inventoryQuery_detail')&&!$hasPermissions('B_inventoryQuery_rkDetail')">--</span>
+          <span v-if="!$hasPermissions('B_inventoryQuery_detail')&&!$hasPermissions('B_inventoryQuery_rkDetail')">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -137,7 +137,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         productCode: '', //  产品编码
         productName: '', //  产品名称
@@ -171,9 +170,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 370
-        }
         // 排序
         if (parameter.sortField == 'currentStockQty') {
           parameter.sortField = 'qty'
@@ -209,6 +205,9 @@ export default {
     }
   },
   computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    },
     stockQty () { //  库存总数量 合计
       const currentStockQty = this.currentStock && this.currentStock.currentStockQty ? Number(this.currentStock.currentStockQty) : 0
       const freezeQty = this.currentStock && this.currentStock.freezeQty ? Number(this.currentStock.freezeQty) : 0

+ 3 - 4
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -179,7 +179,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         productCode: '',
         productName: '',
@@ -228,6 +227,9 @@ export default {
     }
   },
   computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    },
     hasSelected () {
       return this.selectedRowKeys.length > 0
     }
@@ -246,9 +248,6 @@ export default {
     },
     //  列表数据
     pageInit (pageNo) {
-      if (this.tableHeight == 0) {
-        this.tableHeight = window.innerHeight - 380
-      }
       this.disabled = true
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)

+ 7 - 1
src/views/power/OperateJournal/OperateJournal.vue

@@ -35,6 +35,7 @@
         rowKey="id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ y: tableHeight }"
         bordered>
         <span slot="actDesc" slot-scope="text, record">{{ record.actDate }}-{{ record.actDesc }}</span>
         <span slot="actorName" slot-scope="text, record">{{ record.actorName }}-{{ record.actorPhone }}</span>
@@ -91,6 +92,11 @@ export default {
       }
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - 340
+    }
+  },
   methods: {
     //  时间  change
     dateChange (date) {
@@ -112,7 +118,7 @@ export default {
 <style lang="less">
   .operateJournal{
     .sTable{
-      margin-top: 10px;
+      margin-top: 0;
     }
   }
 </style>

+ 7 - 6
src/views/productManagement/priceChangeRecord/list.vue

@@ -70,9 +70,9 @@
         </a-form>
       </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"
@@ -132,7 +132,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: getDate.getThreeMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
@@ -213,9 +212,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 430
-        }
         return productPriceChangeList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -232,6 +228,11 @@ export default {
       productTypeList: [] //  分类下拉数据
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    }
+  },
   methods: {
     //  创建时间  change
     dateChange (date) {

+ 3 - 4
src/views/productManagement/productInfo/list.vue

@@ -207,7 +207,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         name: '', //  产品名称
         queryWord: '', // 产品编码/原厂编码
@@ -243,9 +242,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return productList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -265,6 +261,9 @@ export default {
     }
   },
   computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    },
     hasSelected () {
       return this.selectedRowKeys.length > 0
     },

+ 1 - 1
src/views/productManagement/productLaunchAudit/list.vue

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

+ 10 - 9
src/views/productManagement/productLevel/list.vue

@@ -61,10 +61,10 @@
       </a-form>
     </div>
     <!-- 操作按钮 -->
-    <div class="table-operator">
-      <!-- <a-button style="margin: 0 0 18px 0" id="productLevelList-import" type="primary" @click="handleImport">导入</a-button> -->
-      <!-- <a-button style="margin: 0 0 18px 8px" id="productLevelList-export" type="danger" @click="handleExport" :loading="exportLoading">导出</a-button> -->
-    </div>
+    <!-- <div class="table-operator">
+      <a-button style="margin: 0 0 18px 0" id="productLevelList-import" type="primary" @click="handleImport">导入</a-button>
+      <a-button style="margin: 0 0 18px 8px" id="productLevelList-export" type="danger" @click="handleExport" :loading="exportLoading">导出</a-button>
+    </div> -->
     <!-- 列表 -->
     <s-table
       class="sTable"
@@ -73,7 +73,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1590 }"
+      :scroll="{ x: 1590, y: tableHeight }"
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">
@@ -109,7 +109,6 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         name: '', //  产品名称
         queryWord: '', // 产品编码/原厂编码
@@ -137,9 +136,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return productLevelList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -161,6 +157,11 @@ export default {
       nowData: null
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 380 : 320)
+    }
+  },
   methods: {
     //  重置
     resetSearchForm () {

+ 3 - 4
src/views/productManagement/productOfflineAudit/list.vue

@@ -138,7 +138,6 @@ export default {
         state: undefined //  状态
       },
       productType: [],
-      tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -159,9 +158,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return productOfflineList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           this.disabled = false
@@ -173,6 +169,9 @@ export default {
     }
   },
   computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    },
     hasSelected () {
       return this.selectedRowKeys.length > 0
     },

+ 7 - 6
src/views/productManagement/productPricing/list.vue

@@ -61,9 +61,9 @@
       </a-form>
     </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"
@@ -131,7 +131,6 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         name: '', //  产品名称
         queryWord: '', // 产品编码/原厂编码
@@ -164,9 +163,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return productPricingList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -186,6 +182,11 @@ export default {
       productTypeList: [] //  分类下拉数据
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 375 : 320)
+    }
+  },
   methods: {
     //  重置
     resetSearchForm () {

+ 6 - 5
src/views/productManagement/productUniversal/list.vue

@@ -55,7 +55,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1580 }"
+        :scroll="{ x: 1580, y: tableHeight }"
         bordered>
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
@@ -98,7 +98,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         productCode: '',
         productName: '',
@@ -123,9 +122,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return productUniversalCodeList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -140,6 +136,11 @@ export default {
       itemId: '' //  当前id
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    }
+  },
   methods: {
     //  重置
     resetSearchForm () {

+ 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

+ 4 - 0
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -182,6 +182,10 @@ export default {
   .bulkWarehousingOrderEdit-wrap{
     .bulkWarehousingOrderEdit-cont{
       margin-bottom: 10px;
+      .table-operator{
+        border: 0;
+        padding-top: 0;
+      }
     }
   }
 </style>

+ 2 - 4
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -123,7 +123,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 380
         }
         return sparePartsList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
@@ -256,8 +256,6 @@ export default {
 </script>
 <style lang="less">
   .bulkWarehousingOrderList-wrap{
-    .sTable{
-      margin-top: 15px;
-    }
+
   }
 </style>

+ 2 - 2
src/views/reportData/actualSalesReport/list.vue

@@ -194,8 +194,8 @@ export default {
                 },
                 {
                   title: '刹车片',
-                  dataIndex: 'pp4',
-                  align: 'jpScpAmount',
+                  dataIndex: 'jpScpAmount',
+                  align: 'center',
                   width: 100,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },

+ 2 - 2
src/views/reportData/salesAmountReport/list.vue

@@ -194,8 +194,8 @@ export default {
                 },
                 {
                   title: '刹车片',
-                  dataIndex: 'pp4',
-                  align: 'jpScpAmount',
+                  dataIndex: 'jpScpAmount',
+                  align: 'center',
                   width: 100,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },

+ 2 - 2
src/views/reportData/salesSlipReport/list.vue

@@ -201,8 +201,8 @@ export default {
                 },
                 {
                   title: '刹车片',
-                  dataIndex: 'pp4',
-                  align: 'jpScpAmount',
+                  dataIndex: 'jpScpAmount',
+                  align: 'center',
                   width: 100,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },

+ 1 - 1
src/views/salesManagement/backorder/list.vue

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

+ 5 - 4
src/views/salesManagement/examineVerify/list.vue

@@ -121,7 +121,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       time: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
         moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
@@ -162,9 +161,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         // 查询总计
         dispatchQueryCount(Object.assign(parameter, this.queryParam)).then(res => {
           this.totalData = Object.assign(this.totalData, res.data || {})
@@ -183,6 +179,11 @@ export default {
       auditInfo: null
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 420 : 365)
+    }
+  },
   methods: {
     custChange (val) {
       this.queryParam.buyerSn = val.key

+ 3 - 4
src/views/salesManagement/outboundOrder/list.vue

@@ -108,7 +108,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',
@@ -138,9 +137,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return stockOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -154,6 +150,9 @@ export default {
     }
   },
   computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 420 : 365)
+    },
     hasSelected () {
       return this.selectedRowKeys.length > 0
     },

+ 5 - 4
src/views/salesManagement/pushOrderManagement/list.vue

@@ -92,7 +92,6 @@ export default {
   components: { STable, VSelect, custList, rangeDate },
   data () {
     return {
-      tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
@@ -127,9 +126,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
-        }
         // 查询总计
         dispatchQueryCount(Object.assign(parameter, this.queryParam)).then(res => {
           console.log(res)
@@ -147,6 +143,11 @@ export default {
       }
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 420 : 365)
+    }
+  },
   methods: {
     //  时间  change
     dateChange (date) {

+ 25 - 24
src/views/salesManagement/salesQuery/list.vue

@@ -102,11 +102,11 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 2640, y:tableHeight }"
+        :scroll="{ x: 1700, y: tableHeight }"
         bordered>
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
@@ -205,7 +205,6 @@ export default {
   data () {
     return {
       spinning: false,
-      tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 选择客户弹框是否显示
@@ -240,34 +239,31 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 210, align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 210, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 120, align: 'center' },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: 100, align: 'center' },
-        { title: '总售价', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '已下推数量', dataIndex: 'totalPushedQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已发货数量', dataIndex: 'totalDispatchQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已取消数量', dataIndex: 'totalCancelQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
-        { title: '打印次数', dataIndex: 'detailPrintTimes', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
+        { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: 60, align: 'center' },
+        { title: '总售价', dataIndex: 'totalAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '已下推数量', dataIndex: 'totalPushedQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已发货数量', dataIndex: 'totalDispatchQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已取消数量', dataIndex: 'totalCancelQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 100, align: 'center' },
+        { title: '打印次数', dataIndex: 'detailPrintTimes', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         delete parameter.tableId
         delete parameter.index
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
-        }
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {
           console.log(res)
@@ -287,6 +283,11 @@ export default {
       auditInfo: null
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 440 : 385)
+    }
+  },
   methods: {
     //  时间  change
     dateChange (date) {

+ 5 - 4
src/views/salesManagement/salesReturn/list.vue

@@ -179,7 +179,6 @@ export default {
   data () {
     return {
       spinning: false,
-      tableHeight: 0,
       // 高级搜索 展开/关闭
       advanced: false,
       disabled: false, //  查询、重置按钮是否可操作
@@ -222,9 +221,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
-        }
         // 查询总计
         this.getQueryCount(Object.assign(parameter, this.queryParam))
         return salesReturnList(Object.assign(parameter, this.queryParam)).then(res => {
@@ -241,6 +237,11 @@ export default {
       auditInfo: null
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 480 : 425)
+    }
+  },
   methods: {
     //  创建时间  change
     dateCreateChange (date) {

+ 5 - 4
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -124,7 +124,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
@@ -155,9 +154,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         const params = Object.assign(parameter, this.queryParam) //  无分页
         return oosBuyerList(params).then(res => {
@@ -178,6 +174,11 @@ export default {
       currentTotal: null
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 435 : 380)
+    }
+  },
   methods: {
     //  创建时间  change
     dateChange (date) {

+ 5 - 4
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -74,7 +74,6 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
@@ -100,9 +99,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         const params = Object.assign(parameter, this.queryParam) //  无分页
         return oosProductList(params).then(res => {
@@ -123,6 +119,11 @@ export default {
       currentTotal: null
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 435 : 380)
+    }
+  },
   methods: {
     //  创建时间  change
     dateChange (date) {

+ 3 - 3
src/views/setting/noticeManagement/list.vue

@@ -32,9 +32,9 @@
         <a-button id="noticeList-add" type="primary" 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 || 0 }}</strong>条</div>
-      </a-alert>
+      </a-alert> -->
       <!-- 列表 -->
       <s-table
         class="sTable"
@@ -109,7 +109,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 340
         }
         return noticeList(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 () {