From 092fee68f068d35893286ecf4ccc5d7f2fbccc4b 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, 8 Sep 2021 22:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/financial/modules/MoneyInModal.vue  |  2 +-
 .../views/financial/modules/MoneyOutModal.vue |  2 +-
 jshERP-web/src/views/report/AccountReport.vue |  7 +++++--
 .../src/views/report/AllocationDetail.vue     | 18 ++++++++++++++--
 jshERP-web/src/views/report/BuyInReport.vue   | 20 +++++++++++++++---
 .../src/views/report/CustomerAccount.vue      | 19 ++++++++++++++---
 jshERP-web/src/views/report/InDetail.vue      | 18 ++++++++++++++--
 .../src/views/report/InMaterialCount.vue      | 17 +++++++++++++--
 .../src/views/report/InOutStockReport.vue     | 21 +++++++++++++++----
 jshERP-web/src/views/report/MaterialStock.vue |  7 +++++--
 jshERP-web/src/views/report/OutDetail.vue     | 18 ++++++++++++++--
 .../src/views/report/OutMaterialCount.vue     | 17 +++++++++++++--
 jshERP-web/src/views/report/SaleOutReport.vue | 18 ++++++++++++++--
 .../src/views/report/StockWarningReport.vue   | 21 ++++++++++++++-----
 jshERP-web/src/views/report/VendorAccount.vue | 19 ++++++++++++++---
 15 files changed, 188 insertions(+), 36 deletions(-)

diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index 60946a271..db068544d 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -242,7 +242,7 @@
       handleClickAdd() {
         let organId = this.form.getFieldValue('organId')
         if(organId){
-          this.$refs.debtBillList.show(organId, '出库', '销售', '客户', "0")
+          this.$refs.debtBillList.show(organId, '出库', '销售', '客户', "")
           this.$refs.debtBillList.title = "选择销售出库欠款单据"
         } else {
           this.$message.warning('请选择客户！');
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index 2eded369e..4f49b84a2 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -246,7 +246,7 @@
       handleClickAdd() {
         let organId = this.form.getFieldValue('organId')
         if(organId){
-          this.$refs.debtBillList.show(organId, '入库', '采购', '供应商', "0")
+          this.$refs.debtBillList.show(organId, '入库', '采购', '供应商', "")
           this.$refs.debtBillList.title = "选择采购入库欠款单据"
         } else {
           this.$message.warning('请选择供应商！');
diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue
index 4e9fa4846..b2a5df1e5 100644
--- a/jshERP-web/src/views/report/AccountReport.vue
+++ b/jshERP-web/src/views/report/AccountReport.vue
@@ -88,6 +88,9 @@
           name:'',
           serialNo:''
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         allMonthAmount: '',
         allCurrentAmount: '',
         tabKey: "1",
@@ -145,8 +148,8 @@
         let aoa = [['名称', '编号', '期初金额', '本月发生额', '账户流水']]
         for (let i = 0; i < this.dataSource.length; i++) {
           let ds = this.dataSource[i]
-          let itemDevice = [ds.name, ds.serialNo, ds.initialAmount, ds.thisMonthAmount, ds.currentAmount]
-          aoa.push(itemDevice)
+          let item = [ds.name, ds.serialNo, ds.initialAmount, ds.thisMonthAmount, ds.currentAmount]
+          aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '账户统计')
       }
diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue
index bd8b979bc..298271161 100644
--- a/jshERP-web/src/views/report/AllocationDetail.vue
+++ b/jshERP-web/src/views/report/AllocationDetail.vue
@@ -57,7 +57,8 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -91,7 +92,7 @@
 <script>
   import BillDetail from '../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getNowFormatMonth } from '@/utils/util';
+  import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
   import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -122,6 +123,9 @@
           endTime: moment().format('YYYY-MM-DD'),
           subType: "调拨"
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
@@ -211,6 +215,16 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '调出仓库', '调入仓库', '调拨日期', '备注']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.operNumber,
+            ds.unitPrice, ds.allPrice, ds.dname, ds.sname, ds.operTime, ds.newRemark]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '调拨明细')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue
index ed2efba36..3ba2ba47e 100644
--- a/jshERP-web/src/views/report/BuyInReport.vue
+++ b/jshERP-web/src/views/report/BuyInReport.vue
@@ -21,7 +21,8 @@
               <a-col :md="6" :sm="24">
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -49,7 +50,7 @@
 </template>
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getMpListShort } from "@/utils/util"
+  import { getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -76,6 +77,9 @@
           materialParam:'',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         tabKey: "1",
         // 表头
         columns: [
@@ -97,7 +101,7 @@
           {title: '单位', dataIndex: 'materialUnit', width: 80},
           {title: '进货数量', dataIndex: 'inSum', width: 80},
           {title: '进货金额', dataIndex: 'inSumPrice', width: 80},
-          {title: '退货数量', dataIndex: 'iutSum', width: 80},
+          {title: '退货数量', dataIndex: 'outSum', width: 80},
           {title: '退货金额', dataIndex: 'outSumPrice', width: 80}
         ],
         url: {
@@ -125,6 +129,16 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '进货数量', '进货金额', '退货数量', '退货金额']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit,
+            ds.inSum, ds.inSumPrice, ds.outSum, ds.outSumPrice]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '进货统计')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue
index ee7a9d896..dc20371bc 100644
--- a/jshERP-web/src/views/report/CustomerAccount.vue
+++ b/jshERP-web/src/views/report/CustomerAccount.vue
@@ -29,10 +29,11 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :md="3" :sm="24">
+              <a-col :md="4" :sm="24">
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
               <a-col :md="8" :sm="24">
@@ -73,7 +74,7 @@
   import BillDetail from '../bill/dialog/BillDetail'
   import FinancialDetail from '../financial/dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getNowFormatMonth } from '@/utils/util';
+  import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util"
   import { getAction } from '@/api/manage'
   import {findBySelectCus, findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -102,6 +103,9 @@
           beginTime: getNowFormatMonth() + '-01',
           endTime: moment().format('YYYY-MM-DD'),
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
@@ -207,6 +211,15 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['单据编号', '类型', '单位名称', '单据金额', '实际支付', '本期变化', '单据日期']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.number, ds.type, ds.supplierName, ds.billMoney, ds.changeAmount, ds.allPrice, ds.oTime]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '客户对账')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index f4d131f7f..942b9fd69 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -50,7 +50,8 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -84,7 +85,7 @@
 <script>
   import BillDetail from '../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getNowFormatMonth } from '@/utils/util';
+  import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
   import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -114,6 +115,9 @@
           endTime: moment().format('YYYY-MM-DD'),
           type: "入库"
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
@@ -203,6 +207,16 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '供应商', '仓库', '入库日期', '备注']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.operNumber, ds.unitPrice,
+            ds.allPrice, ds.sname, ds.dname, ds.operTime, ds.newRemark]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '入库明细')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue
index e8c818bcf..0a3a3d0f4 100644
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@@ -50,7 +50,8 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -78,7 +79,7 @@
 </template>
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getNowFormatMonth } from '@/utils/util';
+  import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
   import {findBySelectSup} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -107,6 +108,9 @@
           endTime: moment().format('YYYY-MM-DD'),
           type: "入库"
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
@@ -181,6 +185,15 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['条码', '名称', '规格', '型号', '类型', '单位', '入库数量', '入库金额']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.barCode, ds.mName, ds.standard, ds.model, ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '入库汇总')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index 7e189e8b0..bfdbf65bc 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -34,8 +34,8 @@
               <a-col :md="4" :sm="24">
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" type="primary" icon="download" @click="handleExportXls('库存状况')">导出</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
               <a-col :md="4" :sm="24">
@@ -69,7 +69,7 @@
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getAction } from '@/api/manage'
-  import { getMpListShort } from "@/utils/util"
+  import { getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -97,6 +97,9 @@
           materialParam:'',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         tabKey: "1",
         depotList: [],
         totalCountMoneyStr: '',
@@ -128,7 +131,7 @@
         url: {
           list: "/depotItem/findByAll",
           totalCountMoney: "/depotItem/totalCountMoney",
-          exportXlsUrl: "/depotItem/exportExcel",
+          exportXlsUrl: "/depotItem/exportExcel"
         }
       }
     },
@@ -177,6 +180,16 @@
           this.loadData(1);
           this.getTotalCountMoney();
         }
+      },
+      exportExcel() {
+        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '单价', '上月结存数量', '入库数量', '出库数量', '本月结存数量', '结存金额']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.unitName, ds.unitPrice,
+            ds.prevSum, ds.inSum, ds.outSum, ds.thisSum, ds.thisAllPrice]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '进销存统计')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 4adbd2546..05fec672e 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -108,6 +108,9 @@
           materialParam:'',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         depotList: [],
         categoryTree:[],
         currentStock: '',
@@ -212,9 +215,9 @@
         let aoa = [['条码', '名称', '规格', '型号', '颜色', '类别', '单位', '单价', '初始库存', '当前库存', '当前库存金额']]
         for (let i = 0; i < this.dataSource.length; i++) {
           let ds = this.dataSource[i]
-          let itemDevice = [ds.mBarCode, ds.name, ds.standard, ds.model, ds.color, ds.categoryName, ds.unitName,
+          let item = [ds.mBarCode, ds.name, ds.standard, ds.model, ds.color, ds.categoryName, ds.unitName,
             ds.purchaseDecimal, ds.initialStock, ds.currentStock, ds.currentStockPrice]
-          aoa.push(itemDevice)
+          aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '商品库存')
       }
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index aaf79d818..65e7f0639 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -50,7 +50,8 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -84,7 +85,7 @@
 <script>
   import BillDetail from '../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getNowFormatMonth } from '@/utils/util';
