소스 검색

基本需求信息规则优化

yue 5 년 전
부모
커밋
98decd67db

+ 6 - 3
src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -306,9 +306,12 @@ public  class ProExcelInfo {
             if (null==project.getPowerScope()||"".equals(project.getPowerScope())){//停电范围
                 str+="停电范围不能为空;";
             }else {
-                flag = getJudge(project.getPowerScope(), PRO_POWERSCOPE);
-                if (flag){
-                    str+="停单范围填写有误;";
+                String[] split = project.getPowerScope().split(";");
+                for (int i = 0; i <split.length; i++) {
+                    flag = getJudge(split[i], PRO_POWERSCOPE);
+                    if (flag){
+                        str+="停单范围填写有误;";
+                    }
                 }
             }
             if (null==project.getProjectType()||"".equals(project.getProjectType())){//项目类型

+ 5 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -233,6 +233,11 @@ public class ProjectController extends BaseController {
 			j.setMsg("失败:"+judgeValue+"数据不符合规范!");
 			return j;
 		}
+		project.setStatus("0");
+		project.setPreConstruction(0);
+		project.setAcquisitionStatus("0");
+		project.setConstructionStatus("0");
+		project.setEarlyMaterial(0);
 		projectService.save(project);
 		j.setSuccess(true);
 		j.setMsg("保存成功");

+ 18 - 5
src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm.jsp

@@ -14,6 +14,8 @@
 	        $('#endDate').datetimepicker({
 				 format: "YYYY-MM-DD HH:mm:ss"
 		    });
+
+
 		});
 		function save() {
             var isValidate = jp.validateForm('#inputForm');//校验表单
@@ -35,6 +37,9 @@
 			}
 
         }
+		function noFue(val){
+			document.getElementById('constructionContractRate').value = val >= 0 ? val : 0;
+		}
 	</script>
 </head>
 <body class="bg-white">
@@ -137,12 +142,18 @@
 							<form:option value="配电工区"/>
 						</form:select>
 					</td>
-					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位角色:</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位储备专职 :</label></td>
 					<td class="width-35">
 						<form:input path="runUnitRole" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位运检专职:</label></td>
+					<td class="width-35">
+						<form:input path="runUnitInspectionRole"   htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>经研所角色:</label></td>
 					<td class="width-35">
 						<form:input path="throughResearchRole"   htmlEscape="false" class="form-control required"/>
@@ -155,7 +166,7 @@
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工合同率:</label></td>
 					<td class="width-35">
-						<form:input path="constructionContractRate"  htmlEscape="false" class="form-control required"/>
+						<form:input type="number" onblur="noFue(this.value)" path="constructionContractRate"  htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工分包单位:</label></td>
 					<td class="width-35">
@@ -262,14 +273,16 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围:</label></td>
 					<td class="width-35">
-						<form:select  path="powerScope" cssClass="form-control">
+						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>
+<%--						<form:checkboxes path="powerScope" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>--%>
+<%--						<form:select  path="powerScope" cssClass="form-control">
 							<form:option value="670"/>
 							<form:option value="67001+"/>
 							<form:option value="67002+"/>
 							<form:option value="67002-"/>
 							<form:option value="67003-"/>
-							<form:option value="68101-"/>
-						</form:select>
+								<form:option value="68101-"/>
+						</form:select>--%>
 					</td>
 				</tr>
 				<tr>

+ 2 - 8
src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm1.jsp

@@ -249,14 +249,8 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围:</label></td>
 					<td class="width-35">
-						<form:select  path="powerScope" cssClass="form-control">
-							<form:option value="670"/>
-							<form:option value="67001+"/>
-							<form:option value="67002+"/>
-							<form:option value="67002-"/>
-							<form:option value="67003-"/>
-							<form:option value="68101-"/>
-						</form:select>
+<%--						<form:checkboxes path="powerScope" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>--%>
+						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>