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

app/view/tender/detail.ejs

@@ -132,7 +132,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">建设项目名称</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="项目A" readonly="" id="build-name">
+                                                    <input type="text" class="form-control" value="项目A" readonly="" id="build-name" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -140,7 +140,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">合同编号</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="deal-code">
+                                                    <input type="text" class="form-control" value="" readonly="" id="deal-code" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -148,7 +148,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">合同名称</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="deal-name">
+                                                    <input type="text" class="form-control" value="" readonly="" id="deal-name" maxlength="100">
                                                 </div>
                                             </div>
                                         </div>
@@ -164,7 +164,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">单位名称</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="build-company">
+                                                    <input type="text" class="form-control" value="" id="build-company" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -172,7 +172,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">法人代表</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="build-corporation">
+                                                    <input type="text" class="form-control" value="" id="build-corporation" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -193,7 +193,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">单位名称</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="contract1-company">
+                                                    <input type="text" class="form-control" value="" id="contract1-company" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -201,7 +201,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">法人代表</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="contract1-corporation">
+                                                    <input type="text" class="form-control" value="" id="contract1-corporation" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -222,7 +222,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">单位名称</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="contract2-company">
+                                                    <input type="text" class="form-control" value="" id="contract2-company" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -230,7 +230,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">法人代表</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="contract2-corporation">
+                                                    <input type="text" class="form-control" value="" id="contract2-corporation" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -251,7 +251,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">单位名称</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="supervision1-company">
+                                                    <input type="text" class="form-control" value="" id="supervision1-company" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -259,7 +259,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">法人代表</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="supervision1-corporation">
+                                                    <input type="text" class="form-control" value="" id="supervision1-corporation" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -280,7 +280,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">单位名称</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="supervision2-company">
+                                                    <input type="text" class="form-control" value="" id="supervision2-company" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -288,7 +288,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">法人代表</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="supervision2-corporation">
+                                                    <input type="text" class="form-control" value="" id="supervision2-corporation" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -324,7 +324,8 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">长度（KM）</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="length">
+                                                    <input type="number" class="form-control" value="" readonly="" id="length"
+                                                           onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57))) event.returnValue=false;">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -332,7 +333,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">起始桩号</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="start-peg">
+                                                    <input type="text" class="form-control" value="" readonly="" id="start-peg" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -340,7 +341,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">终止桩号</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="end-peg">
+                                                    <input type="text" class="form-control" value="" readonly="" id="end-peg" maxlength="100">
                                                 </div>
                                             </div>
                                         </div>
@@ -352,7 +353,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">车道数</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="lane-count">
+                                                    <input type="text" class="form-control" value="" readonly="" id="lane-count" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -360,7 +361,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">合同工期</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="deal-period">
+                                                    <input type="text" class="form-control" value="" readonly="" id="deal-period" maxlength="100">
                                                 </div>
                                             </div>
                                             <div class="col">
@@ -578,8 +579,8 @@
                                                     <span class="input-group-text">签约合同价</span>
                                                 </div>
                                                 <input type="number" class="form-control" value="" id="contract-price" maxlength="12"
-                                                       onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57)) || value.indexOf('.') >= 12) event.returnValue=false; console.log(value.indexOf('.'))"
-                                                       onchange="roundPrice($('#contract-price'));calculateC2()">
+                                                       onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57)) || value.indexOf('.') >= 12) event.returnValue=false;"
+                                                       oninput="limitMaxLength(this)" onchange="roundPrice($('#contract-price'));calculateC2()">
                                             </div>
                                         </div>
                                         <div class="col-5 mt-3">
@@ -587,8 +588,9 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">暂列金额</span>
                                                 </div>
-                                                <input type="number" class="form-control" value="" id="zan-lie-price" maxlength="12" onchange="roundPrice($('#zan-lie-price'));calculateC2()"
-                                                       onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57)) || value.indexOf('.') >= 12) event.returnValue=false; console.log(value.indexOf('.'))">
+                                                <input type="number" class="form-control" value="" id="zan-lie-price" maxlength="12"
+                                                       onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57)) || value.indexOf('.') >= 12) event.returnValue=false;"
+                                                       onchange="roundPrice($('#zan-lie-price'));calculateC2()" oninput="limitMaxLength(this)">
                                             </div>
                                         </div>
                                         <div class="col-6 mt-3">
@@ -604,8 +606,9 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">签约开工预付款</span>
                                                 </div>
-                                                <input type="number" class="form-control" value="" id="start-advance" maxlength="12" onchange="roundPrice($('#start-advance'));"
-                                                       onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57)) || value.indexOf('.') >= 12) event.returnValue=false; console.log(value.indexOf('.'))">
+                                                <input type="number" class="form-control" value="" id="start-advance" maxlength="12"
+                                                       onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57)) || value.indexOf('.') >= 12) event.returnValue=false;"
+                                                       onchange="roundPrice($('#start-advance'));" oninput="limitMaxLength(this)">
                                             </div>
                                         </div>
                                         <div class="col-5">
@@ -613,8 +616,9 @@
                                                 <div class="input-group-prepend">
                                                     <span class="input-group-text">签约材料预付款</span>
                                                 </div>
-                                                <input type="number" class="form-control" value="" id="material-advance" maxlength="12" onchange="roundPrice($('#material-advance'));"
-                                                       onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57)) || value.indexOf('.') >= 12) event.returnValue=false; console.log(value.indexOf('.'))">
+                                                <input type="number" class="form-control" value="" id="material-advance" maxlength="12"
+                                                       onKeyPress="if ((event.keyCode!=46 && (event.keyCode<48 || event.keyCode>57)) || value.indexOf('.') >= 12) event.returnValue=false;"
+                                                       onchange="roundPrice($('#material-advance'));" oninput="limitMaxLength(this)">
                                             </div>
                                         </div>
                                     </div>