From 71e10b9fcb62957885cb0974e44b572c80c4f1cb Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 14 Jan 2024 20:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=9F=BA=E7=A1=80=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA=E8=B5=B0=E6=8E=A5=E5=8F=A3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/AccountReport.vue      | 12 +++++++-----
 jshERP-web/src/views/report/AllocationDetail.vue   | 13 ++++++++-----
 jshERP-web/src/views/report/BuyInReport.vue        | 13 ++++++++-----
 jshERP-web/src/views/report/CustomerAccount.vue    | 11 +++++++----
 jshERP-web/src/views/report/InDetail.vue           | 13 ++++++++-----
 jshERP-web/src/views/report/InMaterialCount.vue    | 11 +++++++----
 jshERP-web/src/views/report/InOutStockReport.vue   | 13 ++++++++-----
 jshERP-web/src/views/report/MaterialStock.vue      |  2 +-
 jshERP-web/src/views/report/OutDetail.vue          | 13 ++++++++-----
 jshERP-web/src/views/report/OutMaterialCount.vue   | 11 +++++++----
 jshERP-web/src/views/report/RetailOutReport.vue    | 13 ++++++++-----
 jshERP-web/src/views/report/SaleOutReport.vue      | 13 ++++++++-----
 jshERP-web/src/views/report/StockWarningReport.vue | 13 ++++++++-----
 jshERP-web/src/views/report/VendorAccount.vue      | 11 +++++++----
 14 files changed, 100 insertions(+), 62 deletions(-)

diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue
index 4087c5d6..c9828b23 100644
--- a/jshERP-web/src/views/report/AccountReport.vue
+++ b/jshERP-web/src/views/report/AccountReport.vue
@@ -77,7 +77,6 @@
 <script>
   import AccountInOutList from './modules/AccountInOutList'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { openDownloadDialog, sheet2blob} from "@/utils/util"
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import {getAction} from '@/api/manage'
   export default {
@@ -162,13 +161,16 @@
         this.$refs.accountInOutList.disableSubmit = false;
       },
       exportExcel() {
-        let aoa = [['名称', '编号', '期初金额', '本月发生额', '当前余额']]
+        let list = []
+        let head = '名称,编号,期初金额,本月发生额,当前余额'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           let ds = this.dataSource[i]
-          let item = [ds.name, ds.serialNo, ds.initialAmount, ds.thisMonthAmount, ds.currentAmount]
-          aoa.push(item)
+          item.push(ds.name, ds.serialNo, ds.initialAmount, ds.thisMonthAmount, ds.currentAmount)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '账户统计')
+        let tip = '账户统计查询'
+        this.handleExportXlsPost('账户统计', '账户统计', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue
index c9ae3c50..c9944fdd 100644
--- a/jshERP-web/src/views/report/AllocationDetail.vue
+++ b/jshERP-web/src/views/report/AllocationDetail.vue
@@ -276,14 +276,17 @@
         }
       },
       exportExcel() {
-        let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '调出仓库', '调入仓库', '调拨日期', '备注']]
+        let list = []
+        let head = '单据编号,条码,名称,规格,型号,单位,数量,单价,金额,调出仓库,调入仓库,调拨日期,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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)
+          item.push(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)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '调拨明细')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('调拨明细', '调拨明细', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue
index 8ca85e85..9fc9c74e 100644
--- a/jshERP-web/src/views/report/BuyInReport.vue
+++ b/jshERP-web/src/views/report/BuyInReport.vue
@@ -261,14 +261,17 @@
         }
       },
       exportExcel() {
-        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '进货数量', '进货金额', '退货数量', '退货金额', '实际采购金额']]
+        let list = []
+        let head = '条码,名称,规格,型号,扩展信息,单位,进货数量,进货金额,退货数量,退货金额,实际采购金额'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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, ds.inOutSumPrice]
-          aoa.push(item)
+          item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit,
+            ds.inSum, ds.inSumPrice, ds.outSum, ds.outSumPrice, ds.inOutSumPrice)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '进货统计')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('进货统计', '进货统计', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue
index 903613e3..c8c9ff17 100644
--- a/jshERP-web/src/views/report/CustomerAccount.vue
+++ b/jshERP-web/src/views/report/CustomerAccount.vue
@@ -220,13 +220,16 @@
         }
       },
       exportExcel() {
-        let aoa = [['客户', '联系人', '手机号码', '联系电话', '电子邮箱', '期初应收', '本期欠款', '本期收款', '期末应收']]
+        let list = []
+        let head = '客户,联系人,手机号码,联系电话,电子邮箱,期初应收,本期欠款,本期收款,期末应收'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           let ds = this.dataSource[i]
-          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.preNeed, ds.debtMoney, ds.backMoney, ds.allNeed]
-          aoa.push(item)
+          item.push(ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.preNeed, ds.debtMoney, ds.backMoney, ds.allNeed)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '客户对账')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('客户对账', '客户对账', head, tip, list)
       },
       showDebtAccountList(record) {
         this.$refs.debtAccountList.show(record.id, '出库', '销售', '客户', "", this.queryParam.beginTime, this.queryParam.endTime)
diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index e5bdc222..b20c5ef4 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -288,14 +288,17 @@
         }
       },
       exportExcel() {
-        let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '税率(%)', '税额', '往来单位', '仓库', '入库日期', '备注']]
+        let list = []
+        let head = '单据编号,条码,名称,规格,型号,单位,数量,单价,金额,税率(%),税额,往来单位,仓库,入库日期,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark]
-          aoa.push(item)
+          item.push(ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.operNumber, ds.unitPrice,
+            ds.allPrice, ds.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '入库明细')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('入库明细', '入库明细', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue
index c6bd897d..7ccb0971 100644
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@@ -228,13 +228,16 @@
         }
       },
       exportExcel() {
-        let aoa = [['条码', '名称', '规格', '型号', '类别', '单位', '入库数量', '入库金额']]
+        let list = []
+        let head = '条码,名称,规格,型号,类别,单位,入库数量,入库金额'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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)
+          item.push(ds.barCode, ds.mName, ds.standard, ds.model, ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '入库汇总')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('入库汇总', '入库汇总', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index 6db4c764..1ef728c6 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -245,14 +245,17 @@
         }
       },
       exportExcel() {
-        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '单价', '上月结存数量', '入库数量', '出库数量', '本月结存数量', '结存金额']]
+        let list = []
+        let head = '条码,名称,规格,型号,扩展信息,单位,单价,上月结存数量,入库数量,出库数量,本月结存数量,结存金额'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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)
+          item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.unitName, ds.unitPrice,
+            ds.prevSum, ds.inSum, ds.outSum, ds.thisSum, ds.thisAllPrice)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '进销存统计')
+        let tip = '月份：' + this.queryParam.monthTime
+        this.handleExportXlsPost('进销存统计', '进销存统计', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 283c132f..b88b04a7 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -288,7 +288,7 @@
       },
       exportExcel() {
         let list = []
-        let head = '条码, 名称, 规格, 型号, 颜色, 类别, 单位, 单价, 初始库存, 库存, 库存金额, 重量'
+        let head = '条码,名称,规格,型号,颜色,类别,单位,单价,初始库存,库存,库存金额,重量'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index d745d552..1a6584de 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -288,14 +288,17 @@
         }
       },
       exportExcel() {
-        let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '税率(%)', '税额', '往来单位', '仓库', '出库日期', '备注']]
+        let list = []
+        let head = '单据编号,条码,名称,规格,型号,单位,数量,单价,金额,税率(%),税额,往来单位,仓库,出库日期,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark]
-          aoa.push(item)
+          item.push(ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.operNumber, ds.unitPrice,
+            ds.allPrice, ds.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '出库明细')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('出库明细', '出库明细', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue
index 993a0581..abfc44f0 100644
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@@ -228,13 +228,16 @@
         }
       },
       exportExcel() {
-        let aoa = [['条码', '名称', '规格', '型号', '类型', '单位', '出库数量', '出库金额']]
+        let list = []
+        let head = '条码,名称,规格,型号,类型,单位,出库数量,出库金额'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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)
+          item.push(ds.barCode, ds.mName, ds.standard, ds.model, ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '出库汇总')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('出库汇总', '出库汇总', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/RetailOutReport.vue b/jshERP-web/src/views/report/RetailOutReport.vue
index 31c9832f..58f6cd43 100644
--- a/jshERP-web/src/views/report/RetailOutReport.vue
+++ b/jshERP-web/src/views/report/RetailOutReport.vue
@@ -263,14 +263,17 @@
         }
       },
       exportExcel() {
-        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '零售数量', '零售金额', '退货数量', '退货金额', '实际零售金额']]
+        let list = []
+        let head = '条码,名称,规格,型号,扩展信息,单位,零售数量,零售金额,退货数量,退货金额,实际零售金额'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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)
+          item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit, ds.outSum,
+            ds.outSumPrice, ds.inSum, ds.inSumPrice, ds.outInSumPrice)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '零售统计')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('零售统计', '零售统计', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue
index 56a986f1..e24805ad 100644
--- a/jshERP-web/src/views/report/SaleOutReport.vue
+++ b/jshERP-web/src/views/report/SaleOutReport.vue
@@ -263,14 +263,17 @@
         }
       },
       exportExcel() {
-        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '销售数量', '销售金额', '退货数量', '退货金额', '实际销售金额']]
+        let list = []
+        let head = '条码,名称,规格,型号,扩展信息,单位,销售数量,销售金额,退货数量,退货金额,实际销售金额'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           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)
+          item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit, ds.outSum,
+            ds.outSumPrice, ds.inSum, ds.inSumPrice, ds.outInSumPrice)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '销售统计')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('销售统计', '销售统计', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue
index 6b7d4399..20708dd2 100644
--- a/jshERP-web/src/views/report/StockWarningReport.vue
+++ b/jshERP-web/src/views/report/StockWarningReport.vue
@@ -153,14 +153,17 @@
         })
       },
       exportExcel() {
-        let aoa = [['仓库', '条码', '名称', '规格', '型号', '扩展信息', '单位', '库存', '最低安全库存', '最高安全库存', '建议入库量', '建议出库量']]
+        let list = []
+        let head = '仓库,条码,名称,规格,型号,扩展信息,单位,库存,最低安全库存,最高安全库存,建议入库量,建议出库量'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           let ds = this.dataSource[i]
-          let item = [ds.depotName, ds.barCode, ds.mname, ds.mstandard, ds.mmodel, ds.materialOther, ds.materialUnit,
-            ds.currentNumber, ds.lowSafeStock, ds.highSafeStock, ds.lowCritical, ds.highCritical]
-          aoa.push(item)
+          item.push(ds.depotName, ds.barCode, ds.mname, ds.mstandard, ds.mmodel, ds.materialOther, ds.materialUnit,
+            ds.currentNumber, ds.lowSafeStock, ds.highSafeStock, ds.lowCritical, ds.highCritical)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '库存预警')
+        let tip = '库存预警查询'
+        this.handleExportXlsPost('库存预警', '库存预警', head, tip, list)
       }
     }
   }
diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index 52a4e1d6..6f2fce7b 100644
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@@ -220,13 +220,16 @@
         }
       },
       exportExcel() {
-        let aoa = [['供应商', '联系人', '手机号码', '联系电话', '电子邮箱', '期初应付', '本期欠款', '本期付款', '期末应付']]
+        let list = []
+        let head = '供应商,联系人,手机号码,联系电话,电子邮箱,期初应付,本期欠款,本期付款,期末应付'
         for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
           let ds = this.dataSource[i]
-          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.preNeed, ds.debtMoney, ds.backMoney, ds.allNeed]
-          aoa.push(item)
+          item.push(ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.preNeed, ds.debtMoney, ds.backMoney, ds.allNeed)
+          list.push(item)
         }
-        openDownloadDialog(sheet2blob(aoa), '供应商对账')
+        let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime
+        this.handleExportXlsPost('供应商对账', '供应商对账', head, tip, list)
       },
       showDebtAccountList(record) {
         this.$refs.debtAccountList.show(record.id, '入库', '采购', '供应商', "", this.queryParam.beginTime, this.queryParam.endTime)