金额格式调整

src/main/java/com/jeeplus/modules/workinvoicealter/web/WorkInvoiceAlterController.java

@@ -248,7 +248,7 @@ public class WorkInvoiceAlterController extends BaseController {
 			addMessage(redirectAttributes, "发票提交申请提交失败!");
 			addMessage(redirectAttributes, "系统内部错误");
 		}
-		return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
+		return "redirect:"+Global.getAdminPath()+"/workinvoicealter/workInvoiceAlter/?repage";
 	}
 
 	/**

src/main/webapp/webpage/modules/projectcontentinfo/reportChangeView.jsp

@@ -117,49 +117,49 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">送审价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.reviewFee}"/>
+							<input   readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.reviewFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.approvalFee}"/>
+							<input   readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.approvalFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.contractFee}"/>
+							<input    readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.contractFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyFee}"/>
+							<input   readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.verifyFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减率(%)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.verifyRate"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyRate}"/>
+							<input    readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyRate}"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">咨询标的额(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.consultFee}"/>
+							<input   readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.consultFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.buildingFee}"/>
+							<input    readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.buildingFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.installFee}"/>
+							<input    readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.installFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 				</div>
@@ -462,49 +462,49 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">送审价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.reviewFee}"/>
+							<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.beforeEntity.reviewFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.approvalFee}"/>
+							<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.beforeEntity.approvalFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.contractFee}"/>
+							<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.beforeEntity.contractFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyFee}"/>
+							<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.beforeEntity.verifyFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减率(%)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.verifyRate"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyRate}"/>
+							<input  id="projectReportData.verifyRate"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.beforeEntity.verifyRate}"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">咨询标的额(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.consultFee}"/>
+							<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.beforeEntity.consultFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.buildingFee}"/>
+							<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.beforeEntity.buildingFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.installFee}"/>
+							<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.beforeEntity.installFee}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/projectcontentinfo/reportView.jsp

@@ -99,25 +99,25 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">送审价(元)：</label>
 				<div class="layui-input-block with-icon">
-					<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.reviewFee}"/>
+					<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.reviewFee}" pattern="#,##0.00#"/>" />
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">审定价(元)：</label>
 				<div class="layui-input-block with-icon">
-					<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.approvalFee}"/>
+					<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.approvalFee}" pattern="#,##0.00#"/>" />
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">合同价(元)：</label>
 				<div class="layui-input-block with-icon">
-					<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.contractFee}"/>
+					<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.contractFee}" pattern="#,##0.00#"/>" />
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">核增核减额(元)：</label>
 				<div class="layui-input-block with-icon">
-					<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyFee}"/>
+					<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.verifyFee}" pattern="#,##0.00#"/>" />
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
@@ -129,19 +129,19 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">咨询标的额(元)：</label>
 				<div class="layui-input-block with-icon">
-					<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.consultFee}"/>
+					<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.consultFee}" pattern="#,##0.00#"/>" />
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">土建造价(元)：</label>
 				<div class="layui-input-block with-icon">
-					<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.buildingFee}"/>
+					<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.buildingFee}" pattern="#,##0.00#"/>" />
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">安装造价(元)：</label>
 				<div class="layui-input-block with-icon">
-					<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.installFee}"/>
+					<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.installFee}" pattern="#,##0.00#"/>"/>
 				</div>
 			</div>
 		</div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp

@@ -486,12 +486,12 @@
 					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th>报告编号</th>
-							<th>报告名称</th>
-							<th width="220">工作内容类型</th>
-							<th width="80">签章类型</th>
-							<th width="90">创建日期</th>
-							<th width="80">状态</th>
+							<th width="25%">报告编号</th>
+							<th width="25%">报告名称</th>
+							<th width="20%">工作内容类型</th>
+							<th width="10%">签章类型</th>
+							<th width="10%">创建日期</th>
+							<th width="10%">状态</th>
 						</tr>
 						</thead>
 						<tbody>

src/main/webapp/webpage/modules/projectreportnum/reportAuditProject.jsp

@@ -76,25 +76,25 @@
 			<div class="form-group">
 				<label class="col-sm-4 control-label">合同金额（元）：</label>
 				<div class="col-sm-6">
-					<form:input path="reportData.contractFee" htmlEscape="false"  readonly="true"  class="form-control "/>
+					<input  value="<fmt:formatNumber value="${projectRecords.reportData.contractFee}" pattern="#,##0.00#"/>" htmlEscape="false"  readonly="readonly"  class="form-control "/>
 				</div>
 			</div>
 			<div class="form-group">
 				<label class="col-sm-4 control-label">送审金额（元）：</label>
 				<div class="col-sm-6">
-					<form:input path="reportData.reviewFee" htmlEscape="false"  readonly="true"  class="form-control "/>
+					<input  value="<fmt:formatNumber value="${projectRecords.reportData.reviewFee}" pattern="#,##0.00#"/>" htmlEscape="false"  readonly="readonly"  class="form-control "/>
 				</div>
 			</div>
 			<div class="form-group">
 				<label class="col-sm-4 control-label">审定金额（元）：</label>
 				<div class="col-sm-6">
-					<form:input path="reportData.approvalFee" htmlEscape="false" readonly="true"   class="form-control "/>
+					<input  value="<fmt:formatNumber value="${projectRecords.reportData.approvalFee}" pattern="#,##0.00#"/>" htmlEscape="false" readonly="readonly"   class="form-control "/>
 				</div>
 			</div>
 			<div class="form-group">
 				<label class="col-sm-4 control-label">核增核减金额（元）：</label>
 				<div class="col-sm-6">
-					<form:input path="reportData.verifyFee" htmlEscape="false"  readonly="true"  class="form-control "/>
+					<input  htmlEscape="false"  value="<fmt:formatNumber value="${projectRecords.reportData.verifyFee}" pattern="#,##0.00#"/>" readonly="readonly"  class="form-control "/>
 				</div>
 			</div>
 			<div class="form-group">

src/main/webapp/webpage/modules/workreceiptsregister/workReceiptsDetailView.jsp

@@ -115,7 +115,7 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>合同金额：</label>
 						<div class="layui-input-block">
-							<form:input id ="cMoney" path="project.workContractInfo.contractPrice" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+							<input id ="cMoney"  value="<fmt:formatNumber value="${workReceiptsRegister.project.workContractInfo.contractPrice}" pattern="#,##0.00#"/>" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/workreceiptsregister/workReceiptsRegisterForm.jsp

@@ -73,6 +73,7 @@
 					$("#cInfoName").val(d.cInfoName);
 					$("#cName").val(d.cName);
 					$("#cMoney").val(d.cMoney);
+					formatNum("#cMoney");
 					// $("#officeName").val(d.officeName);
 					// $("#officeId").val(d.officeId);
 				}
@@ -156,7 +157,7 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>合同金额：</label>
 						<div class="layui-input-block">
-							<form:input id ="cMoney" path="project.workContractInfo.contractPrice" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+							<input id ="cMoney" path="project.workContractInfo.contractPrice"  htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -538,15 +538,15 @@
                                                labelValue="${workReimbursement.project.projectName}" cssClass="form-control required layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" ></sys:gridselectReproject>
                 </div>
             </div>
-            <%--<div class="layui-item layui-col-sm6">--%>
-                <%--<label class="layui-form-label">报销类别：</label>--%>
-                <%--<div class="layui-input-block">--%>
-                    <%--<form:select id="type" path="type" class="form-control simple-select ">--%>
-                        <%--<form:option value="" label=""/>--%>
-                        <%--<form:options items="${fns:getDictList('reimbursement_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
-                    <%--</form:select>--%>
-                <%--</div>--%>
-            <%--</div>--%>
+            <div class="layui-item layui-col-sm6">
+                <label class="layui-form-label">报销类别：</label>
+                <div class="layui-input-block">
+                    <form:select id="type" path="type" class="form-control simple-select ">
+                        <form:option value="" label=""/>
+                        <form:options items="${fns:getMainDictList('reimbursement_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                    </form:select>
+                </div>
+            </div>
             <%--<div class="layui-item layui-col-sm6 td1">
                 <label class="layui-form-label">项目负责人：</label>
                 <div class="layui-input-block">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormDetail.jsp

@@ -120,12 +120,12 @@
                 <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workReimbursement.project.projectName}"/>
             </div>
         </div>
-        <%--<div class="layui-item layui-col-sm6">--%>
-            <%--<label class="layui-form-label">报销类别：</label>--%>
-            <%--<div class="layui-input-block">--%>
-                <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getDictLabel(workReimbursement.type, 'reimbursement_type','')}"/>--%>
-            <%--</div>--%>
-        <%--</div>--%>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label">报销类别：</label>
+            <div class="layui-input-block">
+                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workReimbursement.type}"/>
+            </div>
+        </div>
         <%--<div class="layui-item layui-col-sm6 td1">
             <label class="layui-form-label">项目负责人：</label>
             <div class="layui-input-block">