项目登记(项目名称长度限制；送审规模改成单选)

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1395,14 +1395,6 @@ public class WorkProjectNotifyController extends BaseController {
 									break;
 								}
 							}
-							//处理送审金额
-							List<MainDictDetail> mainDict = DictUtils.getMainDictList("attachment_project_approval_money");
-							for (MainDictDetail info: mainDict) {
-								if(ruralProjectRecords.getSubmitMoney().equals(info.getValue())){
-									ruralProjectRecords.setSubmitMoney(info.getLabel());
-									break;
-								}
-							}
 							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							//查询工程类型信息

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

@@ -51,6 +51,7 @@
                 //     top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
                 //     return;
                 // }
+
                 if($("#workClientLinkmanList tr").length==0){
                     top.layer.msg("请选择委托方联系人！", {icon: 5});
                     return;
@@ -65,7 +66,6 @@
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectRecords/tstore");
                 }else{
-
                     var flag = $("#flagFile").val();
                     if(flag == 'false'){
                         top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
@@ -75,13 +75,17 @@
                     if (!flags){
                         return flags;
                     }
+                    var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
+                    if (null == submitMoney){
+                        parent.layer.msg("送审规模未填写!", {icon: 5});
+                        return false;
+                    }
                 }
                 $("#inputForm").submit();
                 return true;
             }else{
                 parent.layer.msg("信息未填写完整!", {icon: 5});
             }
-
             return false;
         }
         $(document).ready(function() {
@@ -811,7 +815,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" htmlEscape="false" placeholder="请输入项目名称" class="form-control layui-input required"/>
+                        <form:input path="projectName" id="projectName" maxlength="255" htmlEscape="false" placeholder="请输入项目名称" class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -928,10 +932,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
-                        <form:select path="submitMoney" lay-verify="judgment" class="form-control judgment simple-select">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+                            <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" 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>>
+                            </c:forEach>
+<%--                        <form:select path="submitMoney" lay-verify="judgment" class="form-control judgment simple-select">--%>
+<%--                            <form:option value=""/>--%>
+<%--                            <form:options items="" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                        </form:select>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -281,13 +281,16 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
 					<div class="layui-input-block">
+						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+						</c:forEach>
 <%--						<form:select path="submitMoney" disabled="true" class="form-control required simple-select">--%>
 <%--							<form:option value=""/>--%>
 <%--							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
 <%--						</form:select>--%>
-						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="${projectRecords.submitMoney}"/>
+<%--						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="${projectRecords.submitMoney}"/>--%>
 
 					</div>
 				</div>

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

@@ -87,6 +87,11 @@
                     if (!flags){
                         return flags;
                     }
+                    var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
+                    if (null == submitMoney){
+                        parent.layer.msg("送审规模未填写!", {icon: 5});
+                        return false;
+                    }
                 }
                 $("#inputForm").submit();
                 return true;
@@ -830,7 +835,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" maxlength="255" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -946,10 +951,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
-                        <form:select path="submitMoney" class="form-control judgment simple-select">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" 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>>
+                        </c:forEach>
+<%--                        <form:select path="submitMoney" class="form-control judgment simple-select">--%>
+<%--                            <form:option value=""/>--%>
+<%--                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                        </form:select>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -815,7 +815,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称</label>
                     <div class="layui-input-block">
-                        <form:input placeholder="请输入项目名称" path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input placeholder="请输入项目名称" maxlength="255" path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -930,12 +930,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
-                        <form:select path="submitMoney" class="form-control required simple-select">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+                        </c:forEach>
+<%--                        <form:select path="submitMoney" class="form-control required simple-select">--%>
+<%--                            <form:option value=""/>--%>
+<%--                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                        </form:select>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -223,8 +223,11 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程类型：</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.engineeringType==''}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="engineeringType" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach items="${engineeringInfo}" varStatus="index" var="info">
-							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
+							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
 						</c:forEach>
 					</div>
 				</div>