Sfoglia il codice sorgente

根据错误日志,增加部分兼容代码

MaiXinRong 5 anni fa
parent
commit
0cdfb7645d

+ 1 - 1
app/base/base_bills_service.js

@@ -35,7 +35,6 @@ class BaseBillsSerivce extends TreeService {
         data.deal_tp = null;
     }
 
-
     /**
      * 从标准数据中提取有效数据
      * @param {Object} stdData - 从标准库中查询所得
@@ -465,6 +464,7 @@ class BaseBillsSerivce extends TreeService {
         const AnalysisExcel = require('../lib/analysis_excel').AnalysisGclExcelTree;
         const analysisExcel = new AnalysisExcel(this.ctx);
         const cacheData = analysisExcel.analysisData(sheet, node, maxId, data);
+        if (!cacheData) throw '导入数据错误,请检查Excel文件后重试';
 
         const datas = [];
         for (const node of cacheData.items) {

+ 1 - 0
app/lib/analysis_excel.js

@@ -21,6 +21,7 @@ const aeUtils = {
         const colsDef = {};
         for (const iCol in row) {
             const text = row[iCol];
+            if (text === null) continue;
             for (const header in colHeaderMatch) {
                 const match = colHeaderMatch[header];
                 switch (match.type) {

+ 4 - 2
app/lib/rpt_data_analysis.js

@@ -1012,8 +1012,10 @@ const auditSelect = {
             }
         } else {
             const setting = JSON.stringify(asDefine.setting);
-            for (const [i, s] of setting.select.entries()) {
-                order.push(i);
+            if (setting.select) {
+                for (const [i, s] of setting.select.entries()) {
+                    order.push(i);
+                }
             }
         }