页面展示代码调整

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -62,7 +62,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String numberPath;
 	private String tempType;    //模板类型
 	private String bzshbUserId; //总审用户id
-	private String ZiXunShouRu;	//造价咨询营业收入（万元）
+	private String ZiXunShouRu;	//造价咨询营业收入（元）
 	private String ziXunShou;	//造价咨询营业收入
 
 	public String getNumberPath() {

src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineView.jsp

@@ -397,7 +397,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineform.jsp

@@ -449,7 +449,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingAudit.jsp

@@ -994,7 +994,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<input value="${projectReportData.ziXunShouRu}" readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" class="form-control layui-input"/>
 							</div>
@@ -1208,7 +1208,7 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw7">
-								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+								<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 								<div class="layui-input-block">
 									<input value="${projectReportData.ziXunShouRu}" readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" class="form-control layui-input"/>
 								</div>

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

@@ -776,7 +776,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -1855,7 +1855,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                        <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                         <div class="layui-input-block">
                             <input type="text" readonly value="${ziXunShouRu}" class="form-control layui-input">
                         </div>
@@ -2100,7 +2100,7 @@
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                            <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                             <div class="layui-input-block">
                                 <input type="text" readonly value="${ziXunShouRu}" class="form-control layui-input">
                             </div>
@@ -2265,7 +2265,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                         <div class="layui-input-block">
                             <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                         </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -1216,7 +1216,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control number judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -1223,7 +1223,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedModify.jsp

@@ -1209,7 +1209,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/submitReportedProvincialStandingForm.jsp

@@ -1202,7 +1202,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp

@@ -1166,7 +1166,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1683,7 +1683,7 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+						<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
 						<div class="layui-input-block">
 							<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input required"/>
 						</div>
@@ -2348,7 +2348,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="recordsReported.ZiXunShouRu"  id="ZiXunShouRu"  placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
 							</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -1140,7 +1140,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input judgment"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -961,7 +961,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input required"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp

@@ -1163,7 +1163,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -113,10 +113,10 @@
                         }
                     }*/
 
-                    if($("#workClientLinkmanList tr").length==0){
+                    /*if($("#workClientLinkmanList tr").length==0){
                         top.layer.msg("请选择委托方联系人！", {icon: 5});
                         return;
-                    }
+                    }*/
 
 
                     var startDate = new Date($("#startDate").val());
@@ -1285,7 +1285,7 @@
 
 
             <div>
-                <div class="form-group-label"><h2><span class="require-item">*</span>委托方联系人信息</h2></div>
+                <div class="form-group-label"><h2>委托方联系人信息</h2></div>
                 <div id="linkmanDiv" class="layui-item nav-btns" style="float: left;width: 155px">
                     <a class="nav-btn nav-btn-add"
                        onclick="workClientLinkmanTplInfo('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;"

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify.jsp

@@ -55,10 +55,10 @@
                   parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                   return false;
               }
