小数位数调整

web/building_saas/main/html/main.html

@@ -911,7 +911,7 @@
                                                         <div class="input-group-prepend">
                                                             <span class="input-group-text">合价</span>
                                                         </div>
-                                                        <input type="number" name="bills-totalPrice" class="form-control" value="2" step="1" max="6" min="0">
+                                                        <input type="number" name="bills-totalPrice" class="form-control" value="2" step="1" max="2" min="0">
                                                     </div>
                                                 </div>
                                             </div>
@@ -938,7 +938,7 @@
                                                         <div class="input-group-prepend">
                                                             <span class="input-group-text">合价</span>
                                                         </div>
-                                                        <input type="number" name="ration-totalPrice" class="form-control" value="2" step="1" max="6" min="0">
+                                                        <input type="number" name="ration-totalPrice" class="form-control" value="2" step="1" max="2" min="0">
                                                     </div>
                                                 </div>
                                             </div>

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

@@ -5,6 +5,7 @@
 let defaultDecimal = {
     min: 0,
     max: 6,
+    totalMax:2,//清单合价”、“定额合价”，限制最大值是2。
     _def: {//editable: 开放给用户编辑的
         bills: {editable: true, data: {unitPrice: 2, totalPrice: 2}},
         ration: {editable: true, data: {quantity: 4, unitPrice: 2, totalPrice: 2}},
@@ -109,8 +110,9 @@ function isInt(v){
     return isNum(v) && v % 1 === 0;
 }
 
-function isValidDigit(v){
-    return isInt(v) && v >= defaultDecimal.min && v <= defaultDecimal.max;
+function isValidDigit(v,isTotal){
+    let max = isTotal?defaultDecimal.totalMax:defaultDecimal.max;
+    return isInt(v) && v >= defaultDecimal.min && v <= max;
 }
 
 //newV用户可编辑数据
@@ -197,7 +199,8 @@ function v_initPanel(data){
                     let jqs = 'input[name="' + str + '"]';
                     $(jqs).val(data[attr][subAttr]);
                     $(jqs).attr('min', defaultDecimal.min);
-                    $(jqs).attr('max', defaultDecimal.max);
+                    let max = str == 'bills-totalPrice'|| str == 'ration-totalPrice'?defaultDecimal.totalMax:defaultDecimal.max;
+                    $(jqs).attr('max', max);
                 }
             }
             else {
@@ -217,8 +220,9 @@ function e_validIn(inputs){
         $(inputs[i]).bind('input', function () {
             let v = $(this).val();
             let inputName = $(this).attr('name');
-            if(v.trim().length === 0 || !isValidDigit(v)){
-                alert('小数位数范围在0-6！');
+            let infoMsg = inputName == 'bills-totalPrice'|| inputName == 'ration-totalPrice'?'小数位数范围在0-2！':'小数位数范围在0-6！';
+            if(v.trim().length === 0 || !isValidDigit(v,inputName == 'bills-totalPrice'|| inputName == 'ration-totalPrice')){
+                alert(infoMsg);
                 $(this).val(orgV);
             }
             else{