소스 검색

项目登记(是否紧急项目)

[user3] 4 년 전
부모
커밋
867a2c99c0

+ 9 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -205,6 +205,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer planCount;	//项目计划数量
 	private BigDecimal submitScale;	//送审规模
 	private Boolean createReportFlag;	//生成报告号判断条件
+	private String emergencyProject;	//是否是紧急项目
 
 
 	private List<String> civilProjectList = Lists.newArrayList();
@@ -1453,4 +1454,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setCreateReportFlag(Boolean createReportFlag) {
 		this.createReportFlag = createReportFlag;
 	}
+
+	public String getEmergencyProject() {
+		return emergencyProject;
+	}
+
+	public void setEmergencyProject(String emergencyProject) {
+		this.emergencyProject = emergencyProject;
+	}
 }

+ 10 - 5
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -52,7 +52,8 @@
 		a.attachment_project_sort as "attachmentProjectSort",
 		a.check_remarks as "checkRemarks",
 		a.project_properties As "projectProperties",
-		a.submit_scale As "submitScale"
+		a.submit_scale As "submitScale",
+		a.emergency_project AS "emergencyProject"
 	</sql>
 
 	<sql id="projectRecordsJoins">
@@ -526,7 +527,8 @@
 			submit_money,
 			engineering_type,
 			project_properties,
-			submit_scale
+			submit_scale,
+			emergency_project
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -576,7 +578,8 @@
 		    #{submitMoney},
 		    #{engineeringType},
 		    #{projectProperties},
-		    #{submitScale}
+		    #{submitScale},
+		    #{emergencyProject}
 		)
 	</insert>
 
@@ -627,7 +630,8 @@
 			,submit_money =#{submitMoney},
 			engineering_type =#{engineeringType},
 			project_properties =#{projectProperties},
-			submit_scale =#{submitScale}
+			submit_scale =#{submitScale},
+			emergency_project=#{emergencyProject}
 		WHERE id = #{id}
 	</update>
 	<update id="updateDate">
@@ -673,7 +677,8 @@
 		    ending_date =  #{endingDate},
 		    estimate_total_fees = #{estimateTotalFees},
 		    attachment_project_sort = #{attachmentProjectSort},
-			submit_scale = #{submitScale}
+			submit_scale = #{submitScale},
+			emergency_project=#{emergencyProject}
 			<if test="engineeringType != null and engineeringType != ''">
 				,engineering_type =#{engineeringType}
 			</if>

+ 49 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp

@@ -108,7 +108,46 @@
                         });
                     }
                 });
+                //是否紧急项目判断项
+                layui.form.on('radio(submitMoney)', function(data){
+                    var span=data.value;
+                    if(span==2){
+                        $("#emergencyProject").parent().parent().parent().hide();
+                        //A级均为非紧急项目
+                        $("#emergencyProjectFlag").val("0");
+                        $("#emergencyProject").prop("checked",false);
+                        layui.form.render();
+                    }else if(span==1){
+                        $("#emergencyProject").parent().parent().parent().show();
+                    }
+                });
+                form.on('switch(emergencyProject)',function(data){
+                    var flag=$(this).prop("checked")
+                    if (flag){
+                        //是紧急项目
+                        $("#emergencyProjectFlag").val("1");
+                    }else{
+                        //不是紧急项目
+                        $("#emergencyProjectFlag").val("0");
+                    }
+                })
             });
+            //默认打开判断是否时紧急项目
+            var submitMoney="${ruralProjectRecords.submitMoney}"
+            if(submitMoney==1){
+                $("#emergencyProject").parent().parent().parent().show();
+                var emergencyProject="${ruralProjectRecords.emergencyProject}"
+                if (emergencyProject=="1"){
+                    $("#emergencyProjectFlag").val("1");
+                    $("#emergencyProject").prop("checked",true);
+                    layui.form.render();
+                }else{
+                    $("#emergencyProjectFlag").val("0");
+                    $("#emergencyProject").prop("checked",false);
+                    layui.form.render();
+                }
+            }
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -614,6 +653,7 @@
 		    <form:hidden path="id"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="flagFile" value="">
+            <input type="hidden" id="emergencyProjectFlag" name="emergencyProject" value="${ruralProjectRecords.emergencyProject}">
 
             <input type="hidden" id="workClientLinkmanInfo" value="${projectRecords.workClientLinkmanList}">
             <div class="form-group layui-row first">
@@ -835,10 +875,18 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目等级:</label>
                     <div class="layui-input-block">
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
-                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" lay-filter="submitMoney"  title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
+                    <label class="layui-form-label double-line">是否是紧急项目:</label>
+                    <div class="layui-input-block">
+                        <div style="margin-right: 30px;">
+                            <input type="checkbox" id="emergencyProject" lay-filter="emergencyProject" lay-skin="switch" lay-text="是|否">
+                        </div>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模(万元):</label>
                     <div class="layui-input-block">

+ 49 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -184,7 +184,46 @@
                     var flag=$(this).prop("checked")
                     $("#createReportFlag").val(flag);
                 })
+                //是否紧急项目判断项
+                layui.form.on('radio(submitMoney)', function(data){
+                    var span=data.value;
+                    if(span==2){
+                        $("#emergencyProject").parent().parent().parent().hide();
+                        //A级均为非紧急项目
+                        $("#emergencyProjectFlag").val("0");
+                        $("#emergencyProject").prop("checked",false);
+                        layui.form.render();
+                    }else if(span==1){
+                        $("#emergencyProject").parent().parent().parent().show();
+                    }
+                });
+                form.on('switch(emergencyProject)',function(data){
+                    var flag=$(this).prop("checked")
+                    if (flag){
+                        //是紧急项目
+                        $("#emergencyProjectFlag").val("1");
+                    }else{
+                        //不是紧急项目
+                        $("#emergencyProjectFlag").val("0");
+                    }
+                })
             });
+            //默认打开判断是否时紧急项目
+            var submitMoney="${ruralProjectRecords.submitMoney}"
+            if(submitMoney==1){
+                $("#emergencyProject").parent().parent().parent().show();
+                var emergencyProject="${ruralProjectRecords.emergencyProject}"
+                if (emergencyProject=="1"){
+                    $("#emergencyProjectFlag").val("1");
+                    $("#emergencyProject").prop("checked",true);
+                    layui.form.render();
+                }else{
+                    $("#emergencyProjectFlag").val("0");
+                    $("#emergencyProject").prop("checked",false);
+                    layui.form.render();
+                }
+            }
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -772,6 +811,7 @@
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="flagFile" value="">
             <input type="hidden" id="createReportFlag" name="createReportFlag" value="${ruralProjectRecords.createReportFlag}">
+            <input type="hidden" id="emergencyProjectFlag" name="emergencyProject" value="${ruralProjectRecords.emergencyProject}">
 
             <input type="hidden" id="workClientLinkmanInfo" value="${ruralProjectRecords.workClientLinkmanList}">
             <div class="form-group layui-row first">
@@ -981,7 +1021,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目等级:</label>
                     <div class="layui-input-block">
                             <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
-                                <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                                <input type="radio" name="submitMoney" lay-filter="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                             </c:forEach>
 <%--                        <form:select path="submitMoney" lay-verify="judgment" class="form-control judgment simple-select">--%>
 <%--                            <form:option value=""/>--%>
@@ -1000,7 +1040,14 @@
                         </div>
                     </div>
                 </c:if>
-
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
+                    <label class="layui-form-label double-line">是否是紧急项目:</label>
+                    <div class="layui-input-block">
+                        <div style="margin-right: 30px;">
+                            <input type="checkbox" id="emergencyProject" lay-filter="emergencyProject" lay-skin="switch" lay-text="是|否">
+                        </div>
+                    </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">

+ 49 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -198,7 +198,46 @@
                     var flag=$(this).prop("checked")
                     $("#createReportFlag").val(flag);
                 })
+                //是否紧急项目判断项
+                layui.form.on('radio(submitMoney)', function(data){
+                    var span=data.value;
+                    if(span==2){
+                        $("#emergencyProject").parent().parent().parent().hide();
+                        //A级均为非紧急项目
+                        $("#emergencyProjectFlag").val("0");
+                        $("#emergencyProject").prop("checked",false);
+                        layui.form.render();
+                    }else if(span==1){
+                        $("#emergencyProject").parent().parent().parent().show();
+                    }
+                });
+                form.on('switch(emergencyProject)',function(data){
+                    var flag=$(this).prop("checked")
+                    if (flag){
+                        //是紧急项目
+                        $("#emergencyProjectFlag").val("1");
+                    }else{
+                        //不是紧急项目
+                        $("#emergencyProjectFlag").val("0");
+                    }
+                })
             });
+            //默认打开判断是否时紧急项目
+            var submitMoney="${ruralProjectRecords.submitMoney}"
+            if(submitMoney==1){
+                $("#emergencyProject").parent().parent().parent().show();
+                var emergencyProject="${ruralProjectRecords.emergencyProject}"
+                if (emergencyProject=="1"){
+                    $("#emergencyProjectFlag").val("1");
+                    $("#emergencyProject").prop("checked",true);
+                    layui.form.render();
+                }else{
+                    $("#emergencyProjectFlag").val("0");
+                    $("#emergencyProject").prop("checked",false);
+                    layui.form.render();
+                }
+            }
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -798,6 +837,7 @@
             <input type="hidden" id="workClientLinkmanInfo" value="${ruralProjectRecords.workClientLinkmanList}">
             <input type="hidden" id="flagFile" value="">
             <input type="hidden" id="createReportFlag" name="createReportFlag" value="${ruralProjectRecords.createReportFlag}">
+            <input type="hidden" id="emergencyProjectFlag" name="emergencyProject" value="${ruralProjectRecords.emergencyProject}">
 
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">
@@ -999,7 +1039,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目等级:</label>
                     <div class="layui-input-block">
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
-                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                            <input type="radio" name="submitMoney" id="submitMoney" lay-filter="submitMoney"  value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
 <%--                        <form:select path="submitMoney" class="form-control judgment simple-select">--%>
 <%--                            <form:option value=""/>--%>
@@ -1017,6 +1057,14 @@
                         </div>
                     </div>
                 </c:if>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
+                    <label class="layui-form-label double-line">是否是紧急项目:</label>
+                    <div class="layui-input-block">
+                        <div style="margin-right: 30px;">
+                            <input type="checkbox" id="emergencyProject" lay-filter="emergencyProject" lay-skin="switch" lay-text="是|否">
+                        </div>
+                    </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">

+ 23 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -4,8 +4,8 @@
 <head>
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
-	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
 	<script>
 		$(document).ready(function () {
 
@@ -50,6 +50,19 @@
 				var form = layui.form;
 				form.render();
 			});
+			//默认打开判断是否时紧急项目
+			var submitMoney="${projectRecords.submitMoney}"
+			if(submitMoney==1){
+				$("#emergencyProject").parent().parent().parent().show();
+				var emergencyProject="${projectRecords.emergencyProject}"
+				if (emergencyProject=="1"){
+					$("#emergencyProject").prop("checked",true);
+					layui.form.render();
+				}else{
+					$("#emergencyProject").prop("checked",false);
+					layui.form.render();
+				}
+			}
 		})
 
 	</script>
@@ -233,6 +246,14 @@
 						</form:select>--%>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7" style="display: none">
+					<label class="layui-form-label double-line">是否是紧急项目:</label>
+					<div class="layui-input-block">
+						<div style="margin-right: 30px;">
+							<input type="checkbox" id="emergencyProject" disabled lay-filter="emergencyProject" lay-skin="switch" lay-text="是|否">
+						</div>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">送审规模(万元):</label>
 					<div class="layui-input-block">