Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

modules/all_models/project_glj.js

@@ -83,6 +83,8 @@ let modelSchema = {
     unit_price: Schema.Types.Mixed,
     // 显示关联的消耗量
     quantity: String,
+    techQuantity:String,//技术措施项目消耗量
+    subdivisionQuantity:String,//分部分项消耗量
     // 不调价
     tenderPrice: String,//调整后价格
     // 显示组成物的消耗量

modules/reports/util/rpt_construct_data_util.js

@@ -12,6 +12,8 @@ let stringUtil = require("../../../public/stringUtil");
 let treeUtil = require('../../../public/treeUtil');
 let projectConst = consts.projectConst;
 let projectConstList = consts.projectConstList;
+const gljUtil = require('../../../public/gljUtil');
+
 
 const GLJ_TYPE = {
     Labour: 1,
@@ -202,6 +204,14 @@ class Rpt_Data_Extractor {
         for (let item of rawDataObj.prjData) {
             setupFunc($PROJECT.DETAIL, item.moduleName, item);
         }
+        let projectGLJDatas = getModuleDataByKey(rawDataObj.prjData, "projectGLJ");
+        let rationGLJDatas = getModuleDataByKey(rawDataObj.prjData, "ration_glj");
+        let rationDatas = getModuleDataByKey(rawDataObj.prjData, "ration");
+        let billsDatas = getModuleDataByKey(rawDataObj.prjData, "bills");
+        if (projectGLJDatas && rationGLJDatas, rationDatas, billsDatas) {
+            gljUtil.calcProjectGLJQuantity(projectGLJDatas.data, rationGLJDatas.data, rationDatas.data, billsDatas.data, 4);
+        }
+
         if (tpl[JV.NODE_MAP_DATA_HANDLE_INFO]) {
             for (let preHandle of tpl[JV.NODE_MAP_DATA_HANDLE_INFO]) {
                 let srcData = getModuleDataByKey(rawDataObj.prjData, preHandle[JV.PROP_DATA_KEY]);

public/web/gljUtil.js

@@ -14,9 +14,10 @@ let gljUtil = {
         let quantityMap={};
         let rationGljGroup = _.groupBy(rationGLJDatas,'projectGLJID');
         let IDarray =  this.getSubdivisionAndTechBillsLeavesID(billsDatas);//分别取分部分项和技术措施项目的所有叶子清单ID
+        console.log(IDarray);
         let billIDs = IDarray[0],tech_billIDS = IDarray[1];
         for(let pglj of project_gljs ){
-            let pg_index = this.getIndex(pglj,gljKeyArray);
+            let pg_index = this.getIndex(pglj,this.gljKeyArray);
             pglj.subdivisionQuantity = 0;
             pglj.techQuantity = 0;
             pglj.quantity = 0;
@@ -31,7 +32,7 @@ let gljUtil = {
         for(let pkey in mixRatioMap){
             let mixRatioList = mixRatioMap[pkey];
             for(let m of mixRatioList){
-                let m_index = gljOprObj.getIndex(m,gljKeyArray);
+                let m_index = this.getIndex(m,this.gljKeyArray);
                 let m_glj = quantityMap[m_index];
                 let p_glj = quantityMap[pkey];
                 if(m_glj&&p_glj){
@@ -67,7 +68,7 @@ let gljUtil = {
             }
         }
         for(let ra of rations){//计算定额类型工料机的消耗量
-            if(ra.type == rationType.gljRation&&ra.projectGLJID===pglj.id){
+            if(ra.type == this.rationType.gljRation&&ra.projectGLJID===pglj.id){
                 let r_quantity = scMathUtil.roundForObj(ra.quantity,q_decimal);
                 r_quantity = r_quantity?r_quantity:0;
                 quantity_sum = scMathUtil.roundForObj(quantity_sum+r_quantity,q_decimal);
@@ -86,9 +87,9 @@ let gljUtil = {
         return result;
     },
     getSubdivisionAndTechBillsLeavesID:function (billsDatas) {//分别取分部分项和技术措施项目的所有叶子清单ID
-        if(projectObj){//存在，说明在前端调用
-            return [projectObj.project.Bills.getSubdivisionProjectLeavesID(),projectObj.project.Bills.getTechLeavesID()];
-        }
+        // if(projectObj){//存在，说明在前端调用
+        //     return [projectObj.project.Bills.getSubdivisionProjectLeavesID(),projectObj.project.Bills.getTechLeavesID()];
+        // }
         let parentMap ={};
         let subdivisionBillID  = null,techBillID = null,sIDs = [],tIDS = [];
         for(let b of billsDatas){
@@ -97,10 +98,11 @@ let gljUtil = {
             }else {
                 parentMap[b.ParentID]= [b];
             }
-            if(this.isFlag(b)&&b.flagsIndex.fixed.flag==this.fixedFlag.SUB_ENGINERRING) {
+            let flag = this.getFalg(b);
+            if(this.isDef(flag)&&flag.flag == this.fixedFlag.SUB_ENGINERRING){
                 subdivisionBillID = b.ID;
             }
-            if(this.isFlag(b)&&b.flagsIndex.fixed.flag==this.fixedFlag.CONSTRUCTION_TECH){
+            if(this.isDef(flag)&&flag.flag == this.fixedFlag.CONSTRUCTION_TECH){
                 techBillID = b.ID;
             }
         }
@@ -122,6 +124,10 @@ let gljUtil = {
             }
         }
     },
+    getFalg:function (b) {
+        return _.find(b.flags,{"fieldName":"fixed"});
+
+    },
     getGLJPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil) {
         let result = {};
         result.marketPrice = this.getMarketPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
@@ -281,4 +287,11 @@ let gljUtil = {
         EQUIPMENT: 5
     },
      notEditType : [202, 203,204, 301, 4],
+     gljKeyArray : ['code','name','specs','unit','type'],
+      rationType : {
+        ration: 1,
+        volumePrice: 2,
+        gljRation: 3,
+        install:4
+    }
 }