Merge branch 'master' of http://192.168.1.12:3000/caiaolin/Calculation

app/public/js/global.js

@@ -92,8 +92,7 @@ $(function(){
  * @param string icon
  * @return void
  */
-function toast(message, type, icon)
-{
+function toast(message, type, icon) {
     var toast = $(".toast");
     toast.addClass(type);
     toast.children('.message').html(message);

app/public/js/tender.js

@@ -144,6 +144,15 @@ function CalculateAllDealParam() {
     roundPrice($('#material-advance'));
     calculateC2();
 }
+// 根据Min Max限制Input输入
+function limitInputMinMax (obj) {
+    if (obj.value > obj.max) {
+        obj.value = obj.max;
+    }
+    if(obj.value < obj.min) {
+        obj.value = obj.min;
+    }
+}
 
 $(document).ready(function() {
     loadTenderProperty();
@@ -291,7 +300,7 @@ $(document).ready(function() {
         prop.precision.other.value = _.toNumber($('#unit-other').val());
         const tenderId = window.location.pathname.split('/')[2];
         postData('/tender/' + tenderId + '/save', prop, function (data) {
-            setReadOnly('#v-pills-count', true);
+            setReadOnly('#v-pills-3', true);
             property.precision = data.precision;
             $('#post-3').parent().hide();
             $('#edit-3').parent().show();

app/view/tender/detail.ejs

@@ -403,7 +403,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">单价</span>
                                                     </div>
-                                                    <input type="number" class="form-control" value="3" id="decimal-up" min="0" max="4">
+                                                    <input type="number" class="form-control" value="3" id="decimal-up" min="0" max="4" oninput="limitInputMinMax(this)">
                                                 </div>
                                             </div>
                                             <div class="col-2">
@@ -411,7 +411,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">金额</span>
                                                     </div>
-                                                    <input type="number" class="form-control" value="2" id="decimal-tp" onchange="CalculateAllDealParam()"  min="0" max="4">
+                                                    <input type="number" class="form-control" value="2" id="decimal-tp" onchange="CalculateAllDealParam()" oninput="limitInputMinMax(this)" min="0" max="4">
                                                 </div>
                                             </div>
                                         </div>
@@ -430,7 +430,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">金额</span>
                                                     </div>
-                                                    <input type="number" class="form-control" value="2" readonly="" id="decimal-pay-tp" onchange="CalculateAllDealParam()" min="0" max="4">
+                                                    <input type="number" class="form-control" value="2" readonly="" id="decimal-pay-tp" onchange="CalculateAllDealParam()" oninput="limitInputMinMax(this)" min="0" max="4">
                                                 </div>
                                             </div>
                                         </div>
@@ -455,7 +455,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">t</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-t">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-t" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -463,7 +463,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">km</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-km">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-km" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -471,7 +471,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">m</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-m">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-m" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -479,7 +479,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">m2</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-m2">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-m2" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -487,7 +487,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">m3</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-m3">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-m3" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -495,7 +495,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">kg</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-kg">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-kg" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -503,7 +503,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">个</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-ge">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-ge" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -511,7 +511,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">台</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-tai">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-tai" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -519,7 +519,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">套</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-tao">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-tao" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -527,7 +527,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">棵</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-ke">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-ke" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -535,7 +535,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">组</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-zu">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-zu" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-2 mb-3">
@@ -543,7 +543,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">系统</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-xitong">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-xitong" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                         <div class="col-3 mb-3">
@@ -551,7 +551,7 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">其他未列单位</span>
                                                 </div>
-                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-other">
+                                                <input class="form-control" type="number" min="0" max="6" value="3" id="unit-other" oninput="limitInputMinMax(this)">
                                             </div>
                                         </div>
                                     </div>