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

public/gljUtil.js

@@ -21,15 +21,16 @@ 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) {
@@ -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);
         }