diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 49c643b5..1c9ba09f 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 170a7130..d00ed68c 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 fa538b08..a6ed1b74 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 a6b091b3..defd7c3a 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 d5677cac..bf4b5d6c 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 83e5756c..23294557 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 b88b04a7..412fa4f2 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 9b36083c..da330de6 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 45341d8c..b45725c4 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 22014764..0ef0ab5f 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 57be27ed..5926ab69 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 0d193472..93df9f87 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 === '付款') {