zhangweicheng 5 年之前
父節點
當前提交
c7994fd1c7
共有 1 個文件被更改,包括 17 次插入8 次删除
  1. 17 8
      web/building_saas/main/js/views/divide_view.js

+ 17 - 8
web/building_saas/main/js/views/divide_view.js

@@ -100,19 +100,27 @@ let divideObj = {
   showRationGLJDatas:function(){
     if(!$('#divide_glj_nav').hasClass('active')) return;
     this.divideSubSpread.setActiveSheetIndex(0);
-    this.rationGLJDatas = getRationGLJDatas();
+    this.rationGLJDatas = this.getRationGLJDatas();
     let rationGLJSheet = this.divideSubSpread.getSheet(0)
     rationGLJSheet.setRowCount(this.rationGLJDatas.length);
     sheetCommonObj.showTreeData(rationGLJSheet, gljCol.ration_glj_setting,this.rationGLJDatas);
-    function getRationGLJDatas(){
-      let datas = [];
-      let selected = divideObj.getSelectedItem();
-      let divideSetting =  projectObj.project.divide_setting.datas;
-      if(selected){
-
+    
+  },
+  getRationGLJDatas : function (){
+    let datas = [];
+    let selected = divideObj.getSelectedItem();
+    let divideSetting =  projectObj.project.divide_setting.datas;
+    if(selected && selected.itemType=="定额"){
+      for(r of divideSetting.ration_gljs){
+          if(r.rationID == selected.ID){
+            let newr = Object.assign(r);
+            newr.ParentID = -1;
+            datas.push(newr);
+          }         
       }
-      return datas;
+      gljOprObj.combineWithProjectGlj(datas);
     }
+    return datas;
   },
   getProgramOptions:function(){
     let names = projectObj.project.calcProgram.compiledTemplateNames;
@@ -328,6 +336,7 @@ let divideObj = {
     let oldSel = args.oldSelections?args.oldSelections[0]:{};
     if(newSel.row != oldSel.row){
       me.initNavItem();
+      me.showRationGLJDatas();
     }
     args.sheet.repaint();
   },