From 2c8510b007389f53fb00c08e9f5ec57ddfcb0ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 13 Oct 2021 23:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/mixins/JeecgListMixin.js | 20 ++++++++++++++++--- .../src/views/bill/AllocationOutList.vue | 1 + jshERP-web/src/views/bill/AssembleList.vue | 1 + jshERP-web/src/views/bill/DisassembleList.vue | 1 + jshERP-web/src/views/bill/OtherInList.vue | 1 + jshERP-web/src/views/bill/OtherOutList.vue | 1 + .../src/views/bill/PurchaseBackList.vue | 1 + jshERP-web/src/views/bill/PurchaseInList.vue | 3 ++- .../src/views/bill/PurchaseOrderList.vue | 1 + jshERP-web/src/views/bill/RetailBackList.vue | 1 + jshERP-web/src/views/bill/RetailOutList.vue | 1 + jshERP-web/src/views/bill/SaleBackList.vue | 1 + jshERP-web/src/views/bill/SaleOrderList.vue | 1 + jshERP-web/src/views/bill/SaleOutList.vue | 3 ++- .../src/views/financial/AdvanceInList.vue | 1 + jshERP-web/src/views/financial/GiroList.vue | 1 + jshERP-web/src/views/financial/ItemInList.vue | 1 + .../src/views/financial/ItemOutList.vue | 1 + .../src/views/financial/MoneyInList.vue | 1 + .../src/views/financial/MoneyOutList.vue | 1 + .../src/views/material/MaterialList.vue | 7 ------- jshERP-web/src/views/system/AccountList.vue | 1 + jshERP-web/src/views/system/CustomerList.vue | 1 + jshERP-web/src/views/system/DepotList.vue | 1 + jshERP-web/src/views/system/FunctionList.vue | 1 + jshERP-web/src/views/system/InOutItemList.vue | 1 + jshERP-web/src/views/system/MemberList.vue | 1 + jshERP-web/src/views/system/PersonList.vue | 1 + jshERP-web/src/views/system/PluginList.vue | 1 + jshERP-web/src/views/system/RoleList.vue | 1 + .../src/views/system/SystemConfigList.vue | 1 + jshERP-web/src/views/system/TenantList.vue | 1 + jshERP-web/src/views/system/UnitList.vue | 1 + jshERP-web/src/views/system/UserList.vue | 1 + jshERP-web/src/views/system/VendorList.vue | 1 + 35 files changed, 52 insertions(+), 12 deletions(-) diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index a53cd220..1abff0bd 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -68,10 +68,11 @@ export const JeecgListMixin = { this.initDictConfig(); //初始化按钮权限 this.initActiveBtnStr(); - //初始化列表横向或纵向滚动 - this.initScroll() } }, + mounted () { + this.initScroll() + }, methods:{ loadData(arg) { if(!this.url.list){ @@ -357,11 +358,24 @@ export const JeecgListMixin = { } } }, + /* 初始化表格横向或纵向滚动 */ initScroll() { if (this.isMobile()) { this.scroll.y = '' } else { - this.scroll.y = document.documentElement.clientHeight-330 + let basicLength = 274 + let searchWrapperDomLen=0, operatorDomLen=0 + //搜索区域 + let searchWrapperDom = document.getElementsByClassName('table-page-search-wrapper') + //操作按钮区域 + let operatorDom = document.getElementsByClassName('table-operator') + if(searchWrapperDom && searchWrapperDom[0]) { + searchWrapperDomLen = searchWrapperDom[0].offsetHeight + } + if(operatorDom && operatorDom[0]) { + operatorDomLen = operatorDom[0].offsetHeight+10 + } + this.scroll.y = document.documentElement.clientHeight-searchWrapperDomLen-operatorDomLen-basicLength } } } diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index 461950a2..d17153a9 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -89,6 +89,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index 8e33fa78..6ade67a1 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -89,6 +89,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index 79e1d77e..26a1cb7e 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -89,6 +89,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index 1717d983..6a58ccef 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -98,6 +98,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index 01d17b4b..9d9e48c5 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -98,6 +98,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index 9d5f966e..c8a616df 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -98,6 +98,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index aac68aa2..37275620 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -100,6 +100,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> @@ -210,7 +211,7 @@ { title: '操作', dataIndex: 'action', - align:"center", width: 150, + align:"center", width: 160, scopedSlots: { customRender: 'action' }, } ], diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 5d6ee784..2c509119 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -90,6 +90,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index 39055d43..14a6da02 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -98,6 +98,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 20cb7d38..4e1f0897 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -98,6 +98,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 411e94e4..31a06e4f 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -99,6 +99,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 63f98c6a..ef363508 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -91,6 +91,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index f32648fa..8a8175b1 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -101,6 +101,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> @@ -210,7 +211,7 @@ { title: '操作', dataIndex: 'action', - align:"center", width: 150, + align:"center", width: 160, scopedSlots: { customRender: 'action' }, } ], diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue index 78fbb4ea..6614be0a 100644 --- a/jshERP-web/src/views/financial/AdvanceInList.vue +++ b/jshERP-web/src/views/financial/AdvanceInList.vue @@ -94,6 +94,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue index dfb2ac78..474e28cd 100644 --- a/jshERP-web/src/views/financial/GiroList.vue +++ b/jshERP-web/src/views/financial/GiroList.vue @@ -85,6 +85,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue index 5173f349..cf55e1ef 100644 --- a/jshERP-web/src/views/financial/ItemInList.vue +++ b/jshERP-web/src/views/financial/ItemInList.vue @@ -94,6 +94,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue index d586300e..46a9e530 100644 --- a/jshERP-web/src/views/financial/ItemOutList.vue +++ b/jshERP-web/src/views/financial/ItemOutList.vue @@ -94,6 +94,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue index e1cd2c4a..1b57bc71 100644 --- a/jshERP-web/src/views/financial/MoneyInList.vue +++ b/jshERP-web/src/views/financial/MoneyInList.vue @@ -95,6 +95,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue index d3756ec0..148588dc 100644 --- a/jshERP-web/src/views/financial/MoneyOutList.vue +++ b/jshERP-web/src/views/financial/MoneyOutList.vue @@ -95,6 +95,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue index a8bb7943..63495e51 100644 --- a/jshERP-web/src/views/material/MaterialList.vue +++ b/jshERP-web/src/views/material/MaterialList.vue @@ -210,13 +210,6 @@ } }, methods: { - initScroll() { - if (this.isMobile()) { - this.scroll.y = '' - } else { - this.scroll.y = document.documentElement.clientHeight-370 - } - }, loadTreeData(){ let that = this; let params = {}; diff --git a/jshERP-web/src/views/system/AccountList.vue b/jshERP-web/src/views/system/AccountList.vue index 64ac3e48..5e1b0a9e 100644 --- a/jshERP-web/src/views/system/AccountList.vue +++ b/jshERP-web/src/views/system/AccountList.vue @@ -54,6 +54,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/CustomerList.vue b/jshERP-web/src/views/system/CustomerList.vue index 7e58f67d..3ef13944 100644 --- a/jshERP-web/src/views/system/CustomerList.vue +++ b/jshERP-web/src/views/system/CustomerList.vue @@ -65,6 +65,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/DepotList.vue b/jshERP-web/src/views/system/DepotList.vue index 4427a1d8..4b155a8e 100644 --- a/jshERP-web/src/views/system/DepotList.vue +++ b/jshERP-web/src/views/system/DepotList.vue @@ -49,6 +49,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/FunctionList.vue b/jshERP-web/src/views/system/FunctionList.vue index 507b8d34..203a1663 100644 --- a/jshERP-web/src/views/system/FunctionList.vue +++ b/jshERP-web/src/views/system/FunctionList.vue @@ -44,6 +44,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/InOutItemList.vue b/jshERP-web/src/views/system/InOutItemList.vue index 60ec8bea..6349472a 100644 --- a/jshERP-web/src/views/system/InOutItemList.vue +++ b/jshERP-web/src/views/system/InOutItemList.vue @@ -57,6 +57,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/MemberList.vue b/jshERP-web/src/views/system/MemberList.vue index a2225178..41e6611d 100644 --- a/jshERP-web/src/views/system/MemberList.vue +++ b/jshERP-web/src/views/system/MemberList.vue @@ -64,6 +64,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/PersonList.vue b/jshERP-web/src/views/system/PersonList.vue index 75aa1a53..51a0361e 100644 --- a/jshERP-web/src/views/system/PersonList.vue +++ b/jshERP-web/src/views/system/PersonList.vue @@ -53,6 +53,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/PluginList.vue b/jshERP-web/src/views/system/PluginList.vue index 1a281f22..1a840c23 100644 --- a/jshERP-web/src/views/system/PluginList.vue +++ b/jshERP-web/src/views/system/PluginList.vue @@ -43,6 +43,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue index 54bb18ee..8c445766 100644 --- a/jshERP-web/src/views/system/RoleList.vue +++ b/jshERP-web/src/views/system/RoleList.vue @@ -43,6 +43,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue index a077c165..5dee62a7 100644 --- a/jshERP-web/src/views/system/SystemConfigList.vue +++ b/jshERP-web/src/views/system/SystemConfigList.vue @@ -43,6 +43,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/TenantList.vue b/jshERP-web/src/views/system/TenantList.vue index 09225f69..1a7f1b97 100644 --- a/jshERP-web/src/views/system/TenantList.vue +++ b/jshERP-web/src/views/system/TenantList.vue @@ -60,6 +60,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/UnitList.vue b/jshERP-web/src/views/system/UnitList.vue index 7fa71882..cf0c54bf 100644 --- a/jshERP-web/src/views/system/UnitList.vue +++ b/jshERP-web/src/views/system/UnitList.vue @@ -43,6 +43,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue index b07da50a..cf98d1e8 100644 --- a/jshERP-web/src/views/system/UserList.vue +++ b/jshERP-web/src/views/system/UserList.vue @@ -50,6 +50,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> diff --git a/jshERP-web/src/views/system/VendorList.vue b/jshERP-web/src/views/system/VendorList.vue index 8c30c91b..7726bc95 100644 --- a/jshERP-web/src/views/system/VendorList.vue +++ b/jshERP-web/src/views/system/VendorList.vue @@ -64,6 +64,7 @@ :columns="columns" :dataSource="dataSource" :pagination="ipagination" + :scroll="scroll" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange">