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

web/building_saas/main/html/main.html

@@ -444,7 +444,7 @@
                                         <fieldset class="form-group">
                                             <div class="form-check">
                                                 <label class="form-check-label">
-                                                    <input class="form-check-input" name="calcFlag" id="rationContent" value="0" checked="" type="radio">
+                                                    <input class="form-check-input" name="calcFlag" id="rationContent" value="0" type="radio">
                                                     子目含量取费
                                                 </label>
                                             </div>

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

@@ -540,17 +540,26 @@ $('#downMove').click(function () {
 });
 
 $('#poj-set').on('show.bs.modal', function () {
+    let setCalcFlag = function (obj, val, curFlag) {
+        obj.val(val);
+        if (val === curFlag) {
+            obj.attr('checked', true);
+        } else {
+            obj.removeAttr('checked');
+        }
+    }
     if (projectObj.project) {
-        $('#rationContent').val(projectObj.project.projSetting.billsCalcModeConst.rationContent);
-        $('#rationPrice').val(projectObj.project.projSetting.billsCalcModeConst.rationPrice);
-        $('#rationPriceConverse').val(projectObj.project.projSetting.billsCalcModeConst.rationPriceConverse);
-        $('#billsPrice').val(projectObj.project.projSetting.billsCalcModeConst.billsPrice);
+        let mode = projectObj.project.projSetting.billsCalcMode;
+        setCalcFlag($('#rationContent'), projectObj.project.projSetting.billsCalcModeConst.rationContent, mode);
+        setCalcFlag($('#rationPrice'), projectObj.project.projSetting.billsCalcModeConst.rationPrice, mode);
+        setCalcFlag($('#rationPriceConverse'), projectObj.project.projSetting.billsCalcModeConst.rationPriceConverse, mode);
+        setCalcFlag($('#billsPrice'), projectObj.project.projSetting.billsCalcModeConst.billsPrice, mode);
     }
 });
 $('#property_ok').click(function () {
     let project = projectObj.project, mode = parseInt($("input[name='calcFlag']:checked").val());
     if (mode !== project.projSetting.billsCalcMode) {
-        project.setBillsCalcMode();
+        project.setBillsCalcMode(mode);
         projectObj.calculateAll();
         project.pushNow('editBillsCalcMode',
             [project.projSetting.moduleName, project.Bills.getSourceType()],