瀏覽代碼

报表编制范围信息

zhangweicheng 6 年之前
父節點
當前提交
79b838d9f0
共有 1 個文件被更改,包括 7 次插入3 次删除
  1. 7 3
      modules/main/facade/project_facade.js

+ 7 - 3
modules/main/facade/project_facade.js

@@ -286,6 +286,7 @@ async function getBudgetSummayDatas(projectIDs){
         let projects = [];
         let projects = [];
         let names = [];
         let names = [];
         let prjTypeNames = [];
         let prjTypeNames = [];
+        let compilationScopes = [];
         let decimal = null;
         let decimal = null;
         for(let ID of projectIDs){
         for(let ID of projectIDs){
             projects.push(await getBillsByProjectID(ID)) ;
             projects.push(await getBillsByProjectID(ID)) ;
@@ -296,12 +297,14 @@ async function getBudgetSummayDatas(projectIDs){
         let mp = projects[0];
         let mp = projects[0];
         names.push(mp.name);
         names.push(mp.name);
         prjTypeNames.push(mp.prjTypeName);
         prjTypeNames.push(mp.prjTypeName);
+        compilationScopes.push(mp.compilationScope);
         for(let i = 1;i<projects.length;i++){
         for(let i = 1;i<projects.length;i++){
             names.push(projects[i].name);
             names.push(projects[i].name);
             prjTypeNames.push(projects[i].prjTypeName);
             prjTypeNames.push(projects[i].prjTypeName);
+            compilationScopes.push(projects[i].compilationScope);
             decimal = await mergeProject(mp.roots,projects[i].roots)
             decimal = await mergeProject(mp.roots,projects[i].roots)
         }
         }
-        let SummaryAuditDetail = getReportData(names,mp.roots,prjTypeNames,decimal);
+        let SummaryAuditDetail = getReportData(names,mp.roots,prjTypeNames,compilationScopes,decimal);
         let parentProject = await projectsModel.findOne({ID:mp.ParentID});
         let parentProject = await projectsModel.findOne({ID:mp.ParentID});
         let result = {
         let result = {
             prj: {},
             prj: {},
@@ -312,7 +315,7 @@ async function getBudgetSummayDatas(projectIDs){
                 "编制范围":mp.compilationScope
                 "编制范围":mp.compilationScope
             },
             },
             SummaryAuditDetail:SummaryAuditDetail
             SummaryAuditDetail:SummaryAuditDetail
-        }
+        };
         return result;
         return result;
     }catch (e){
     }catch (e){
         console.log(e)
         console.log(e)
@@ -320,7 +323,7 @@ async function getBudgetSummayDatas(projectIDs){
 }
 }
 
 
 
 
-function getReportData(nameList,items,prjTypeNames,decimal) {
+function getReportData(nameList,items,prjTypeNames,compilationScopes,decimal) {
     let datas = [],totalItem = null;
     let datas = [],totalItem = null;
     setChildrenDatas(items,datas);
     setChildrenDatas(items,datas);
     for(let d of datas){
     for(let d of datas){
@@ -329,6 +332,7 @@ function getReportData(nameList,items,prjTypeNames,decimal) {
         }
         }
         d['prjNames'] = nameList;
         d['prjNames'] = nameList;
         d['prjTypeNames'] = prjTypeNames;
         d['prjTypeNames'] = prjTypeNames;
+        d['编制范围明细'] = compilationScopes;
     }
     }
     return datas;
     return datas;