소스 검색

决算对比,提示

MaiXinRong 3 년 전
부모
커밋
09d5166255
2개의 변경된 파일17개의 추가작업 그리고 7개의 파일을 삭제
  1. 16 6
      app/public/js/budget_compare.js
  2. 1 1
      app/public/js/global.js

+ 16 - 6
app/public/js/budget_compare.js

@@ -39,6 +39,7 @@ $(document).ready(() => {
     sjsSettingObj.setFxTreeStyle(spreadSetting, sjsSettingObj.FxTreeStyle.jz);
     SpreadJsObj.initSheet(compareSheet, spreadSetting);
 
+    let sfSelect;
     const compareObj = {
         curFinalId() {
             return this.finalInfo ? this.finalInfo.id : undefined;
@@ -118,7 +119,8 @@ $(document).ready(() => {
             });
             SpreadJsObj.loadSheetData(compareSheet, SpreadJsObj.DataType.Tree, compareTree);
         },
-        loadFinalData(result) {
+        loadFinalData(result, msg) {
+            if (msg) toastr.warning(msg);
             this.finalInfo = result.finalInfo;
             $('#final-info').html(`${moment(result.finalInfo.update_time).format('YYYY-MM-DD HH:mm:ss')} ${result.finalInfo.u_name}(${result.finalInfo.u_role})`);
             this.initFinalCol();
@@ -131,6 +133,7 @@ $(document).ready(() => {
             });
             finalTree.loadDatas(result.final);
             SpreadJsObj.loadSheetData(compareSheet, SpreadJsObj.DataType.Tree, finalTree);
+            if (sfSelect) sfSelect.reloadSelect(this.finalInfo.tender);
         }
     };
 
@@ -167,9 +170,9 @@ $(document).ready(() => {
         return aCodes.length - bCodes.length;
     }
 
-    postData(window.location.pathname + '/load', {}, function (result) {
+    postData(window.location.pathname + '/load', {}, function (result, msg) {
         if (result.final) {
-            compareObj.loadFinalData(result);
+            compareObj.loadFinalData(result, msg);
         } else {
             compareObj.loadBudgetData(result);
         }
@@ -276,12 +279,20 @@ $(document).ready(() => {
             $('#select-final-ok').click(() => {
                 const rela = self.getSelects();
                 if (rela.length === 0) return;
-                postData(window.location.pathname + '/final', {final_id: compareObj.curFinalId(), id: rela}, function(result) {
-                    compareObj.loadFinalData(result);
+                postData(window.location.pathname + '/final', {final_id: compareObj.curFinalId(), id: rela}, function(result, msg) {
+                    compareObj.loadFinalData(result, msg);
                     $('#select-final').modal('hide');
                 });
             });
         }
+        reloadSelect(select) {
+            if (compareObj.finalInfo) {
+                this.selectTree.datas.forEach(x => {
+                    x.selected = select.indexOf(x.tid + '') >= 0;
+                })
+            }
+            SpreadJsObj.reloadColData(this.sheet, 0);
+        }
         selectNode(node, select) {
             const posterity = this.selectTree.getPosterity(node);
             posterity.unshift(node);
@@ -298,7 +309,6 @@ $(document).ready(() => {
         }
     }
 
-    let sfSelect;
     $('#select-final').on('shown.bs.modal', () => {
         if (!sfSelect) sfSelect = new sfObject();
     });

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

@@ -257,7 +257,7 @@ const postData = function (url, data, successCallback, errorCallBack, showWaitin
                     });
                 }
                 if (successCallback) {
-                    successCallback(result.data);
+                    successCallback(result.data, result.msg);
                 }
             } else if (result.err === 2) {
                 toastr.error('error: ' + result.msg);