Chenshilong 7 năm trước cách đây
mục cha
commit
e2296885ef

+ 4 - 4
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();
     }

+ 10 - 7
web/building_saas/main/js/views/project_view.js

@@ -657,16 +657,19 @@ $('#poj-set').on('show.bs.modal', function () {
 });
 $('#property_ok').click(function () {
     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;
     };