Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

Dockerfile

@@ -23,6 +23,7 @@ RUN babel src -d dist
 
 FROM base-alpine:latest
 
+
 COPY . /home/ConstructionCost
 
 WORKDIR /home/ConstructionCost

modules/main/models/ration.js

@@ -24,6 +24,11 @@ class rationModel extends baseModel {
             if (!err) {
                 if (isReport){
                     for (let i = 0; i < datas.length; i++) {
+                        if (datas[i]._doc.rationQuantityCoe !== null && datas[i]._doc.rationQuantityCoe !== undefined && datas[i]._doc.rationQuantityCoe !== '' && datas[i]._doc.rationQuantityCoe !== 0) {
+                            //如有调价，则需要改动
+                            datas[i]._doc.quantity = parseFloat(datas[i]._doc.quantity) * parseFloat(datas[i]._doc.rationQuantityCoe);
+                            datas[i]._doc.contain = parseFloat(datas[i]._doc.contain) * parseFloat(datas[i]._doc.rationQuantityCoe);
+                        }
                         let fees = datas[i]._doc.fees;
                         if (fees){
                             for (let i = 0; i < fees.length; i++) {

modules/reports/util/rpt_construct_data_util.js

@@ -267,9 +267,16 @@ class Rpt_Data_Extractor {
             let rationDatas = getModuleDataByKey(rawDataObj.prjData, "ration");
             let billsDatas = getModuleDataByKey(rawDataObj.prjData, "bills");
             let decimal = rawDataObj.prj.property.decimal.glj.quantity;
+            let calcOptions = rawDataObj.prj.property.calcOptions;
             if (projectGLJDatas && rationGLJDatas && rationDatas && billsDatas) {
                 gljUtil.calcProjectGLJQuantity(projectGLJDatas.data, rationGLJDatas.data, rationDatas.data, billsDatas.data, decimal, true);
             }
+            if (projectGLJDatas && rationGLJDatas) {
+                //考虑调价情况
+                for (const glj of projectGLJDatas.data.gljList) {
+                    gljUtil.getMarketPrice(glj, projectGLJDatas.data, calcOptions, rawDataObj.prj.property.decimal, false, gljUtil.getTenderPriceCoe(glj, rawDataObj.prj.property));
+                }
+            }
         }
         //还有汇总的...
         if (rawDataObj.hasOwnProperty(`Construct`) || rawDataObj.hasOwnProperty(`ConstructDetail`) || rawDataObj.hasOwnProperty(`Segment`) || rawDataObj.hasOwnProperty(`SegmentDetail`)) {

modules/users/models/user_model.js

@@ -112,6 +112,7 @@ class UserModel extends BaseModel {
                         console.log('111');
                         reject('请求错误');
                     }
+                    if(!postResponse) reject('请求错误');
                     if (postResponse.statusCode !== 200) {
                         reject('通行证验证失败！');
                     }

public/gljUtil.js

@@ -21,19 +21,20 @@ module.exports = {
     getEngineerCostData:getEngineerCostData,
     getEconomicDatas:getEconomicDatas,
     getMainMaterialDatas:getMainMaterialDatas,
-    getQuantityDatas:getQuantityDatas
+    getQuantityDatas:getQuantityDatas,
+    getTenderPriceCoe:getTenderPriceCoe
 };
 
 function calcProjectGLJQuantity(projectGLJDatas,rationGLJDatas,rationDatas,billsDatas,q_decimal) {
     gljNodeUtil.calcProjectGLJQuantity(projectGLJDatas,rationGLJDatas,rationDatas,billsDatas,q_decimal,_,scMathUtil);
 }
 
-function getGLJPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio=false) {
-    return gljNodeUtil.getGLJPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
+function getGLJPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio=false,tenderCoe, isReport) {
+    return gljNodeUtil.getGLJPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,tenderCoe, isReport);
 }
 
-function getMarketPrice(glj,projectGLJDatas,calcOptions,decimalObj,isRadio=false) {
-    return gljNodeUtil.getMarketPrice(glj,projectGLJDatas,calcOptions,decimalObj,isRadio,_,scMathUtil);
+function getMarketPrice(glj,projectGLJDatas,calcOptions,decimalObj,isRadio=false,tenderCoe) {
+    return gljNodeUtil.getMarketPrice(glj,projectGLJDatas,calcOptions,decimalObj,isRadio,_,scMathUtil,tenderCoe);
 }
 
 function getBasePrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio=false) {
@@ -70,4 +71,8 @@ function getMainMaterialDatas(projectProperty,engineerFeatures,materials,project
 
 function getQuantityDatas(engineerFeatures,mainQuantities,billsList,fixedFlag,_,scMathUtil,decimal) {
     return gljNodeUtil.getQuantityDatas(engineerFeatures,mainQuantities,billsList,fixedFlag,_,scMathUtil,decimal);
+}
+
+function getTenderPriceCoe(glj,tproperty){
+  return gljNodeUtil.getTenderPriceCoe(glj,tproperty);
 }

web/building_saas/main/js/views/glj_view.js

@@ -915,6 +915,7 @@ var gljOprObj = {
             return;
         }
         if(args.editingText){
+            args.editingText = args.editingText+"";
             args.editingText = args.editingText.replace(/[\r\n]/g, "");//去掉回车换行等字符;
             me.sheet.getCell(args.row, args.col).value(args.editingText);
         }