From 353b0eac407937368529192e9442be76fe9c9d1a Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Mon, 5 Feb 2024 23:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E4=BA=8E=E8=B0=B7=E6=AD=8C=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E6=96=B0=E7=89=88=E6=9C=AC=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4table=E7=9A=84=E8=A1=A8=E5=A4=B4=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=8F=98=E5=BD=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/mixins/JeecgListMixin.js | 3 ++- jshERP-web/src/views/report/AllocationDetail.vue | 3 --- jshERP-web/src/views/report/BuyInReport.vue | 3 --- jshERP-web/src/views/report/CustomerAccount.vue | 3 --- jshERP-web/src/views/report/InDetail.vue | 3 --- jshERP-web/src/views/report/InOutStockReport.vue | 3 --- jshERP-web/src/views/report/MaterialStock.vue | 3 --- jshERP-web/src/views/report/OutDetail.vue | 3 --- jshERP-web/src/views/report/RetailOutReport.vue | 3 --- jshERP-web/src/views/report/SaleOutReport.vue | 3 --- jshERP-web/src/views/report/VendorAccount.vue | 3 --- jshERP-web/src/views/report/modules/HistoryFinancialList.vue | 4 ---- 12 files changed, 2 insertions(+), 35 deletions(-) diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 49c643b53..1c9ba09f2 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -418,6 +418,7 @@ export const JeecgListMixin = { if (this.isMobile()) { this.scroll.y = '' } else { + let basicWidth = 150 let basicLength = 274 let searchWrapperDomLen=0, operatorDomLen=0 //搜索区域 @@ -430,7 +431,7 @@ export const JeecgListMixin = { if(operatorDom && operatorDom[0]) { operatorDomLen = operatorDom[0].offsetHeight+10 } - this.scroll.x = 1640 + this.scroll.x = document.documentElement.clientWidth-basicWidth-64 this.scroll.y = document.documentElement.clientHeight-searchWrapperDomLen-operatorDomLen-basicLength } }, diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index 170a7130f..d00ed68c1 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -217,9 +217,6 @@ this.loadAllOrgaData() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, - mounted () { - this.scroll.x = 1620 - }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue index fa538b086..a6ed1b749 100644 --- a/jshERP-web/src/views/report/BuyInReport.vue +++ b/jshERP-web/src/views/report/BuyInReport.vue @@ -189,9 +189,6 @@ this.loadAllOrgaData() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, - mounted () { - this.scroll.x = 1620 - }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index a6b091b30..defd7c3a9 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -167,9 +167,6 @@ this.initSupplier() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, - mounted () { - this.scroll.x = 1620 - }, methods: { getQueryParams() { let param = Object.assign({}, this.queryParam, this.isorter); diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index d5677cacc..bf4b5d6cc 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -222,9 +222,6 @@ this.loadAllOrgaData() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, - mounted () { - this.scroll.x = 1620 - }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue index 83e5756c4..23294557f 100644 --- a/jshERP-web/src/views/report/InOutStockReport.vue +++ b/jshERP-web/src/views/report/InOutStockReport.vue @@ -180,9 +180,6 @@ this.loadTreeData() this.getTotalCountMoney() }, - mounted () { - this.scroll.x = 1620 - }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index b88b04a75..412fa4f2e 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -206,9 +206,6 @@ this.getDepotData() this.loadTreeData() }, - mounted () { - this.scroll.x = 1620 - }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index 9b36083cd..da330de60 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -222,9 +222,6 @@ this.loadAllOrgaData() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, - mounted () { - this.scroll.x = 1620 - }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/RetailOutReport.vue b/jshERP-web/src/views/report/RetailOutReport.vue index 45341d8cd..b45725c41 100644 --- a/jshERP-web/src/views/report/RetailOutReport.vue +++ b/jshERP-web/src/views/report/RetailOutReport.vue @@ -189,9 +189,6 @@ this.loadAllOrgaData() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, - mounted () { - this.scroll.x = 1620 - }, methods: { moment, create(){ diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue index 220147649..0ef0ab5fd 100644 --- a/jshERP-web/src/views/report/SaleOutReport.vue +++ b/jshERP-web/src/views/report/SaleOutReport.vue @@ -189,9 +189,6 @@ this.loadAllOrgaData() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, - mounted () { - this.scroll.x = 1620 - }, methods: { moment, create(){ diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index 57be27ed5..5926ab699 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -167,9 +167,6 @@ this.initSupplier() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, - mounted () { - this.scroll.x = 1620 - }, methods: { getQueryParams() { let param = Object.assign({}, this.queryParam, this.isorter); diff --git a/jshERP-web/src/views/report/modules/HistoryFinancialList.vue b/jshERP-web/src/views/report/modules/HistoryFinancialList.vue index 0d1934721..93df9f87f 100644 --- a/jshERP-web/src/views/report/modules/HistoryFinancialList.vue +++ b/jshERP-web/src/views/report/modules/HistoryFinancialList.vue @@ -96,7 +96,6 @@ :dataSource="dataSource" :components="handleDrag(columns)" :pagination="ipagination" - :scroll="scroll" :loading="loading" @change="handleTableChange"> @@ -195,9 +194,6 @@ this.initPerson() this.initAccount() }, - mounted () { - this.scroll.x = 1520 - }, methods: { show() { if(this.queryParam.type === '付款') {