diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index bcb881bd..931d653a 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -89,6 +89,7 @@ export const JeecgListMixin = { if (res.code===200) { this.dataSource = res.data.rows; this.ipagination.total = res.data.total; + this.tableAddTotalRow(this.columns, this.dataSource) } if(res.code===510){ this.$message.warning(res.data) @@ -244,12 +245,13 @@ export const JeecgListMixin = { }, handleTableChange(pagination, filters, sorter) { //分页、排序、筛选变化时触发 - //TODO 筛选 if (Object.keys(sorter).length > 0) { this.isorter.column = sorter.field; this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" } - this.ipagination = pagination; + if(pagination && pagination.current) { + this.ipagination = pagination; + } this.loadData(); }, handleToggleSearch(){ @@ -383,7 +385,7 @@ export const JeecgListMixin = { let numKey = 'rowIndex' let totalRow = { [numKey]: '合计' } //移除不需要合计的列 - let removeCols = 'action,mBarCode,purchaseDecimal' + let removeCols = 'action,mBarCode,barCode,unitPrice,purchaseDecimal,operTime,oTime' columns.forEach(column => { let { key, dataIndex } = column if (![key, dataIndex].includes(numKey)) { @@ -404,6 +406,16 @@ export const JeecgListMixin = { }) dataSource.push(totalRow) } + }, + paginationChange(page, pageSize) { + this.ipagination.current = page + this.ipagination.pageSize = pageSize + this.loadData(this.ipagination.current); + }, + paginationShowSizeChange(current, size) { + this.ipagination.current = current + this.ipagination.pageSize = size + this.loadData(this.ipagination.current); } } diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index cdc4ca9f..52699c9e 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -46,7 +46,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> @@ -54,6 +54,22 @@ 流水 + + + + + + + @@ -89,7 +105,8 @@ serialNo:'' }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, allMonthAmount: '', allCurrentAmount: '', @@ -97,13 +114,9 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:60, - align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, { title: '名称', dataIndex: 'name', width: 100}, @@ -125,6 +138,13 @@ this.getAccountStatistics() }, methods: { + getQueryParams() { + let param = Object.assign({}, this.queryParam, this.isorter); + param.field = this.getQueryField(); + param.currentPage = this.ipagination.current; + param.pageSize = this.ipagination.pageSize-1; + return param; + }, getAccountStatistics() { getAction(this.url.getStatistics, this.queryParam).then((res)=>{ if(res && res.code === 200) { diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index 20875c94..ddffc844 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -73,7 +73,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> @@ -81,6 +81,22 @@ {{record.number}} + + + + + + + @@ -124,7 +140,8 @@ subType: "调拨" }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, dateFormat: 'YYYY-MM-DD', currentDay: moment().format('YYYY-MM-DD'), @@ -135,13 +152,9 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:40, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, { @@ -177,7 +190,7 @@ let param = Object.assign({}, this.queryParam, this.isorter); param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, onDateChange: function (value, dateString) { diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue index cb6d192c..b35ec7ff 100644 --- a/jshERP-web/src/views/report/BuyInReport.vue +++ b/jshERP-web/src/views/report/BuyInReport.vue @@ -37,11 +37,27 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + + @@ -78,19 +94,16 @@ mpList: getMpListShort(Vue.ls.get('materialPropertyList')) }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, tabKey: "1", // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:60, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, {title: '条码', dataIndex: 'barCode', width: 160}, @@ -116,11 +129,10 @@ param.monthTime = this.queryParam.monthTime; param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, onChange: function (value, dateString) { - console.log(dateString); this.queryParam.monthTime=dateString; }, searchQuery() { diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index 2dd6decd..a2bb1e0b 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -53,7 +53,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> @@ -61,6 +61,22 @@ {{record.number}} + + + + + + + @@ -104,7 +120,8 @@ endTime: moment().format('YYYY-MM-DD'), }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, dateFormat: 'YYYY-MM-DD', currentDay: moment().format('YYYY-MM-DD'), @@ -116,13 +133,9 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:40, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, { @@ -150,7 +163,7 @@ let param = Object.assign({}, this.queryParam, this.isorter); param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, initSupplier() { @@ -194,6 +207,7 @@ if (res.code===200) { this.dataSource = res.data.rows; this.ipagination.total = res.data.total; + this.tableAddTotalRow(this.columns, this.dataSource) if(this.queryParam.organId) { this.firstTotal = '期初应收：' + res.data.firstMoney + "，" this.lastTotal = '期末应收：' + res.data.lastMoney diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index 12086eab..bb17dd6a 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -66,7 +66,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> @@ -74,6 +74,22 @@ {{record.number}} + + + + + + + @@ -116,7 +132,8 @@ type: "入库" }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, dateFormat: 'YYYY-MM-DD', currentDay: moment().format('YYYY-MM-DD'), @@ -127,13 +144,9 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:40, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, { @@ -169,7 +182,7 @@ let param = Object.assign({}, this.queryParam, this.isorter); param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, onDateChange: function (value, dateString) { diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue index 6ab62548..ff22a9ce 100644 --- a/jshERP-web/src/views/report/InMaterialCount.vue +++ b/jshERP-web/src/views/report/InMaterialCount.vue @@ -66,11 +66,27 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + + @@ -109,7 +125,8 @@ type: "入库" }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, dateFormat: 'YYYY-MM-DD', currentDay: moment().format('YYYY-MM-DD'), @@ -120,13 +137,9 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:40, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, {title: '条码', dataIndex: 'barCode', width: 120}, @@ -154,7 +167,7 @@ let param = Object.assign({}, this.queryParam, this.isorter); param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, onDateChange: function (value, dateString) { diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue index 58000d63..ea1583e1 100644 --- a/jshERP-web/src/views/report/InOutStockReport.vue +++ b/jshERP-web/src/views/report/InOutStockReport.vue @@ -55,11 +55,27 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + + @@ -98,7 +114,8 @@ mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性 }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, tabKey: "1", depotList: [], @@ -106,21 +123,17 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:60, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 120}, + {title: '条码', dataIndex: 'barCode', width: 100}, {title: '名称', dataIndex: 'materialName', width: 120}, {title: '规格', dataIndex: 'materialStandard', width: 80}, {title: '型号', dataIndex: 'materialModel', width: 80}, - {title: '扩展信息', dataIndex: 'materialOther', width: 120}, - {title: '单位', dataIndex: 'unitName', width: 80}, + {title: '扩展信息', dataIndex: 'materialOther', width: 80}, + {title: '单位', dataIndex: 'unitName', width: 60}, {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60}, {title: '上月结存数量', dataIndex: 'prevSum', sorter: (a, b) => a.prevSum - b.prevSum, width: 80}, {title: '入库数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 60}, @@ -146,7 +159,7 @@ param.monthTime = this.queryParam.monthTime; param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, getDepotData() { diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index f780e70c..02ba6d6e 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -70,9 +70,8 @@ - - - + @@ -74,6 +74,22 @@ {{record.number}} + + + + + + + @@ -116,7 +132,8 @@ type: "出库" }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, dateFormat: 'YYYY-MM-DD', currentDay: moment().format('YYYY-MM-DD'), @@ -127,13 +144,9 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:40, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, { @@ -169,7 +182,7 @@ let param = Object.assign({}, this.queryParam, this.isorter); param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, onDateChange: function (value, dateString) { diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue index a7cadb1f..a7842b88 100644 --- a/jshERP-web/src/views/report/OutMaterialCount.vue +++ b/jshERP-web/src/views/report/OutMaterialCount.vue @@ -66,11 +66,27 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + + @@ -109,7 +125,8 @@ type: "出库" }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, dateFormat: 'YYYY-MM-DD', currentDay: moment().format('YYYY-MM-DD'), @@ -120,13 +137,9 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:40, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, {title: '条码', dataIndex: 'barCode', width: 120}, @@ -154,7 +167,7 @@ let param = Object.assign({}, this.queryParam, this.isorter); param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, onDateChange: function (value, dateString) { diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue index 0bd54d86..787b55dc 100644 --- a/jshERP-web/src/views/report/SaleOutReport.vue +++ b/jshERP-web/src/views/report/SaleOutReport.vue @@ -37,11 +37,27 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + + @@ -78,19 +94,16 @@ mpList: getMpListShort(Vue.ls.get('materialPropertyList')) }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, tabKey: "1", // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:60, - align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, {title: '条码', dataIndex: 'barCode', width: 160}, @@ -119,7 +132,7 @@ param.monthTime = this.queryParam.monthTime; param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, onChange: function (value, dateString) { diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue index 20af60a5..e0bcf87b 100644 --- a/jshERP-web/src/views/report/StockWarningReport.vue +++ b/jshERP-web/src/views/report/StockWarningReport.vue @@ -44,11 +44,27 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> + + + + + + + @@ -83,20 +99,17 @@ mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性 }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, depotList: [], tabKey: "1", // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:40, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, {title: '条码', dataIndex: 'barCode', width: 120}, @@ -122,7 +135,7 @@ let param = Object.assign({}, this.queryParam, this.isorter); param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, getDepotData() { diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index e2bb800d..38f8a7c2 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -53,7 +53,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :scroll="scroll" :loading="loading" @change="handleTableChange"> @@ -61,6 +61,22 @@ {{record.number}} + + + + + + + @@ -104,7 +120,8 @@ endTime: moment().format('YYYY-MM-DD'), }, ipagination:{ - pageSizeOptions: ['10', '20', '30', '100', '200'] + pageSize: 11, + pageSizeOptions: ['11', '21', '31', '101', '201'] }, dateFormat: 'YYYY-MM-DD', currentDay: moment().format('YYYY-MM-DD'), @@ -116,13 +133,9 @@ // 表头 columns: [ { - title: '#', - dataIndex: '', - key:'rowIndex', - width:40, - align:"center", + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { - return parseInt(index)+1; + return (t !== '合计') ? (parseInt(index) + 1) : t } }, { @@ -150,7 +163,7 @@ let param = Object.assign({}, this.queryParam, this.isorter); param.field = this.getQueryField(); param.currentPage = this.ipagination.current; - param.pageSize = this.ipagination.pageSize; + param.pageSize = this.ipagination.pageSize-1; return param; }, initSupplier() { @@ -194,6 +207,7 @@ if (res.code===200) { this.dataSource = res.data.rows; this.ipagination.total = res.data.total; + this.tableAddTotalRow(this.columns, this.dataSource) if(this.queryParam.organId) { this.firstTotal = '期初应付：' + res.data.firstMoney + "，" this.lastTotal = '期末应付：' + res.data.lastMoney