+  import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
   import {findBySelectCus, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -114,6 +115,9 @@
           endTime: moment().format('YYYY-MM-DD'),
           type: "出库"
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
@@ -203,6 +207,16 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '客户', '仓库', '出库日期', '备注']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.operNumber, ds.unitPrice,
+            ds.allPrice, ds.sname, ds.dname, ds.operTime, ds.newRemark]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '出库明细')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue
index 2c0ba3560..9daecb85d 100644
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@@ -50,7 +50,8 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -78,7 +79,7 @@
 </template>
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getNowFormatMonth } from '@/utils/util';
+  import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
   import {findBySelectCus} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -107,6 +108,9 @@
           endTime: moment().format('YYYY-MM-DD'),
           type: "出库"
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
@@ -181,6 +185,15 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['条码', '名称', '规格', '型号', '类型', '单位', '出库数量', '出库金额']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.barCode, ds.mName, ds.standard, ds.model, ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '出库汇总')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue
index 6553d372b..9f2d046ee 100644
--- a/jshERP-web/src/views/report/SaleOutReport.vue
+++ b/jshERP-web/src/views/report/SaleOutReport.vue
@@ -21,7 +21,8 @@
               <a-col :md="6" :sm="24">
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -49,7 +50,7 @@
 </template>
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getMpListShort } from "@/utils/util"
+  import { getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -76,6 +77,9 @@
           materialParam:'',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         tabKey: "1",
         // 表头
         columns: [
@@ -128,6 +132,16 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '销售数量', '销售金额', '退货数量', '退货金额', '实际销售金额']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit, ds.outSum,
+            ds.outSumPrice, ds.inSum, ds.inSumPrice, ds.outInSumPrice]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '销售统计')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue
index c140925e8..bbda49d51 100644
--- a/jshERP-web/src/views/report/StockWarningReport.vue
+++ b/jshERP-web/src/views/report/StockWarningReport.vue
@@ -28,8 +28,8 @@
               <a-col :md="6" :sm="24">
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" type="primary" icon="download" @click="handleExportXls('库存预警')">导出</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
             </a-row>
@@ -59,7 +59,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import {getAction} from '@/api/manage'
-  import { getMpListShort } from "@/utils/util"
+  import { getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import Vue from 'vue'
   export default {
     name: "StockWarningReport",
@@ -82,6 +82,9 @@
           depotId: '',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         depotList: [],
         tabKey: "1",
         // 表头
@@ -107,8 +110,7 @@
           {title: '建议入库量', dataIndex: 'linjieNumber', width: 80}
         ],
         url: {
-          list: "/depotItem/findStockWarningCount",
-          exportXlsUrl: "/depotItem/exportWarningExcel",
+          list: "/depotItem/findStockWarningCount"
         }
       }
     },
@@ -131,6 +133,15 @@
             this.$message.info(res.data);
           }
         })
+      },
+      exportExcel() {
+        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '安全存量', '当前库存', '建议入库量']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.barCode, ds.mname, ds.mstandard, ds.mmodel, ds.materialOther, ds.materialUnit, ds.safetystock, ds.currentNumber, ds.linjieNumber]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '库存预警')
       }
     }
   }
diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index bd20cc1ca..642c49b1d 100644
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@@ -29,10 +29,11 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :md="3" :sm="24">
+              <a-col :md="4" :sm="24">
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
                 </span>
               </a-col>
               <a-col :md="8" :sm="24">
@@ -73,7 +74,7 @@
   import BillDetail from '../bill/dialog/BillDetail'
   import FinancialDetail from '../financial/dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getNowFormatMonth } from '@/utils/util';
+  import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util"
   import { getAction } from '@/api/manage'
   import {findBySelectSup, findBillDetailByNumber,findFinancialDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -102,6 +103,9 @@
           beginTime: getNowFormatMonth() + '-01',
           endTime: moment().format('YYYY-MM-DD'),
         },
+        ipagination:{
+          pageSizeOptions: ['10', '100', '200']
+        },
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
@@ -207,6 +211,15 @@
         } else {
           this.loadData(1);
         }
+      },
+      exportExcel() {
+        let aoa = [['单据编号', '类型', '单位名称', '单据金额', '实际支付', '本期变化', '单据日期']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.number, ds.type, ds.supplierName, ds.billMoney, ds.changeAmount, ds.allPrice, ds.oTime]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '供应商对账')
       }
     }
   }