给报表增加合计的功能

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"
       }
+      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);
     }
   }
 

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 @@
                 <a @click="showAccountInOutList(record)">流水</a>
               </span>
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
         <account-in-out-list ref="accountInOutList" @ok="modalFormOk"></account-in-out-list>
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:60, align:"center",
-            dataIndex: '',
-            key:'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) {

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 @@
               <a @click="myHandleDetail(record)">{{record.number}}</a>
             </span>
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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) {

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">
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
       </a-card>
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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},
@@ -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() {

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 @@
               <a @click="myHandleDetail(record)">{{record.number}}</a>
             </span>
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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

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 @@
               <a @click="myHandleDetail(record)">{{record.number}}</a>
             </span>
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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) {

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">
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
       </a-card>
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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) {

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">
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
       </a-card>
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            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: 'materialOther', width: 80},
-          {title: '单位', dataIndex: 'unitName', 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() {

jshERP-web/src/views/report/MaterialStock.vue

@@ -70,9 +70,8 @@
               </span>
           </a-table>
           <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
-            <a-col :md="12" :sm="24"></a-col>
+            <a-col :md="24" :sm="24">
-            <a-col :md="12" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
-              <a-pagination @change="onChange" @showSizeChange="onShowSizeChange"
                 size="small"
                 show-size-changer
                 :showQuickJumper="true"
@@ -215,9 +214,9 @@
           if (res.code===200) {
             this.dataSource = res.data.rows;
             this.ipagination.total = res.data.total;
+            this.tableAddTotalRow(this.columns, this.dataSource)
             this.currentStock = res.data.currentStock;
             this.currentStockPrice = res.data.currentStockPrice;
-            this.tableAddTotalRow(this.columns, this.dataSource)
           }
           if(res.code===510){
             this.$message.warning(res.data)
@@ -239,16 +238,6 @@
           aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '商品库存')
-      },
-      onChange(page, pageSize) {
-        this.ipagination.current = page
-        this.ipagination.pageSize = pageSize
-        this.loadData(this.ipagination.current);
-      },
-      onShowSizeChange(current, size) {
-        this.ipagination.current = current
-        this.ipagination.pageSize = size
-        this.loadData(this.ipagination.current);
       }
     }
   }

jshERP-web/src/views/report/OutDetail.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 @@
               <a @click="myHandleDetail(record)">{{record.number}}</a>
             </span>
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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) {

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">
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
       </a-card>
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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) {

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">
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
       </a-card>
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:60, align:"center",
-            dataIndex: '',
-            key:'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) {

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">
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
       </a-card>
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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() {

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 @@
               <a @click="myHandleDetail(record)">{{record.number}}</a>
             </span>
           </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
         </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
@@ -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: '#',
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
-            dataIndex: '',
-            key:'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