管理员修改新增报告功能

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

@@ -123,188 +123,220 @@
 						}
 					}
 				}
+				var reportedFalg = ${reportedFalg}
 				if(boolFlag){
-					//咨询标的额
-					var ZiXunBDE = $("#ZiXunBDE").val();
-					var GCGMValue = $("#GCGMValue").val();
+					if(false == reportedFalg){
 
-					if(GCGMValue == 0){
-						parent.layer.msg("建筑面积或规模必须大于0!", {icon: 5});
-						return false;
-					}
-					if(ZiXunBDE == 0){
-						parent.layer.msg("咨询标的额必须大于0!", {icon: 5});
-						return false;
-					}
-					//咨询营业收入
-					var ZiXunShouRu = $("#ZiXunShouRu").val();
-					if(ZiXunShouRu == 0){
-						parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
-						return false;
-					}
-					//审定价
-					var ShenDingJia = $("#ShenDingJia").val();
-					if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-						parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-						return false;
-					}
-					var list = [];
-					var size = $("#shangBaoList1 tr").length;
-					if(size <= 1){
-						parent.layer.msg("咨询员数量至少有1个人!", {icon: 5});
-						return false;
-					}
-					if(size>21){
-						parent.layer.msg("咨询员数量不得超过20人!", {icon: 5});
-						return false;
-					}
-					if(size>0){
-						for (var i = 1;i<=99;i++){
-							var zixunyuan = $("#reportedConsultantList"+i+"_zixunyuanId").val();
-							if(zixunyuan!=undefined && zixunyuan != null && zixunyuan !=''){
-								list.push(zixunyuan);
-							}
+						var startDate = new Date($("#startDate").val());
+						var endingDate = new Date($("#endingDate").val());
+						if(startDate.getTime() > endingDate.getTime()){
+							parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+							return false;
 						}
-						var nary = list.sort();
-						for(var i = 0; i < nary.length - 1; i++) {
-							if(nary[i] == nary[i + 1]) {
-								parent.layer.msg("咨询员重复，请重新选择!", {icon: 5});
-								return false;
+						var list = [];
+						var size = $("#reportedConsultantList tr").length;
+						if(size <= 1){
+							parent.layer.msg("咨询员数量至少有1个人!", {icon: 5});
+							return false;
+						}
+						if(size>0){
+							for (var i = 1;i<=99;i++){
+								var zixunyuan = $("#reportedConsultantList"+i+"_zixunyuanId").val();
+								if(zixunyuan!=undefined && zixunyuan != null && zixunyuan !=''){
+									list.push(zixunyuan);
+								}
+							}
+							var nary = list.sort();
+							for(var i = 0; i < nary.length - 1; i++) {
+								if(nary[i] == nary[i + 1]) {
+									parent.layer.msg("咨询员重复，请重新选择!", {icon: 5});
+									return false;
+								}
 							}
 						}
-					}
+					}else{
+						//咨询标的额
+						var ZiXunBDE = $("#ZiXunBDE").val();
+						var GCGMValue = $("#GCGMValue").val();
 
-					var team = $("input[name='recordsReported.s1']:checked").val();
-					var city = $("#city").val()
-					var county = $("#county").val()
-					var otherProvinces = $("#otherProvinces").val()
-					if(team ==undefined || team == null || team == ''){
-						parent.layer.msg("请选择工程所在省份!", {icon: 5});
-						return false;
-					}
-					if(team ==10){
-						if(city ==undefined || city == null || city == ''){
-							parent.layer.msg("请选择工程所在地级市!", {icon: 5});
+						if(GCGMValue == 0){
+							parent.layer.msg("建筑面积或规模必须大于0!", {icon: 5});
 							return false;
 						}
-						if(county ==undefined || county == null || county == ''){
-							parent.layer.msg("请选择工程所在区县!", {icon: 5});
+						if(ZiXunBDE == 0){
+							parent.layer.msg("咨询标的额必须大于0!", {icon: 5});
 							return false;
 						}
-					}else{
-						if(otherProvinces ==undefined || otherProvinces == null || otherProvinces == ''){
-							parent.layer.msg("请选择外省省份!", {icon: 5});
+						//咨询营业收入
+						var ZiXunShouRu = $("#ZiXunShouRu").val();
+						if(ZiXunShouRu == 0){
+							parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
 							return false;
 						}
-					}
-					var projectType = $("#ProjectType").val();
-					if(projectType == 19){
-						var advisoryIncome = $("#advisoryIncome").val();
-						var projectSupervisionIncome = $("#projectSupervisionIncome").val();
-						var tenderingAgencyIncome = $("#tenderingAgencyIncome").val();
-						var designIncome = $("#designIncome").val();
-						var otherIncome = $("#otherIncome").val();
-						var ziXunShouRu = $("#ZiXunShouRu").val();
-						var total =  parseFloat(projectSupervisionIncome) + parseFloat(tenderingAgencyIncome) + parseFloat(designIncome) + parseFloat(otherIncome) + parseFloat(ziXunShouRu);
-						if(parseFloat(total) > parseFloat(advisoryIncome)){
-							parent.layer.msg("全过程各项收入填写不正确或不能超过全过程工程咨询收入!", {icon: 5});
+						//审定价
+						var ShenDingJia = $("#ShenDingJia").val();
+						if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+							parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
 							return false;
 						}
-					}
-
-					var projectRecordId = $("#projectRecordId").val();
-					if("0" != projectRecordId && projectRecordId.length != 16){
-						parent.layer.msg("项目编号填写错误!", {icon: 5});
-						$("#projectRecordId").val("");
-						return ;
-					}
+						var list = [];
+						var size = $("#shangBaoList1 tr").length;
+						if(size <= 1){
+							parent.layer.msg("咨询员数量至少有1个人!", {icon: 5});
+							return false;
+						}
+						if(size>21){
+							parent.layer.msg("咨询员数量不得超过20人!", {icon: 5});
+							return false;
+						}
+						if(size>0){
+							for (var i = 1;i<=99;i++){
+								var zixunyuan = $("#reportedConsultantList"+i+"_zixunyuanId").val();
+								if(zixunyuan!=undefined && zixunyuan != null && zixunyuan !=''){
+									list.push(zixunyuan);
+								}
+							}
+							var nary = list.sort();
+							for(var i = 0; i < nary.length - 1; i++) {
+								if(nary[i] == nary[i + 1]) {
+									parent.layer.msg("咨询员重复，请重新选择!", {icon: 5});
+									return false;
+								}
+							}
+						}
 
-					var projectCode = $("#projectCode").val();
-					if("0" != projectCode){
-						var strArr=projectCode.split("-");
-						console.log(strArr.length)
-						if(strArr.length !=5){
-							parent.layer.msg("项目代码填写错误!", {icon: 5});
-							$("#projectCode").val("");
+						var team = $("input[name='recordsReported.s1']:checked").val();
+						var city = $("#city").val()
+						var county = $("#county").val()
+						var otherProvinces = $("#otherProvinces").val()
+						if(team ==undefined || team == null || team == ''){
+							parent.layer.msg("请选择工程所在省份!", {icon: 5});
 							return false;
 						}
-						for(var i = 0,len=strArr.length; i < len; i++) {
-							console.log(strArr[i])
-							switch(i) {
-								case 0:
-									if(strArr[0].length != 4){
-										parent.layer.msg("项目代码4位时间代码填写错误!", {icon: 5});
-										$("#projectCode").val("");
-										return false;
-									}
-									break;
-								case 1:
-									if(strArr[1].length != 6){
-										parent.layer.msg("项目代码6位地区代码填写错误!", {icon: 5});
-										$("#projectCode").val("");
-										return false;
-									}
-									break;
-								case 2:
-									if(strArr[2].length != 2){
-										parent.layer.msg("项目代码2位中央业务指导部门代码填写错误!", {icon: 5});
-										$("#projectCode").val("");
-										return false;
-									}
-									break;
-								case 3:
-									if(strArr[3].length != 2){
-										parent.layer.msg("项目代码2位项目类型代码填写错误!", {icon: 5});
-										$("#projectCode").val("");
-										return false;
-									}
-									break;
-								case 4:
-									if(strArr[4].length != 6){
-										parent.layer.msg("项目代码5位随机码和1位校验码填写错误!", {icon: 5});
-										$("#projectCode").val("");
-										return false;
-									}
-									break;
+						if(team ==10){
+							if(city ==undefined || city == null || city == ''){
+								parent.layer.msg("请选择工程所在地级市!", {icon: 5});
+								return false;
 							}
-						};
-					}
+							if(county ==undefined || county == null || county == ''){
+								parent.layer.msg("请选择工程所在区县!", {icon: 5});
+								return false;
+							}
+						}else{
+							if(otherProvinces ==undefined || otherProvinces == null || otherProvinces == ''){
+								parent.layer.msg("请选择外省省份!", {icon: 5});
+								return false;
+							}
+						}
+						var projectType = $("#ProjectType").val();
+						if(projectType == 19){
+							var advisoryIncome = $("#advisoryIncome").val();
+							var projectSupervisionIncome = $("#projectSupervisionIncome").val();
+							var tenderingAgencyIncome = $("#tenderingAgencyIncome").val();
+							var designIncome = $("#designIncome").val();
+							var otherIncome = $("#otherIncome").val();
+							var ziXunShouRu = $("#ZiXunShouRu").val();
+							var total =  parseFloat(projectSupervisionIncome) + parseFloat(tenderingAgencyIncome) + parseFloat(designIncome) + parseFloat(otherIncome) + parseFloat(ziXunShouRu);
+							if(parseFloat(total) > parseFloat(advisoryIncome)){
+								parent.layer.msg("全过程各项收入填写不正确或不能超过全过程工程咨询收入!", {icon: 5});
+								return false;
+							}
+						}
 
-					var PorjectUse = $("#PorjectUse").val();
-					if(PorjectUse ==undefined || PorjectUse == null || PorjectUse == ''){
-						parent.layer.msg("请选择工程用途!", {icon: 5});
-						return false;
-					}
+						var projectRecordId = $("#projectRecordId").val();
+						if("0" != projectRecordId && projectRecordId.length != 16){
+							parent.layer.msg("项目编号填写错误!", {icon: 5});
+							$("#projectRecordId").val("");
+							return ;
+						}
 
-					/*var checkedCount = $('input[type=checkbox]:checked').length;
-                    if(checkedCount == 0){
-                        parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
-                        return false;
-                    }*/
-
-					var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
-					var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
-					var baogaoDate = new Date(s );
-					var nowDate = new Date();
-					var a = nowDate - baogaoDate;
-					var days = Math.floor(a / (24 * 3600 * 1000));
-					if(days >37){
-						parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
-						return false;
-					}
+						var projectCode = $("#projectCode").val();
+						if("0" != projectCode){
+							var strArr=projectCode.split("-");
+							console.log(strArr.length)
+							if(strArr.length !=5){
+								parent.layer.msg("项目代码填写错误!", {icon: 5});
+								$("#projectCode").val("");
+								return false;
+							}
+							for(var i = 0,len=strArr.length; i < len; i++) {
+								console.log(strArr[i])
+								switch(i) {
+									case 0:
+										if(strArr[0].length != 4){
+											parent.layer.msg("项目代码4位时间代码填写错误!", {icon: 5});
+											$("#projectCode").val("");
+											return false;
+										}
+										break;
+									case 1:
+										if(strArr[1].length != 6){
+											parent.layer.msg("项目代码6位地区代码填写错误!", {icon: 5});
+											$("#projectCode").val("");
+											return false;
+										}
+										break;
+									case 2:
+										if(strArr[2].length != 2){
+											parent.layer.msg("项目代码2位中央业务指导部门代码填写错误!", {icon: 5});
+											$("#projectCode").val("");
+											return false;
+										}
+										break;
+									case 3:
+										if(strArr[3].length != 2){
+											parent.layer.msg("项目代码2位项目类型代码填写错误!", {icon: 5});
+											$("#projectCode").val("");
+											return false;
+										}
+										break;
+									case 4:
+										if(strArr[4].length != 6){
+											parent.layer.msg("项目代码5位随机码和1位校验码填写错误!", {icon: 5});
+											$("#projectCode").val("");
+											return false;
+										}
+										break;
+								}
+							};
+						}
 
-					var beginDateTime = $("#beginDate").val();
-					var endDateTime = $("#endDate").val();
-					if(beginDateTime != null && beginDateTime != undefined && beginDateTime != ''
-							&&endDateTime != null && endDateTime != undefined && endDateTime != ''){
-						var startDate = new Date(beginDateTime.replace(/-/g, "/"));
-						var endDate = new Date(endDateTime.replace(/-/g, "/"));
-						var time = endDate.getTime() - startDate.getTime();
-						var days = parseInt(time / (1000 * 60 * 60 * 24));
-						if(days<0){
-							parent.layer.msg("作业期结束时间需大于开始时间!", {icon: 5});
-							$("#endDate").val('');
-							return;
+						var PorjectUse = $("#PorjectUse").val();
+						if(PorjectUse ==undefined || PorjectUse == null || PorjectUse == ''){
+							parent.layer.msg("请选择工程用途!", {icon: 5});
+							return false;
+						}
+
+						/*var checkedCount = $('input[type=checkbox]:checked').length;
+                        if(checkedCount == 0){
+                            parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
+                            return false;
+                        }*/
+
+						var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+						var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
+						var baogaoDate = new Date(s );
+						var nowDate = new Date();
+						var a = nowDate - baogaoDate;
+						var days = Math.floor(a / (24 * 3600 * 1000));
+						if(days >37){
+							parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+							return false;
+						}
+
+						var beginDateTime = $("#beginDate").val();
+						var endDateTime = $("#endDate").val();
+						if(beginDateTime != null && beginDateTime != undefined && beginDateTime != ''
+								&&endDateTime != null && endDateTime != undefined && endDateTime != ''){
+							var startDate = new Date(beginDateTime.replace(/-/g, "/"));
+							var endDate = new Date(endDateTime.replace(/-/g, "/"));
+							var time = endDate.getTime() - startDate.getTime();
+							var days = parseInt(time / (1000 * 60 * 60 * 24));
+							if(days<0){
+								parent.layer.msg("作业期结束时间需大于开始时间!", {icon: 5});
+								$("#endDate").val('');
+								return;
+							}
 						}
 					}
 					$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/adminModifyReport");
@@ -636,10 +668,13 @@
 			if(rf != ''&& af !=''){
 				var hf = parseInt(rf)-parseInt(af);
 				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				rate = rate.toFixed(2);
+				hf = hf.toFixed(2);
 				$("#verifyFee").val(hf);
 				$("#verifyRate").val(rate);
 			}
 			if(af !=''){
+				af = af.toFixed(2);
 				$("#consultFee").val(af)
 			}
 		}
@@ -654,10 +689,13 @@
 			if(rf != ''&& af !=''){
 				var hf = parseInt(rf)-parseInt(af);
 				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				hf = hf.toFixed(2)
+				rate = rate.toFixed(2)
 				$("#verifyFee").val(hf);
 				$("#verifyRate").val(rate);
 			}
 			if(af !=''){
+				af = af.toFixed(2)
 				$("#consultFee").val(af)
 			}
 			$("#buildingFee").val("");
@@ -673,10 +711,13 @@
 			if(inf != ''&& af !=''){
 				var hf = parseInt(af)-parseInt(inf);
 				var rate = Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100
+				hf = hf.toFixed(2)
+				rate = rate.toFixed(2)
 				$("#installRate").val(rate);
 				$("#buildingFee").val(hf);
 				bf = hf;
 				var bRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				bRate = bRate.toFixed(2)
 				$("#buildingRate").val(bRate);
 			}
 			if(inf == ''|| af ==''){
@@ -691,10 +732,13 @@
 			if(bf != ''&& af !=''){
 				var hf = parseInt(af)-parseInt(bf);
 				var rate = Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100
+				hf = hf.toFixed(2)
+				rate = rate.toFixed(2)
 				$("#buildingRate").val(rate);
 				$("#installFee").val(hf);
 				inf = hf;
 				var inRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				inRate = inRate.toFixed(2)
 				$("#installRate").val(inRate);
 			}
 			if(bf == ''|| af ==''){
@@ -1499,13 +1543,13 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">送审价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="reviewFee" path="projectReportData.reviewFee"  htmlEscape="false"  class="form-control layui-input" />
+							<form:input id="reviewFee" path="projectReportData.reviewFee"  htmlEscape="false"  class="form-control layui-input" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="approvalFee"  path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" />
+							<form:input id="approvalFee"  path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -1522,51 +1566,51 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6" style="display: none;">
-						<label class="layui-form-label">费率合同(费率)：</label>
+						<label class="layui-form-label">费率合同(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input "/>
+							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="verifyFee"  path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" />
+							<form:input id="verifyFee"  path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减率(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="verifyRate"  path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input"/>
+							<form:input id="verifyRate"  path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">咨询标的额(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="consultFee"  path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" />
+							<form:input id="consultFee"  path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input"/>
+							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" onchange="getBuildingFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="installFee"  path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" />
+							<form:input id="installFee"  path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" onchange="getInstallFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建比例(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="buildingRate"  path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" />
+							<form:input id="buildingRate"  path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装比例(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="installRate"  path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" />
+							<form:input id="installRate"  path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						</div>
 					</div>