Przeglądaj źródła

1. spreadjs授权码
2. 本期计量台账,报错

MaiXinRong 6 lat temu
rodzic
commit
ebce890f9b

+ 5 - 2
app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -586,10 +586,13 @@ const SpreadJsObj = {
             return null;
         } else if (sheet.zh_dataType) {
             const sel = sheet.getSelections()[0];
+            if (!sel) {
+                return null;
+            }
             if (sheet.zh_dataType === this.DataType.Tree) {
-                return sel ? sheet.zh_tree.nodes[sel.row] : null;
+                return sheet.zh_tree.nodes[sel.row];
             } else if (sheet.zh_dataType === this.DataType.Data) {
-                return sel ? sheet.zh_data[sel.row] : null;
+                return sheet.zh_data[sel.row];
             } else {
                 return null;
             }

+ 1 - 1
app/public/js/stage_change.js

@@ -187,7 +187,7 @@ $(document).ready(() => {
             const change = SpreadJsObj.getSelectObject(changeSpread.getActiveSheet());
             billsSpreadObj.loadCurBillsData();
             posSpreadObj.loadCurPosData();
-            if (change.filterBills !== $('#used-bills')[0].checked) {
+            if (change && change.filterBills !== $('#used-bills')[0].checked) {
                 change.fitlerBills = $('#used-bills')[0].checked;
                 billsSpreadObj.filterUsedBills(change.fitlerBills);
             }

+ 1 - 1
app/service/stage_pos.js

@@ -81,7 +81,7 @@ module.exports = app => {
                 '  ) As MaxFilter ' +
                 '  ON Pos.times = MaxFilter.times And Pos.order = MaxFilter.order And Pos.pid = MaxFilter.pid' +
                 '  WHERE Pos.tid = ? And Pos.sid = ?' + pidSql;
-            const sqlParam = [times, order, tid, sid];
+            const sqlParam = [times, times, order, tid, sid];
             if (!pid) {
                 return await this.db.query(sql, sqlParam);
             } else if (pid instanceof Array) {