项目登记土建、造价联动

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

@@ -258,6 +258,64 @@
 			}
 		}
 
+		function getApprovalFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			//土建
+			var bf = $("#buildingFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+			$("#buildingFee").val("");
+			$("#installFee").val("");
+			$("#buildingRate").val("");
+			$("#installRate").val("");
+		}
+
+		function getInstallFee() {
+			var af = $("#approvalFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if(inf != ''&& af !=''){
+				var hf = parseInt(af)-parseInt(inf);
+				var rate = Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100
+				$("#installRate").val(rate);
+				$("#buildingFee").val(hf);
+				bf = hf;
+				var bRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				$("#buildingRate").val(bRate);
+			}
+			if(inf == ''|| af ==''){
+				$("#installRate").val("");
+			}
+		}
+
+		function getBuildingFee() {
+			var af = $("#approvalFee").val();
+			//土建
+			var bf = $("#buildingFee").val();
+			if(bf != ''&& af !=''){
+				var hf = parseInt(af)-parseInt(bf);
+				var rate = Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100
+				$("#buildingRate").val(rate);
+				$("#installFee").val(hf);
+				inf = hf;
+				var inRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				$("#installRate").val(inRate);
+			}
+			if(bf == ''|| af ==''){
+				$("#buildingRate").val("");
+			}
+		}
+
         function addReview(obj) {
             var infoId = $("#id").val();
             var name = $("#name").val();
@@ -363,7 +421,7 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -393,15 +451,27 @@
 					<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 number"/>
+							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" 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 number"/>
+							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" 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" 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" readonly="true"/>
+					</div>
+				</div>
 				</div>
 
 			<div class="form-group layui-row">

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

@@ -333,11 +333,12 @@
                         var xml="";
                         if(d.canAdd != undefined && d.canAdd =="1")
                         {
-                        	if(d.view =="true"){
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
+                        	/*if(d.view =="true"){
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
 							}else{
 								xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" style=\"pointer-events: none;background-color:#c2c2c2;\" class=\"op-btn\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
-							}
+							}*/
 						}
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {

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

@@ -25,8 +25,17 @@
         var validateForm;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+                var startDate = new Date($("#startDate").val());
+                var endingDate = new Date($("#endingDate").val());
+
+                if(startDate.getTime() > endingDate.getTime()){
+                    parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+                    return false;
+                }
                 $("#inputForm").submit();
                 return true;
+            }else{
+                parent.layer.msg("信息未填写完整!", {icon: 5});
             }
 
             return false;
@@ -474,6 +483,54 @@
 
 
         }
+
+        function getApprovalFee() {
+            //总价
+            var af = $("#estimateTotalFees").val();
+            if(af !=''){
+                $("#estimateTotalFees").val(af)
+            }
+            $("#buildingFees").val("");
+            $("#installFees").val("");
+            $("#buildingPercent").val("");
+            $("#installPercent").val("");
+        }
+
+        function getInstallFee() {
+            var af = $("#estimateTotalFees").val();
+            //安装
+            var inf = $("#installFees").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = (Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(rate);
+                $("#buildingFees").val(hf);
+                bf = hf;
+                var bRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installPercent").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#estimateTotalFees").val();
+            //土建
+            var bf = $("#buildingFees").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(rate);
+                $("#installFees").val(hf);
+                inf = hf;
+                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingPercent").val("");
+            }
+        }
     </script>
 </head>
 <body >
@@ -667,13 +724,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -730,25 +787,25 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number" onchange="getBudlingFees()"/>
+                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中土建造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中安装造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -47,6 +47,13 @@
                     top.layer.alert('请选择委托方联系人！', {icon: 0});
                     return;
                 }
+                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 flag = $("#flagFile").val();
                 if(flag == 'false'){
                     top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
@@ -61,6 +68,8 @@
                 }
                 $("#inputForm").submit();
                 return true;
+            }else{
+                parent.layer.msg("信息未填写完整!", {icon: 5});
             }
 
             return false;
@@ -587,6 +596,54 @@
                 });
             }
         }
+
+        function getApprovalFee() {
+            //总价
+            var af = $("#estimateTotalFees").val();
+            if(af !=''){
+                $("#estimateTotalFees").val(af)
+            }
+            $("#buildingFees").val("");
+            $("#installFees").val("");
+            $("#buildingPercent").val("");
+            $("#installPercent").val("");
+        }
+
+        function getInstallFee() {
+            var af = $("#estimateTotalFees").val();
+            //安装
+            var inf = $("#installFees").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = (Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(rate);
+                $("#buildingFees").val(hf);
+                bf = hf;
+                var bRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installPercent").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#estimateTotalFees").val();
+            //土建
+            var bf = $("#buildingFees").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(rate);
+                $("#installFees").val(hf);
+                inf = hf;
+                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingPercent").val("");
+            }
+        }
     </script>
 </head>
 <body>
@@ -756,13 +813,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -819,25 +876,25 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number" onchange="getBudlingFees()"/>
+                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中土建造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中安装造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -25,6 +25,13 @@
 		var validateForm;
 		function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 		  if(validateForm.form()){
+              var startDate = new Date($("#startDate").val());
+              var endingDate = new Date($("#endingDate").val());
+
+              if(startDate.getTime() > endingDate.getTime()){
+                  parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+                  return false;
+              }
               if($(".trIdAdds").length==0){
                   top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
                   return;
@@ -43,7 +50,9 @@
 			  }
 			  $("#inputForm").submit();
 			  return true;
-		  }
+		  }else{
+              parent.layer.msg("信息未填写完整!", {icon: 5});
+          }
 	
 		  return false;
 		}
@@ -489,6 +498,54 @@
 
 
         }
+
+        function getApprovalFee() {
+            //总价
+            var af = $("#estimateTotalFees").val();
+            if(af !=''){
+                $("#estimateTotalFees").val(af)
+            }
+            $("#buildingFees").val("");
+            $("#installFees").val("");
+            $("#buildingPercent").val("");
+            $("#installPercent").val("");
+        }
+
+        function getInstallFee() {
+            var af = $("#estimateTotalFees").val();
+            //安装
+            var inf = $("#installFees").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = (Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(rate);
+                $("#buildingFees").val(hf);
+                bf = hf;
+                var bRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installPercent").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#estimateTotalFees").val();
+            //土建
+            var bf = $("#buildingFees").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(rate);
+                $("#installFees").val(hf);
+                inf = hf;
+                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingPercent").val("");
+            }
+        }
 	</script>
 </head>
 <body >
@@ -690,13 +747,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -753,25 +810,25 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number" onchange="getBudlingFees()"/>
+                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中土建造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中安装造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -329,7 +329,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
-					<label class="layui-form-label">特殊要求：</label>
+					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">
 						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
 					</div>

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

@@ -25,9 +25,18 @@
 		var validateForm;
 		function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 		  if(validateForm.form()){
+              var startDate = new Date($("#startDate").val());
+              var endingDate = new Date($("#endingDate").val());
+
+              if(startDate.getTime() > endingDate.getTime()){
+                  parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+                  return false;
+              }
 			  $("#inputForm").submit();
 			  return true;
-		  }
+		  }else{
+              parent.layer.msg("信息未填写完整!", {icon: 5});
+          }
 	
 		  return false;
 		}
@@ -474,6 +483,54 @@
 
 
         }
+
+        function getApprovalFee() {
+            //总价
+            var af = $("#estimateTotalFees").val();
+            if(af !=''){
+                $("#estimateTotalFees").val(af)
+            }
+            $("#buildingFees").val("");
+            $("#installFees").val("");
+            $("#buildingPercent").val("");
+            $("#installPercent").val("");
+        }
+
+        function getInstallFee() {
+            var af = $("#estimateTotalFees").val();
+            //安装
+            var inf = $("#installFees").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = (Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(rate);
+                $("#buildingFees").val(hf);
+                bf = hf;
+                var bRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installPercent").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#estimateTotalFees").val();
+            //土建
+            var bf = $("#buildingFees").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(rate);
+                $("#installFees").val(hf);
+                inf = hf;
+                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingPercent").val("");
+            }
+        }
 	</script>
 </head>
 <body >
