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

config/gulpConfig.js

@@ -25,7 +25,6 @@ module.exports = {
     common_css:[
         'lib/jquery-ui/jquery-ui.css',
         'lib/bootstrap/css/bootstrap.min.css',
-        'lib/bootstrap/css/bootstrap-submenu.js',
         'lib/spreadjs/sheets/css/gc.spread.sheets.sc.css',
         'web/building_saas/css/main.css',
         'web/building_saas/css/custom.css',
@@ -124,8 +123,6 @@ module.exports = {
         'web/building_saas/main/js/models/cache_tree.js',
         'web/building_saas/main/js/calc/calc_fees.js',
         'web/building_saas/main/js/models/exportStdInterfaceBase.js',
-        'web/building_saas/main/js/models/exportStandardInterface.js',
-        'web/building_saas/main/js/models/exportSEIInterface.js',
         'web/building_saas/main/js/models/overHeight.js',
         // 'web/building_saas/main/js/calc/ration_calc.js',
         // 'web/building_saas/main/js/calc/bills_calc.js',

public/stringUtil.js

@@ -2,7 +2,6 @@ let pinyin = (function (){
     let Pinyin = function (ops){
             this.initialize(ops);
         },
-ex
         options = {
             checkPolyphone: false,
             charcase: 'default'

public/web/scMathUtil.js

@@ -173,7 +173,7 @@ let scMathUtil = {
     roundForObj:function(obj,decimal){
         let me = this;
         let value;
-        if(obj === undefined || obj === null) return 0;
+        if(obj === undefined || obj === null || isNaN(obj)) return 0;
         let n = Math.pow(10,decimal);
         if(me.isNumber(obj)){
           value = Math.round(obj * n) / n;

web/building_saas/main/js/models/ration.js

@@ -317,8 +317,8 @@ var Ration = {
 
         ration.prototype.getChangePosUpdateData = function (ration1, ration2) {
             var updateData = [];
-            updateData.push({updateType: 'ut_update', updateData: this.getTempRationData(ration1.ID, ration1.billsItemID, ration2.serialNo)});
-            updateData.push({updateType: 'ut_update', updateData: this.getTempRationData(ration2.ID, ration2.billsItemID, ration1.serialNo)});
+            updateData.push({updateType: 'ut_update', updateData: { ID: ration1.ID, serialNo: ration2.serialNo, projectID: this.project.ID() }});
+            updateData.push({updateType: 'ut_update', updateData: { ID: ration2.ID, serialNo: ration1.serialNo, projectID: this.project.ID() }});
             return updateData;
         };
         ration.prototype.changePos = function (ration1, ration2) {

web/building_saas/main/js/views/config_material_view.js

@@ -867,7 +867,6 @@ let pgljSelObj={
         let projectGLJ = projectObj.project.projectGLJ;
         let materialIdList = projectGLJ.datas.constData.materialIdList;
         let data = materialAdjustObj.getCommonObject(glj);
-        console.log(projectGljObject.displayType);
         data.select = projectGljObject.displayType == filterType.ZGCL?glj.is_evaluate:glj.is_eval_material;
         data.from = glj;
         data.short_name = projectGLJ.getShortNameByID(glj.type);