项项目登记(工程类型，增加“其他”节点；默认收起)

src/main/java/com/jeeplus/modules/projectEngineering/entity/EngineeringTree.java

@@ -12,6 +12,9 @@ public class EngineeringTree {
     private String type; //是否有子集
     private List<EngineeringTree> child;
 
+    private boolean isSpreadItem; //是否默认隐藏
+
+
     public String getTitle() {
         return title;
     }
@@ -43,4 +46,12 @@ public class EngineeringTree {
     public void setChild(List<EngineeringTree> child) {
         this.child = child;
     }
+
+    public boolean getIsSpreadItem() {
+        return isSpreadItem;
+    }
+
+    public void setIsSpreadItem(boolean spreadItem) {
+        isSpreadItem = spreadItem;
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -1104,6 +1104,7 @@ public class RuralProjectRecordsController extends BaseController {
 					ProjectEngineeringInfo child = sourcelist.get(j);
 					if (child.getParent()!=null && StringUtils.isNotBlank(child.getParent().getId()) && child.getParent().getId().equals(e.getId())){
 						tree.setType("group");
+						tree.setIsSpreadItem(false);
 						LinkedHashSet<EngineeringTree> childs=new LinkedHashSet<>();
 						childs(sourcelist,childs, e.getId());
 						List<EngineeringTree> childss=new ArrayList<>(childs);

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

@@ -935,7 +935,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程类型：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>工程类型：</label>
                     <div class="layui-input-block">
 <%--                        <select name="engineeringType">--%>
 <%--                            <option value=""></option>--%>
@@ -945,7 +945,7 @@
 <%--                        </select>--%>
                         <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
                             <span>${engineeringInfo.engineeringName}</span>
-                            <input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.engineeringName}"/>
+                            <input type="hidden" name="engineeringType" id="engineeringType" class="judgment" value="${engineeringInfo.engineeringName}"/>
                             <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
                         </button>
                     </div>

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

@@ -944,7 +944,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程类型：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>工程类型：</label>
                     <div class="layui-input-block">
 <%--                        <select name="engineeringType">--%>
 <%--                            <option value=""></option>--%>
@@ -954,7 +954,7 @@
 <%--                        </select>--%>
                         <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
                             <span>${engInfo.engineeringName}</span>
-                            <input type="hidden" name="engineeringType" id="engineeringType" value="${engInfo.id}"/>
+                            <input type="hidden" name="engineeringType" class="required" id="engineeringType" value="${engInfo.id}"/>
                             <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
                         </button>
                     </div>

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

@@ -172,7 +172,6 @@
                     url : "${ctx}/ruralProject/ruralProjectRecords/engineeringTreeMenu",
                     //请求成功
                     success : function(result) {
-                        var s='{"title": "menu item 4","id": "4"}'
                         var str=jQuery.parseJSON(result);
                         //工程类型树形菜单
                         layui.dropdown.render({
@@ -955,7 +954,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程类型：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>工程类型：</label>
                     <div class="layui-input-block">
 <%--                        <select name="engineeringType">--%>
 <%--                            <option value=""></option>--%>
@@ -965,7 +964,7 @@
 <%--                        </select>--%>
                         <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
                             <span>${engineeringInfo.engineeringName}</span>
-                            <input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.id}"/>
+                            <input type="hidden" name="engineeringType" id="engineeringType" class="judgment" value="${engineeringInfo.id}"/>
                             <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
                         </button>
                     </div>

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

@@ -936,7 +936,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程类型：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>工程类型：</label>
                     <div class="layui-input-block">
 <%--                        <select name="engineeringType">--%>
 <%--                            <option value=""></option>--%>
@@ -946,7 +946,7 @@
 <%--                        </select>--%>
                         <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
                             <span>${engInfo.engineeringName}</span>
-                            <input type="hidden" name="engineeringType" id="engineeringType" value="${engInfo.id}"/>
+                            <input type="hidden" name="engineeringType" class="required" id="engineeringType" value="${engInfo.id}"/>
                             <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
                         </button>
                     </div>