Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -588,10 +588,20 @@ public class OverheadLineController extends BaseController {
   @RequestMapping("/getft")
   public String getft(HttpServletRequest request,Model model){
     String id = request.getParameter("id");
+    WbsItem wbsItem = itemService.get(id);
+    String type = wbsItem.getType();
     List<JkxlDetailFee> list = overheadLineService.getAdjust(id);
+    if(type.equals("3")){
+      JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
+      jkxlDetailFee.setParentNode("-1");
+      jkxlDetailFee.setDescribe("变电站工程");
+      jkxlDetailFee.setWbsCode("20000000");
+      list.add(jkxlDetailFee);
+      model.addAttribute("list",list);
+      return "modules/sg/free/individualForm";
+    }
     model.addAttribute("list",list);
-//    return "modules/sg/free/alongst";
-    return "modules/sg/free/individualForm";
+    return "modules/sg/free/alongst";
   }
 
 

src/main/webapp/webpage/modules/sg/free/individualForm.jsp

@@ -83,50 +83,50 @@
                     {field:'fee',title:'分摊金额',edit: 'text'},
                 ]],
                 data: [
-                    <%--<c:if test="${ not empty list}">--%>
-                    <%--<c:forEach items="${list}" var="data" varStatus="index">--%>
-                    <%--{--%>
-                        <%--"id":"1",--%>
-                        <%--"wbsys": "${data.describe}",--%>
-                        <%--"wbsCode": "${data.wbsCode}",--%>
-                        <%--"bl":'',--%>
-                        <%--"fee":'',--%>
-                        <%--"pid": -1--%>
-                    <%--},--%>
-                    <%--</c:forEach>--%>
-                    <%--</c:if>--%>
+                    <c:if test="${ not empty list}">
+                    <c:forEach items="${list}" var="data" varStatus="index">
                     {
                         "id":"1",
-                        "wbsys": "12",
-                        "wbsCode": "32",
+                        "wbsys": "${data.describe}",
+                        "wbsCode": "${data.wbsCode}",
                         "bl":'',
                         "fee":'',
-                        "pid": -1
+                        "pid": "${data.parentNode}"
                     },
-                    {
-                        "id":"2",
-                        "wbsys": "121212131231",
-                        "wbsCode": "32",
-                        "bl":'',
-                        "fee":'',
-                        "pid": 1
-                    },
-                    {
-                        "id":"3",
-                        "wbsys": "12123123",
-                        "wbsCode": "32",
-                        "bl":'',
-                        "fee":'',
-                        "pid": -1
-                    },
-                    {
-                        "id":"4",
-                        "wbsys": "12123123",
-                        "wbsCode": "32",
-                        "bl":'',
-                        "fee":'',
-                        "pid": 3
-                    }
+                    </c:forEach>
+                    </c:if>
+                    // {
+                    //     "id":"1",
+                    //     "wbsys": "12",
+                    //     "wbsCode": "32",
+                    //     "bl":'',
+                    //     "fee":'',
+                    //     "pid": -1
+                    // },
+                    // {
+                    //     "id":"2",
+                    //     "wbsys": "121212131231",
+                    //     "wbsCode": "32",
+                    //     "bl":'',
+                    //     "fee":'',
+                    //     "pid": 1
+                    // },
+                    // {
+                    //     "id":"3",
+                    //     "wbsys": "12123123",
+                    //     "wbsCode": "32",
+                    //     "bl":'',
+                    //     "fee":'',
+                    //     "pid": -1
+                    // },
+                    // {
+                    //     "id":"4",
+                    //     "wbsys": "12123123",
+                    //     "wbsCode": "32",
+                    //     "bl":'',
+                    //     "fee":'',
+                    //     "pid": 3
+                    // }
                 ],
                 done: function (res, curr, count) {
                     layer.closeAll('loading');