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

modules/main/models/proj_setting_model.js

@@ -20,8 +20,8 @@ class projSettingModel extends baseModel {
 /*                if (!data.billsCalcMode) {
                     data.billsCalcMode = settingConst.billsCalcMode.rationContent;
                 }
-                if (!data.zanguCalcMode) {
-                    data.zanguCalcMode = settingConst.zanguCalcMode.common;
+                if (!data.zanguCalcType) {
+                    data.zanguCalcType = settingConst.zanguCalcType.common;
                 }
                 data.settingConst = settingConst;*/
                 callback(0, collectionName, data);

modules/main/models/schemas/proj_setting.js

@@ -9,7 +9,7 @@ let collectionName = 'proj_setting';
     billsCalcMode: {
         rationContent: 0, rationPriceConverse: 1, rationPrice: 2, billsPrice: 3
     },
-    zanguCalcMode: {
+    zanguCalcType: {
         common: 0, gatherMaterial: 1
     }
 }*/
@@ -27,9 +27,9 @@ let projSettingSchema = {
         type: Number,
         default: settingConst.billsCalcMode.rationContent
     },
-    zanguCalcMode: {
+    zanguCalcType: {
         type: Number,
-        default: settingConst.zanguCalcMode.common
+        default: settingConst.zanguCalcType.common
     }*/
 };
 let model = mongoose.model(collectionName, new Schema(projSettingSchema, {versionKey: false, collection: collectionName}));

modules/reports/util/rpt_construct_data_util.js

@@ -18,7 +18,7 @@ const GLJ_TYPE = {
     Machine: 3,
     Main_Material: 4,
     Equipment: 5
-}
+};
 
 class Rpt_Common{
     initialize(rpt_tpl, currentDataObj) {
@@ -249,7 +249,7 @@ function summaryData(sourceData, handleCfg, prjData){
             }
         }
         return ( "grp_key_" + keys.join('_'));
-    }
+    };
     let sumObj = {};
     for (let dtl of tempRstArr) {
         let grpKey = private_get_grp_key(dtl);
@@ -310,7 +310,7 @@ function filterData(sourceData, handleCfg, prjData) {
                 rst = true;
         }
         return rst;
-    }
+    };
     for (let item of tempRstArr) {
         let compRst = true;
         let curComparePrjData = null;
@@ -596,11 +596,6 @@ function sortData(sourceData, sortCfg, prjData) {
 
 function setupFunc(obj, prop, ownRawObj) {
     obj[prop] = {};
-    // if (prop === projectConst.CALC_PROGRAM) {
-    //     obj[prop]["myOwnRawDataObj"] = ownRawObj.data;
-    // } else {
-    //     obj[prop]["myOwnRawDataObj"] = ownRawObj;
-    // }
     obj[prop]["myOwnRawDataObj"] = ownRawObj;
     obj[prop].getProperty = ext_getPropety;
     obj[prop].getFee = ext_getFee;

web/building_saas/main/js/models/main_consts.js

@@ -121,7 +121,7 @@ const leafBillGetFeeType = {
     billsPrice: 3
 };
 
-const zanguCalcMode = {
+const zanguCalcType = {
     common: 0,
     gatherMaterial: 1
 };

web/building_saas/main/js/models/project.js

@@ -289,12 +289,12 @@ var PROJECT = {
             }
         };
 
-        project.prototype.setBillsCalcMode = function (calcMode) {
+/*        project.prototype.setBillsCalcMode = function (calcMode) {
             this.property.billsCalcMode = calcMode;
             this.initCalcFields();
-        };
+        };*/
 
-        project.prototype.initCalcFields = function () {
+        /*project.prototype.initCalcFields = function () {
             // let settingConst = this.projSetting.settingConst;
             if (this.calcFields) {
                 for (let field of this.calcFields) {
@@ -325,7 +325,7 @@ var PROJECT = {
                     }
                 }
             }
-        }
+        }*/
 
         return new project();
     }

web/building_saas/main/js/views/project_property_basicInfo.js

@@ -243,7 +243,6 @@ let basicInfoView = {
         return false;
     },
 
-
     a_updateInfo: function (datas) {
         let me = this;
         let url = '/pm/api/updateProjects',
@@ -455,9 +454,9 @@ $(document).ready(function () {
         basicInfoView.workBook.refresh();
     });
 
-    $('#property_ok').bind('click', function () {
+   /* $('#property_ok').bind('click', function () {
         if(basicInfoView.toUpdate(basicInfoView.orgDatas, basicInfoView.datas)){
             basicInfoView.a_updateInfo(basicInfoView.toSaveDatas(basicInfoView.datas));
         }
-    });
+    });*/
 });

web/building_saas/main/js/views/project_property_bills_quantity_decimal.js

@@ -339,10 +339,10 @@ $(document).ready(function () {
         billsDecimalView.workBook.refresh();
     });
 
-    $('#property_ok').bind('click', function () {
+ /*   $('#property_ok').bind('click', function () {
         let newBillsDecimalDatas = billsDecimalView.toBillsDecimalDatas(billsDecimalView.cache);
         if(billsDecimalView.toUpdate(billsQuanDecimal.datas, newBillsDecimalDatas)){
             billsDecimalView.a_update(newBillsDecimalDatas);
         }
-    });
+    });*/
 });

web/building_saas/main/js/views/project_property_decimal_view.js

@@ -244,7 +244,7 @@ $(document).ready(function () {
         v_initPanel(v_data);
     });
     //绑定确定按钮
-    e_bindCof($('#property_ok'));
+    //e_bindCof($('#property_ok'));
     //绑定小数位数输入控制
     e_validIn($('input', '#poj-settings-decimal'));
 });

web/building_saas/main/js/views/project_property_projFeature.js

@@ -401,9 +401,9 @@ $(document).ready(function () {
         projFeatureView.workBook.refresh();
     });
 
-    $('#property_ok').bind('click', function () {
+    /*$('#property_ok').bind('click', function () {
         if(projFeatureView.toUpdate(projFeatureView.orgDatas, projFeatureView.datas)){
            projFeatureView.a_updateInfo(projFeatureView.toSaveDatas(projFeatureView.datas));
         }
-    });
+    });*/
 });

web/building_saas/main/js/views/project_view.js

@@ -653,24 +653,28 @@ $('#poj-set').on('show.bs.modal', function () {
         setCalcFlag($('#rationPrice'), leafBillGetFeeType.rationPrice, mode);
         setCalcFlag($('#billsPrice'), leafBillGetFeeType.billsPrice, mode);
 
-        // mode = projectObj.project.projSetting.zanguCalcMode;
-        mode = projectObj.project.property.zanguCalcMode ? projectObj.project.property.zanguCalcMode : zanguCalcMode.common;
-        setCalcFlag($('#zangu_common'), zanguCalcMode.common, mode);
-        setCalcFlag($('#zangu_gatherMatherial'), zanguCalcMode.gatherMaterial, mode);
+        // mode = projectObj.project.projSetting.zanguCalcType;
+        mode = projectObj.project.property.zanguCalcMode ? projectObj.project.property.zanguCalcMode : zanguCalcType.common;
+        setCalcFlag($('#zangu_common'), zanguCalcType.common, mode);
+        setCalcFlag($('#zangu_gatherMaterial'), zanguCalcType.gatherMaterial, mode);
     }
 });
 $('#property_ok').click(function () {
+    let properties = [], projectID = parseInt(scUrlUtil.GetQueryString('project'));
     let project = projectObj.project, reCalc= false;
-    let billMode = parseInt($("input[name='calcFlag']:checked").val());
-    if (billMode !== project.property.billsCalcMode) {
-        // project.setBillsCalcMode(mode);
-        project.property.billsCalcMode = billMode;
+    let b = parseInt($("input[name='calcFlag']:checked").val());
+    if (b !== project.property.billsCalcMode) {
+        let data1 = {updateType: 'update', updateData: {ID: projectID, 'property.billsCalcMode': b}};
+        properties.push(data1);
+        project.property.billsCalcMode = b;
         reCalc = true;
     };
 
-    let zanguMode = parseInt($("input[name='zangu']:checked").val());
-    if (zanguMode !== project.property.zanguCalcMode) {
-        project.property.zanguCalcMode = zanguMode;
+    let zg = parseInt($("input[name='zangu']:checked").val());
+    if (zg !== project.property.zanguCalcMode) {
+        let data2 = {updateType: 'update', updateData: {ID: projectID, 'property.zanguCalcMode': zg}};
+        properties.push(data2);
+        project.property.zanguCalcMode = zg;
         reCalc = true;
     };
 
@@ -680,10 +684,35 @@ $('#property_ok').click(function () {
     }
 
     if (reCalc) {
-/*        project.pushNow('', [project.projSetting.moduleName], [{
-            projectID: project.ID(),
-            billsCalcMode: project.property.billsCalcMode
-        }]);*/
         project.calcProgram.calcAllNodes(calcAllType.catBills);
     }
+    //基本信息
+    if(basicInfoView.toUpdate(basicInfoView.orgDatas, basicInfoView.datas)){
+        let updateData = {updateType: 'update', updateData: {ID: projectID, 'property.basicInformation': basicInfoView.toSaveDatas(basicInfoView.datas)}};
+        properties.push(updateData);
+    }
+    //工程特征
+    if(projFeatureView.toUpdate(projFeatureView.orgDatas, projFeatureView.datas)){
+        let updateData = {updateType: 'update', updateData: {ID: projectID, 'property.projectFeature': projFeatureView.toSaveDatas(projFeatureView.datas)}};
+        properties.push(updateData);
+    }
+    //清单工程量精度
+    let newBillsDecimalDatas = billsDecimalView.toBillsDecimalDatas(billsDecimalView.cache);
+    if(billsDecimalView.toUpdate(billsQuanDecimal.datas, newBillsDecimalDatas)){
+        let updateData = {updateType: 'update', updateData: {ID: projectID, 'property.billsQuantityDecimal': newBillsDecimalDatas}};
+        properties.push(updateData);
+    }
+    //小数位数
+    //获取更新的数据
+    let updateDecimal = m_getDecimalData($('input', '#poj-settings-decimal'));
+    if(toUpdateDecimal(decimalObj, updateDecimal)){
+        let updateData = {updateType: 'update', updateData: {ID: projectID, 'property.decimal': updateDecimal}};
+        properties.push(updateData);
+    }
+    console.log(properties);
+    if(properties.length > 0){
+        CommonAjax.post('/pm/api/updateProjects', {user_id: userID, updateData: properties}, function (rstData) {
+            window.location.href = '/main?project=' + projectID;
+        });
+    }
 });