Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/projectConstruction/projectConstructionView.jsp

@@ -108,13 +108,13 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">目标成本(元)：</label>
                     <div class="layui-input-block">
-                        <input name="titularAmt" htmlEscape="false" readonly="true" value="${constructionContract.titularAmt}" class="form-control layui-input number"/>
+                        <input name="titularAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${constructionContract.titularAmt}" pattern="#,##0.00#"/>" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label double-line">有效合同金额(元)：</label>
                     <div class="layui-input-block">
-                        <input name="trueAmt" htmlEscape="false" readonly="true"  value="${constructionContract.trueAmt}" class="form-control layui-input number required"/>
+                        <input name="trueAmt" htmlEscape="false" readonly="true"  value="<fmt:formatNumber value="${constructionContract.trueAmt}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -144,9 +144,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">支付金额：</label>
+                    <label class="layui-form-label">止付金额：</label>
                     <div class="layui-input-block">
-                        <input name="stopAmt" htmlEscape="false" readonly="true"  value="${constructionContract.stopAmt}"  class="form-control layui-input  number"/>
+                        <input name="stopAmt" htmlEscape="false" readonly="true"  value="<fmt:formatNumber value="${constructionContract.stopAmt}" pattern="#,##0.00#"/>"  class="form-control layui-input  number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -170,7 +170,7 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">支付金额：</label>
                     <div class="layui-input-block">
-                        <input name="payAmt" htmlEscape="false" readonly="true"  value="${constructionContract.payAmt}" class="form-control layui-input required number"/>
+                        <input name="payAmt" htmlEscape="false" readonly="true"  value="<fmt:formatNumber value="${constructionContract.payAmt}" pattern="#,##0.00#"/>" class="form-control layui-input required number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/projectrecord/implementStage/projectDesignList.jsp

@@ -308,14 +308,14 @@
                                 return "<font>"+d.confirmMoney+"</font>";
                             }
                         }},
-                    {field: 'date', align:'center', title: '签证日期',width:100,templet: function(d){
+                    {field: 'date', align:'center', title: '变更日期',width:100,templet: function(d){
                             var date=d.date;
                             /*date=date.replace(new RegExp(/-/gm) ,"/");*/
 
                             if(d.condition ==1){
-                                return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+                                return "";
                             }else if(d.condition ==2){
-                                return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+                                return "";
                             }else{
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }

src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaList.jsp

@@ -313,9 +313,9 @@
                             /*date=date.replace(new RegExp(/-/gm) ,"/");*/
 
                             if(d.condition ==1){
-                                return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+                                return "";
                             }else if(d.condition ==2){
-                                return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+                                return "";
                             }else{
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }