Browse Source

台账审批报错

MaiXinRong 5 years ago
parent
commit
186735269f
1 changed files with 11 additions and 9 deletions
  1. 11 9
      app/public/js/ledger_audit.js

+ 11 - 9
app/public/js/ledger_audit.js

@@ -35,11 +35,7 @@ $(document).ready(() => {
         treeSetting.calcFields = ['deal_tp', 'sgfh_tp', 'sjcl_tp', 'qtcl_tp', 'total_price'];
     }
     const ledgerTree = createNewPathTree('fx', treeSetting);
-    ledgerTree.loadDatas(ledger);
-    treeCalc.calculateAll(ledgerTree);
     SpreadJsObj.initSheet(ledgerSpread.getActiveSheet(), ledgerSpreadSetting);
-    SpreadJsObj.loadSheetData(ledgerSpread.getActiveSheet(), 'tree', ledgerTree);
-    SpreadJsObj.loadTopAndSelect(ledgerSpread.getActiveSheet(), ckBillsSpread);
 
     // 初始化 部位明细
     const pos = new PosData({
@@ -87,13 +83,19 @@ $(document).ready(() => {
             }
         });
         SpreadJsObj.initSheet(posSpread.getActiveSheet(), posSpreadSetting);
-        postData('/tender/' + getTenderId() + '/pos', null, function (data) {
-            pos.loadDatas(data);
-            loadCurPosData();
-            SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
-        });
     }
 
+    postData('/tender/' + getTenderId() + '/ledger/load', null, function (data) {
+        ledgerTree.loadDatas(ledger);
+        treeCalc.calculateAll(ledgerTree);
+        SpreadJsObj.loadSheetData(ledgerSpread.getActiveSheet(), 'tree', ledgerTree);
+        SpreadJsObj.loadTopAndSelect(ledgerSpread.getActiveSheet(), ckBillsSpread);
+
+        pos.loadDatas(data.pos);
+        loadCurPosData();
+        SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
+    }, null, true);
+
     ledgerSpread.bind(spreadNS.Events.SelectionChanged, function (e, info) {
         loadCurPosData();
         SpreadJsObj.saveTopAndSelect(info.sheet, ckBillsSpread);