From a4454b05ef488605230b682d0b997f1b0d36b721 Mon Sep 17 00:00:00 2001
From: lichong <18518571399@163.com>
Date: Tue, 19 Nov 2024 22:07:44 +0800
Subject: [PATCH] 11.19

---
 package.json                                  |   3 +-
 src/main/index.js                             |   2 +-
 src/renderer/src/App.vue                      |   6 +-
 .../WKM25471-02D装箱单(1) - 副本.xlsx    | Bin 0 -> 14380 bytes
 src/renderer/src/views/shujuguanli.vue        | 261 +++++++++++++-----
 5 files changed, 199 insertions(+), 73 deletions(-)
 create mode 100644 src/renderer/src/assets/excel/WKM25471-02D装箱单(1) - 副本.xlsx

diff --git a/package.json b/package.json
index 2cf89d2..f2b6c72 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,8 @@
     "dexie": "^4.0.8",
     "element-plus": "^2.7.1",
     "lodash": "^4.17.21",
-    "vxe-table": "^4.7.87"
+    "vxe-table": "^4.7.87",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.2.0",
diff --git a/src/main/index.js b/src/main/index.js
index f1e8f34..ec201cd 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -24,7 +24,7 @@ function createWindow() {
   })
   mainWindow.on('ready-to-show', () => {
     mainWindow.show()
-    // mainWindow.webContents.openDevTools()
+    mainWindow.webContents.openDevTools()
   })
   mainWindow.webContents.setWindowOpenHandler((details) => {
     shell.openExternal(details.url)
diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index 17fd3e0..d9eda17 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -12,9 +12,7 @@
 <script>
 import _ from 'lodash'
 import dayjs from 'dayjs'
-import { myDatabase } from './assets/js/db.js'
 import shujuguanliComponent from "./views/shujuguanli.vue"
-import { ElMessage } from 'element-plus';
 export default {
   name: 'app',
   components: { shujuguanliComponent },
@@ -22,7 +20,7 @@ export default {
     return {
       _: _,
       dayjs: dayjs,
-      isVip: true,
+      isVip: false,
       jihuoma: "",
       zhucema: "",
     }
@@ -32,7 +30,7 @@ export default {
   methods: {
   },
   async mounted() {
-    let fiveDay = dayjs('2024-11-7T00:00:00').valueOf()
+    let fiveDay = dayjs('2024-12-7T00:00:00').valueOf()
     if (!this.isVip) {
       if (dayjs().valueOf() > fiveDay) {
         this.isVip = false
diff --git a/src/renderer/src/assets/excel/WKM25471-02D装箱单(1) - 副本.xlsx b/src/renderer/src/assets/excel/WKM25471-02D装箱单(1) - 副本.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c6be1ab1ccff3a7bdb6420c61d7b9b17baef0fad
GIT binary patch
literal 14380
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

literal 0
HcmV?d00001

diff --git a/src/renderer/src/views/shujuguanli.vue b/src/renderer/src/views/shujuguanli.vue
index 25252e2..f75fd33 100644
--- a/src/renderer/src/views/shujuguanli.vue
+++ b/src/renderer/src/views/shujuguanli.vue
@@ -4,7 +4,7 @@
       <el-row style="margin-bottom: 8px;">
         <el-col>
           <div class="inputClass uploadClass">
-            <el-upload :show-file-list="false" v-model="fileOriData" :before-upload="beforeAvatarUpload"
+            <el-upload :show-file-list="false" v-model="fileOriData1" :before-upload="beforeAvatarUpload"
               :http-request="successSubmit1" accept=".xls,.xlsx,.csv">
               <el-button type="success">
                 <el-icon>
@@ -15,7 +15,7 @@
             </el-upload>
           </div>
           <div class="inputClass uploadClass">
-            <el-upload :show-file-list="false" v-model="fileOriData" :before-upload="beforeAvatarUpload"
+            <el-upload :show-file-list="false" v-model="fileOriData2" :before-upload="beforeAvatarUpload"
               :http-request="successSubmit2" accept=".xls,.xlsx,.csv">
               <el-button type="success">
                 <el-icon>
@@ -25,6 +25,12 @@
               </el-button>
             </el-upload>
           </div>
+          <el-button type="primary" @click="viewTable" :disabled="!tableData.length">
+            <el-icon>
+              <Download />
+            </el-icon>
+            <span>预览</span>
+          </el-button>
           <el-button type="primary" @click="exportData" :disabled="!tableData.length">
             <el-icon>
               <Download />
@@ -35,7 +41,7 @@
       </el-row>
     </div>
     <div v-loading="loading">
-      <tablecomponent :tableHeader="tableHeader" :tableData="tableData" ref="tableComponentRef">
+      <tablecomponent :tableHeader="tableHeader" :tableData="fileData2" ref="tableComponentRef">
       </tablecomponent>
     </div>
   </div>
@@ -43,8 +49,8 @@
 
 <script>
 import _ from 'lodash'
-import tableHeaderLocal from '../assets/json/shujuguanli.json'
 import dayjs from 'dayjs'
+import * as XLSX from 'xlsx';
 import tablecomponent from "../components/tablecomponent.vue"
 import { ElMessage, ElMessageBox } from 'element-plus'
 export default {
@@ -57,6 +63,10 @@ export default {
       _: _,
       dayjs: dayjs,
       tableHeader: [],
+      fileOriData1: null,
+      fileData1: null,
+      fileOriData2: null,
+      fileData2: null,
       tableData: [],
       loading: false,
     }
@@ -84,34 +94,63 @@ export default {
       this.fileDealData = []
       let fileReader = new FileReader()
       fileReader.onload = async function () {
-        let data = this.result
-        let workbook = XLSX.read(data, { type: 'binary' })
-        let sheetName = workbook.SheetNames[0]
-        let sheetData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName])
-        for (let i = 0; i < sheetData.length; i++) {
-          let element = sheetData[i];
-          let dealItem = {}
-          for (let key in element) {
-            let headerItem = _.find(tableHeaderLocal, o => o.label === key)
-            if (headerItem) {
-              dealItem[headerItem.prop] = element[key]
+        let data = this.result;
+        // 读取Excel文件
+        let workbook = XLSX.read(data, { type: 'array' });
+        // 获取第一个工作表的名称
+        let sheetName = workbook.SheetNames[0];
+        let sheetData = workbook.Sheets[sheetName];
+        let range = XLSX.utils.decode_range(sheetData['!ref']);
+        // 获取合并单元格的范围信息
+        let mergeRanges = sheetData['!merges'];
+        if (!mergeRanges) {
+          mergeRanges = [];
+        }
+        let allCells = [];
+        for (let rowIndex = range.s.r; rowIndex <= range.e.r; ++rowIndex) {
+          let newRow = {};
+          for (let colIndex = range.s.c; colIndex <= range.e.c; ++colIndex) {
+            let cell = sheetData[XLSX.utils.encode_cell({
+              c: colIndex,
+              r: rowIndex
+            })];
+            let cellContent = '';
+            if (cell && cell.t) {
+              cellContent = XLSX.utils.format_cell(cell);
             }
+            // 检查当前单元格是否在合并单元格范围内
+            let isMergedCell = false;
+            for (let i = 0; i < mergeRanges.length; i++) {
+              let mergeRange = mergeRanges[i];
+              if (rowIndex >= mergeRange.s.r && rowIndex <= mergeRange.e.r &&
+                colIndex >= mergeRange.s.c && colIndex <= mergeRange.e.c) {
+                isMergedCell = true;
+                break;
+              }
+            }
+            if (isMergedCell) {
+              // 如果是合并单元格，找到对应的合并单元格的左上角单元格内容作为填充内容
+              for (let i = 0; i < mergeRanges.length; i++) {
+                let mergeRange = mergeRanges[i];
+                if (rowIndex >= mergeRange.s.r && rowIndex <= mergeRange.e.r &&
+                  colIndex >= mergeRange.s.c && colIndex <= mergeRange.e.c) {
+                  let topLeftCell = sheetData[XLSX.utils.encode_cell({
+                    c: mergeRange.s.c,
+                    r: mergeRange.s.r
+                  })];
+                  if (topLeftCell && topLeftCell.t) {
+                    cellContent = XLSX.utils.format_cell(topLeftCell);
+                  }
+                  break;
+                }
+              }
+            }
+            newRow[String.fromCharCode("a".charCodeAt() + colIndex)] = cellContent;
           }
-          try {
-            await myDatabase.student.add({
-              ...dealItem,
-              ...that.dealRow(dealItem),
-              create_at: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-              update_at: dayjs().format('YYYY-MM-DD HH:mm:ss')
-            })
-          } catch (error) {
-            ElMessage({
-              message: `${dealItem.name}(${dealItem.xuejihao})学籍号重复，不可再次新增该学生信息`,
-              type: 'error',
-            })
-          }
+          allCells.push(newRow);
         }
-        await that.searchData(true)
+        console.log(122, allCells);
+        that.fileData1 = allCells
       }
       fileReader.onerror = function (error) {
         ElMessage({
@@ -132,30 +171,7 @@ export default {
         let workbook = XLSX.read(data, { type: 'binary' })
         let sheetName = workbook.SheetNames[0]
         let sheetData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName])
-        for (let i = 0; i < sheetData.length; i++) {
-          let element = sheetData[i];
-          let dealItem = {}
-          for (let key in element) {
-            let headerItem = _.find(tableHeaderLocal, o => o.label === key)
-            if (headerItem) {
-              dealItem[headerItem.prop] = element[key]
-            }
-          }
-          try {
-            await myDatabase.student.add({
-              ...dealItem,
-              ...that.dealRow(dealItem),
-              create_at: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-              update_at: dayjs().format('YYYY-MM-DD HH:mm:ss')
-            })
-          } catch (error) {
-            ElMessage({
-              message: `${dealItem.name}(${dealItem.xuejihao})学籍号重复，不可再次新增该学生信息`,
-              type: 'error',
-            })
-          }
-        }
-        await that.searchData(true)
+        that.dealData2(sheetData)
       }
       fileReader.onerror = function (error) {
         ElMessage({
@@ -165,6 +181,121 @@ export default {
       }
       fileReader.readAsArrayBuffer(file)
     },
+    dealData2(sheetData) {
+      console.log(155, sheetData);
+      if (this.fileData1.length === 0) {
+        ElMessage({
+          message: `请先导入A表数据`,
+          type: 'error',
+        })
+      } else {
+        for (let i = 0; i < sheetData.length; i++) {
+          let element = sheetData[i];
+          let itemList = _.filter(this.fileData1, o => {
+            // CH
+            if (`${o.G4}` === `${element.Store}` && `${o.H4}` === `${element.Order}`) {
+              return true
+            } else {
+              return false
+            }
+            // // M
+            // else if (`${o.G4}` === `${element.Store}` && `${o.H4}` === `${element.Order}` && `${element.Description}` === `VESTIDO DISNEY DTR, CH, AZUL MARINO WKM`) {
+
+            // }
+            // // G
+            // else if (`${o.G4}` === `${element.Store}` && `${o.H4}` === `${element.Order}` && `${element.Description}` === `VESTIDO DISNEY DTR, CH, AZUL MARINO WKM`) {
+
+            // }
+            // // EG
+            // else if (`${o.G4}` === `${element.Store}` && `${o.H4}` === `${element.Order}` && `${element.Description}` === `VESTIDO DISNEY DTR, CH, AZUL MARINO WKM`) {
+
+            // }
+            // Description: "VESTIDO DISNEY DTR, CH, AZUL MARINO WKM"
+            // Order: "6000046296"
+            // Store: "0000000491"
+          })
+          for (let j = 0; j < itemList.length; j++) {
+            let item = itemList[j];
+            // CH
+            if (_.startsWith(`${element.Description}`, `VESTIDO DISNEY DTR, CH, AZUL MARINO WKM`)) {
+            }
+            // M
+            else if (_.startsWith(`${element.Description}`, `VESTIDO DISNEY DTR, M, AZUL MARINO WKM`)) {
+
+            }
+            // G
+            else if (_.startsWith(`${element.Description}`, `VESTIDO DISNEY DTR, G, AZUL MARINO WKM`)) {
+
+            }
+            // EG
+            else if (_.startsWith(`${element.Description}`, `VESTIDO DISNEY DTR, EG, AZUL MARINO WKM`)) {
+
+            }
+
+          }
+
+        }
+
+        that.fileData2 = sheetData
+      }
+    },
+    // 解析单元格合并数据方法
+    // 解析表格单元格合并数据  把参与合并的单元格全部计算并统计位置信息
+    xlsxMergeParse(merges) {
+      let arr = []
+
+      merges.map(v => {
+        let { s, e } = v
+        let result = []
+        let addNum = 1	//使数组下标加一，符合Excel单元格下标
+        if (s.c === e.c) {
+          for (let i = s.r; i < e.r + 1; i++) { result.push([i + addNum, s.c + addNum]) }
+        } else {
+          for (let i = s.c; i < e.c + 1; i++) { result.push([s.r + addNum, i + addNum]) }
+        }
+        arr.push(result)
+      })
+
+      return arr
+
+    },
+
+    // 单元格合并数据建立索引
+    // 单元格合并数据为三维数组，为了提升数据处理效率，添加索引（变为一维数组，序列化位置信息）
+    mergeIndex(mergesParse) {
+
+      let datas = []
+
+      mergesParse.map((v, i) => {
+        let row = []
+        v.map((v1, i1) => {
+          row.push(v1.join(','))
+          row.push([i, i1].join('-'))
+        })
+        datas.push(row)
+      })
+
+      return datas.flat(Infinity)
+    },
+
+    // 根据单元格下标计算应该填充的值
+    autoFill(point, index, mergesParses, sheetData) {
+
+      // 判断此单元格是否属于合并单元格
+      let isNeed = index.indexOf(point.join(','))
+      if (isNeed < 0) return undefined
+
+      // 通过索引获取映射的合并数据三维数组的下标
+      let target = index[isNeed + 1]
+      let result = target.split('-')[0]
+      result = mergesParses[result][0]
+
+      // 返回合并单元格左上单元格数据
+      result = sheetData[String.fromCharCode(result[1] + 64) + result[0]].w
+      return result
+    },
+    // 预览
+    viewTable() { },
     // 导出数据
     async exportData() {
       let listCopy = _.cloneDeep(this.tableData)
@@ -178,22 +309,18 @@ export default {
         }
         lilstLocal.push(listItem)
       }
-      let jsonWorkSheet = XLSX.utils.json_to_sheet(lilstLocal);
-      let workBook = {
-        SheetNames: ["sheet1"],
-        Sheets: {
-          ["sheet1"]: jsonWorkSheet,
-        }
-      };
-      XLSX.writeFile(workBook, `数据表格管理${dayjs().format("YYYY-MM-DD_HH-mm-ss")}.xls`);
-
+      console.log(135, lilstLocal);
+      // let jsonWorkSheet = XLSX.utils.json_to_sheet(lilstLocal);
+      // let workBook = {
+      //   SheetNames: ["sheet1"],
+      //   Sheets: {
+      //     ["sheet1"]: jsonWorkSheet,
+      //   }
+      // };
+      // XLSX.writeFile(workBook, `数据表格管理${dayjs().format("YYYY-MM-DD_HH-mm-ss")}.xls`);
     },
   },
-  async mounted() {
-    this.tableHeader = _.filter(tableHeaderLocal, o => o.tableShow)
-    this.formHeader = _.filter(tableHeaderLocal, o => o.formShow)
-    await this.updateSeach()
-  },
+  async mounted() { },
 }
 </script>
 <style scoped>