fix: 限价功能bug

public/common_util.js

@@ -22,7 +22,10 @@
     function isEmptyVal(val) {
         return val === null || val === undefined || val === '';
     }
-
+    // 是否数值
+    function isNumber(val) {
+        return !isEmptyVal(val) && !isNaN(val);
+    }
     // v是否有值，不为undefined、null、''
     function hasValue(v) {
         return typeof v !== 'undefined' && v !== null && v !== '';
@@ -138,6 +141,7 @@
     return {
         isDef,
         isEmptyVal,
+        isNumber,
         hasValue,
         similarEqual,
         isHan,

web/building_saas/main/html/main.html

@@ -807,13 +807,11 @@
                                             <fieldset class="form-group">
                                               <h5>清单限价</h5>
                                               <div class="mt-1">
-                                                最高限价<input id="max-price-rate" data-limit="max" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
+                                                <span data-toggle="tooltip" data-placement="bottom" data-original-title="最高限价=清单综合单价*（1+X%）">最高限价 </span><input id="max-price-rate" data-limit="max" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
                                               </div>
-                                              <% if (compilationName !== '重庆定额(2018)') { %>
-                                                <div class="mt-1">
-                                                  最低限价<input id="min-price-rate" data-limit="min" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
-                                                </div>
-                                              <% } %>
+                                            <div class="mt-1">
+                                                <span data-toggle="tooltip" data-placement="bottom" data-original-title="最低限价=清单综合单价*（1-X%）">最低限价 </span><input id="min-price-rate" data-limit="min" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
+                                            </div>
                                             </fieldset>
                                             <% } %>
                                     </div>

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

@@ -425,7 +425,7 @@ let MainTreeCol = {
           : sheetCommonObj.getCheckBox(true);
       }
     },
-    maxPrice: function (node, setting) {
+    /* maxPrice: function (node, setting) {
       const tips = () => {
         const maxPriceRate = projectObj.project.property.maxPriceRate || 0;
         return node.data.maxPrice ? `最高限价=清单综合单价*（1+${maxPriceRate}%）` : '';
@@ -438,7 +438,7 @@ let MainTreeCol = {
         return node.data.minPrice ? `最低限价=清单综合单价*（1-${minPriceRate}%）` : '';
       };
       return sheetCommonObj.getTipsText(tips, setting, node);
-    }
+    } */
   },
   editChecking: function (node) {
     if (node.sourceType == projectObj.project.Bills.getSourceType() && projectObj.project.isBillsLocked() && projectObj.project.withinBillsLocked(node)) {

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

@@ -2626,11 +2626,11 @@ $('#property_ok').click(function () {
     }
     // 清单限价
     const maxPriceRate = $('#max-price-rate') && +$('#max-price-rate').val();
-    if (maxPriceRate && maxPriceRate !== projectObj.project.property.maxPriceRate) {
+    if (commonUtil.isNumber(maxPriceRate) && maxPriceRate !== projectObj.project.property.maxPriceRate) {
         properties['property.maxPriceRate'] = maxPriceRate;
     }
     const minPriceRate = $('#min-price-rate') && +$('#min-price-rate').val();
-    if (minPriceRate && minPriceRate !== projectObj.project.property.minPriceRate) {
+    if (commonUtil.isNumber(minPriceRate) && minPriceRate !== projectObj.project.property.minPriceRate) {
         properties['property.minPriceRate'] = minPriceRate;
     }
     //清单工程量精度