-              if($("#workClientLinkmanList tr").length==0){
+              /*if($("#workClientLinkmanList tr").length==0){
                   top.layer.msg("请选择委托方联系人！", {icon: 5});
                   return;
-              }
+              }*/
               var flag = $("#flagFile").val();
               if(flag == 'false'){
                   top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
@@ -1152,7 +1152,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>委托方联系人信息</h2></div>
+                <div class="form-group-label"><h2>委托方联系人信息</h2></div>
                 <div id="linkmanDiv" class="layui-item nav-btns">
                     <sys:gridselect1 url="${ctx}/workclientinfo/workClientInfo/linkmanList" id="linkman" name="linkman.id"  title="选择客户" value="${projectRecords.workContractInfo.workClinetInfoIds}"
                                      cssClass="form-control required" fieldLabels="联系人" fieldKeys="name"  searchLabel="联系人" searchKey="name"></sys:gridselect1>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify.jsp

@@ -492,7 +492,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="report.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -873,7 +873,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp

@@ -496,7 +496,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="report.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp

@@ -466,7 +466,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="report.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -933,7 +933,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>
@@ -1144,7 +1144,7 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw7">
-								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+								<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 								<div class="layui-input-block">
 									<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 								</div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp

@@ -481,7 +481,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="report.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedAudit.jsp

@@ -1151,7 +1151,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedForm.jsp

@@ -1143,7 +1143,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedModify.jsp

@@ -1126,7 +1126,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedView.jsp

@@ -1142,7 +1142,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedAudit.jsp

@@ -1208,7 +1208,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedForm.jsp

@@ -1200,7 +1200,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedModify.jsp

@@ -1184,7 +1184,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseAudit.jsp

@@ -1073,7 +1073,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>
@@ -1323,7 +1323,7 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw7">
-								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+								<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 								<div class="layui-input-block">
 									<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 								</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseModify.jsp

@@ -1022,7 +1022,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>
@@ -1272,7 +1272,7 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw7">
-								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+								<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 								<div class="layui-input-block">
 									<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 								</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -76,10 +76,10 @@
                         top.layer.alert('请至少选择一个施工方联系人！', {icon: 0});
                         return;
                     }*/
-                    if($("#workClientLinkmanList tr").length==0){
+                    /*if($("#workClientLinkmanList tr").length==0){
                         top.layer.msg("请选择委托方联系人！", {icon: 5});
                         return;
-                    }
+                    }*/
                     var startDate = new Date($("#startDate").val());
                     var endingDate = new Date($("#endingDate").val());
 
@@ -1324,7 +1324,7 @@
 
 
             <div>
-                <div class="form-group-label"><h2><span class="require-item">*</span>委托方联系人信息</h2></div>
+                <div class="form-group-label"><h2>委托方联系人信息</h2></div>
                 <div id="linkmanDiv" class="layui-item nav-btns" style="float: left;width: 155px">
                     <a class="nav-btn nav-btn-add"
                        onclick="workClientLinkmanTplInfo('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -53,10 +53,10 @@
                   parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                   return false;
               }
-              if($("#workClientLinkmanList tr").length==0){
+              /*if($("#workClientLinkmanList tr").length==0){
                   top.layer.msg("请选择委托方联系人！", {icon: 5});
                   return;
-              }
+              }*/
               var projectProperties=$("#projectProperties").val();
               if(projectProperties==''){
                   parent.layer.msg("投资性质未选择!", {icon: 5});
@@ -1141,7 +1141,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>委托方联系人信息</h2></div>
+                <div class="form-group-label"><h2>委托方联系人信息</h2></div>
                 <div id="linkmanDiv" class="layui-item nav-btns">
                     <sys:gridselect1 url="${ctx}/workclientinfo/workClientInfo/linkmanList" id="linkman" name="linkman.id"  title="选择客户" value="${projectRecords.workContractInfo.workClinetInfoIds}"
                                      cssClass="form-control required" fieldLabels="联系人" fieldKeys="name"  searchLabel="联系人" searchKey="name"></sys:gridselect1>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -1677,7 +1677,7 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+						<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 						<div class="layui-input-block">
 							<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 						</div>
@@ -2306,7 +2306,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="recordsReported.ZiXunShouRu"  id="ZiXunShouRu"  placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
 							</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedForm.jsp

@@ -1187,7 +1187,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedModify.jsp

@@ -1189,7 +1189,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -1678,7 +1678,7 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+						<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 						<div class="layui-input-block">
 							<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 						</div>
@@ -2316,7 +2316,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="recordsReported.ZiXunShouRu"  id="ZiXunShouRu"  placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
 							</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm.jsp

@@ -960,7 +960,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input judgment"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageAudit.jsp

@@ -1119,7 +1119,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageModify.jsp

@@ -738,7 +738,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input required"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageView.jsp

@@ -415,7 +415,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -991,7 +991,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -880,7 +880,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>
@@ -1093,7 +1093,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 							<div class="layui-input-block">
 								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -699,7 +699,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input required"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo.jsp

@@ -565,7 +565,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -1032,7 +1032,7 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+						<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
 						<div class="layui-input-block">
 							<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input judgment"/>
 						</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo.jsp

@@ -790,7 +790,7 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+						<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 						<div class="layui-input-block">
 							<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" class="form-control layui-input"/>
 						</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageTwoView.jsp

@@ -415,7 +415,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -415,7 +415,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -1174,7 +1174,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onkeyup="num(this)" onblur="onblurNum(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -1152,7 +1152,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -1196,7 +1196,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedView.jsp

@@ -926,7 +926,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                        <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                         <div class="layui-input-block">
                             <input type="text" readonly value="${ziXunShouRu}" class="form-control layui-input">
                         </div>
@@ -1171,7 +1171,7 @@
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                            <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                             <div class="layui-input-block">
                                 <input type="text" readonly value="${ziXunShouRu}" class="form-control layui-input">
                             </div>
@@ -1328,7 +1328,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                        <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                         <div class="layui-input-block">
                             <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" readonly="true" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
                         </div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp

@@ -296,7 +296,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -454,7 +454,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -271,7 +271,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+                    <label class="layui-form-label double-line">造价咨询营业收入（元）：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" readonly="true" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>