Merge branch '3.0.4_online'

public/web/sheet/sheet_common.js

@@ -499,9 +499,9 @@ var sheetCommonObj = {
         return c
     },
     // 无法勾选的复选框
-    getReadOnlyCheckBox () {
+    getReadOnlyCheckBox (threeState = false) {
         function ReadOnlyCheckBox() {}
-        ReadOnlyCheckBox.prototype = this.getCheckBox(true);
+        ReadOnlyCheckBox.prototype = this.getCheckBox(threeState);
         ReadOnlyCheckBox.prototype.processMouseUp = function () {
             return;
         };

web/building_saas/main/js/models/calc_program.js

@@ -1037,7 +1037,7 @@ let calcTools = {
         const totalFee = this.getFee(node, feeField);
         const maxPrice = node.data.maxPrice;
         // 最高限价有值才对比
-        if (!commonUtil.isDef(maxPrice)) {
+        if (!commonUtil.isNumber(maxPrice)) {
             return false;
         }
         return totalFee > maxPrice;
@@ -1050,7 +1050,7 @@ let calcTools = {
         const totalFee = this.getFee(node, feeField);
         const minPrice = node.data.minPrice;
         // 最低限价有值才对比
-        if (!commonUtil.isDef(minPrice)) {
+        if (!commonUtil.isNumber(minPrice)) {
             return false;
         }
         return totalFee < minPrice;

web/building_saas/main/js/views/main_tree_col.js

@@ -462,14 +462,14 @@ let MainTreeCol = {
             if(MainTreeCol.mainBillsEnable(node)) {
                 return projectObj.project.projectInfo.importedByInterface || projectObj.project.projectInfo.property.lockBills
                     ? sheetCommonObj.getReadOnlyCheckBox()
-                    : sheetCommonObj.getCheckBox(true);
+                    : sheetCommonObj.getCheckBox();
             }
         },
         outPutLimitPrice:function (node) {
             if(MainTreeCol.mainBillsEnable(node)) {
                 return projectObj.project.projectInfo.importedByInterface || projectObj.project.projectInfo.property.lockBills
                 ? sheetCommonObj.getReadOnlyCheckBox()
-                : sheetCommonObj.getCheckBox(true);
+                : sheetCommonObj.getCheckBox();
             }
         },
         overHeight: function (node) {

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

@@ -550,7 +550,7 @@ var projectObj = {
                 project.calcProgram.calcAndSave(node);
             } else {
                 if (node.sourceType === project.Bills.getSourceType()) {
-                    if(fieldName == "maxPrice"){
+                    if(fieldName === "maxPrice" || fieldName === 'minPrice'){
                         if(value == null){
                             value = "";
                         }else {