From 46528c3843ce67038ddb2e00dd3d3998c206a69e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 06 五月 2024 17:26:10 +0800
Subject: [PATCH] 1.递交

---
 src/components/UploadExcel/index.vue |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/UploadExcel/index.vue b/src/components/UploadExcel/index.vue
index 5f82c34..a9f2292 100644
--- a/src/components/UploadExcel/index.vue
+++ b/src/components/UploadExcel/index.vue
@@ -12,6 +12,8 @@
       style="margin-left:16px;"
       :disabled="disabled"
       type="primary"
+      icon="el-icon-upload2"
+      waves
       @click="handleUpload"
     >
       鏂囦欢涓婁紶
@@ -21,8 +23,10 @@
 
 <script>
 import XLSX from 'xlsx'
+import waves from '@/directive/waves'
 
 export default {
+  directives: { waves },
   props: {
     disabled: Boolean,
     beforeUpload: Function, // eslint-disable-line
@@ -80,14 +84,14 @@
         const reader = new FileReader()
         reader.onload = e => {
           const data = e.target.result
-          const workbook = XLSX.read(data, { type: 'array' })
+          const workbook = XLSX.read(data, { type: 'array', cellDates: true })
           let worksheet = []
           const header = []
           const results = []
           workbook.SheetNames.forEach((item, index) => {
             worksheet = workbook.Sheets[item]
             header.push(this.getHeaderRow(worksheet))
-            results.push(XLSX.utils.sheet_to_json(worksheet))
+            results.push(XLSX.utils.sheet_to_json(worksheet, { defval: null, raw: false }))
           })
           this.excelData.sheetName = workbook.SheetNames
           // console.log(header)

--
Gitblit v1.9.3