瀏覽代碼

批量插入清单-计量单元,加载签约清单数据问题

MaiXinRong 5 年之前
父節點
當前提交
527dd4fb81
共有 1 個文件被更改,包括 9 次插入4 次删除
  1. 9 4
      app/public/js/revise.js

+ 9 - 4
app/public/js/revise.js

@@ -1354,13 +1354,17 @@ $(document).ready(() => {
             }
             SpreadJsObj.forbiddenSpreadContextMenu(selector, this.spread);
         }
-        loadData () {
-            if (this.loaded) return;
+        loadData (callback) {
+            if (this.loaded) {
+                if (callback) callback();
+                return;
+            }
             const self = this;
             postData(this.url+'/get-data', {}, function (data) {
                 self.data = data;
                 SpreadJsObj.loadSheetData(self.spread.getActiveSheet(), 'data', data);
                 self.loaded = true;
+                if (callback) callback();
             });
         }
         calculateData () {
@@ -1490,8 +1494,9 @@ $(document).ready(() => {
             SpreadJsObj.initSheet(this.dealSpread.getActiveSheet(), this.dealSpreadSetting);
             SpreadJsObj.refreshColumnAlign(this.dealSpread.getActiveSheet());
             // 拉取签约节点数据
-            dealBills.loadData();
-            SpreadJsObj.loadSheetData(this.dealSpread.getActiveSheet(), 'data', dealBills.data);
+            dealBills.loadData(() => {
+                SpreadJsObj.loadSheetData(this.dealSpread.getActiveSheet(), 'data', dealBills.data);
+            });
             // 双击签约节点,自动添加到清单编号窗口
             this.dealSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, function (e, info) {
                 const deal = info.sheet.zh_data[info.row];