@@ -667,13 +724,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -730,25 +787,25 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number" onchange="getBudlingFees()"/>
+                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中土建造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中安装造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -47,6 +47,13 @@
                     top.layer.alert('请选择委托方联系人！', {icon: 0});
                     return;
                 }
+                var startDate = new Date($("#startDate").val());
+                var endingDate = new Date($("#endingDate").val());
+
+                if(startDate.getTime() > endingDate.getTime()){
+                    parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+                    return false;
+                }
                 /*if($("#workConstructionLinkmanList tr").length==0){
                     top.layer.alert('请至少选择一个施工方联系人！', {icon: 0});
                     return;
@@ -56,11 +63,22 @@
                     top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
                     return;
                 }
+
+                var startDate = new Date($("#startDate").val());
+                var endingDate = new Date($("#endingDate").val());
+
+                if(startDate.getTime() > endingDate.getTime()){
+                    parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+                    return false;
+                }
+
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectRecords/tstore");
                 }
                 $("#inputForm").submit();
                 return true;
+            }else{
+                parent.layer.msg("信息未填写完整!", {icon: 5});
             }
 
             return false;
@@ -597,6 +615,54 @@
                 });
             }
         }
+
+        function getApprovalFee() {
+            //总价
+            var af = $("#estimateTotalFees").val();
+            if(af !=''){
+                $("#estimateTotalFees").val(af)
+            }
+            $("#buildingFees").val("");
+            $("#installFees").val("");
+            $("#buildingPercent").val("");
+            $("#installPercent").val("");
+        }
+
+        function getInstallFee() {
+            var af = $("#estimateTotalFees").val();
+            //安装
+            var inf = $("#installFees").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = (Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(rate);
+                $("#buildingFees").val(hf);
+                bf = hf;
+                var bRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installPercent").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#estimateTotalFees").val();
+            //土建
+            var bf = $("#buildingFees").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(rate);
+                $("#installFees").val(hf);
+                inf = hf;
+                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingPercent").val("");
+            }
+        }
     </script>
 </head>
 <body>
@@ -766,13 +832,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -829,25 +895,25 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number" onchange="getBudlingFees()"/>
+                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中土建造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中安装造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -25,6 +25,13 @@
 		var validateForm;
 		function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 		  if(validateForm.form()){
+              var startDate = new Date($("#startDate").val());
+              var endingDate = new Date($("#endingDate").val());
+
+              if(startDate.getTime() > endingDate.getTime()){
+                  parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+                  return false;
+              }
               if($(".trIdAdds").length==0){
                   top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
                   return;
@@ -43,7 +50,9 @@
 			  }
 			  $("#inputForm").submit();
 			  return true;
-		  }
+		  }else{
+              parent.layer.msg("信息未填写完整!", {icon: 5});
+          }
 
 		  return false;
 		}
@@ -491,6 +500,42 @@
 
 
         }
+
+        function getInstallFee() {
+            var af = $("#estimateTotalFees").val();
+            //安装
+            var inf = $("#installFees").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = (Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(rate);
+                $("#buildingFees").val(hf);
+                bf = hf;
+                var bRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installPercent").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#estimateTotalFees").val();
+            //土建
+            var bf = $("#buildingFees").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(rate);
+                $("#installFees").val(hf);
+                inf = hf;
+                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingPercent").val("");
+            }
+        }
 	</script>
 </head>
 <body >
@@ -692,13 +737,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -755,25 +800,25 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number" onchange="getBudlingFees()"/>
+                        <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中土建造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中安装造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -329,7 +329,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
-					<label class="layui-form-label">特殊要求：</label>
+					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">
 						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
 					</div>

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

@@ -334,11 +334,12 @@
                         var xml="";
                         if(d.canAdd != undefined && d.canAdd =="1")
                         {
-                        	if(d.view =="true"){
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
+                        	/*if(d.view =="true"){
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
 							}else{
 								xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" style=\"pointer-events: none;background-color:#c2c2c2;\" class=\"op-btn\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
-							}
+							}*/
                         }
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {