Merge remote-tracking branch 'origin/master'

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

@@ -95,7 +95,37 @@
                     {field:'cbrcg2', width:100,align:'center',title:'承包人采购'},
                     {field:'fbrcg2', width:100,align:'center',title:'发包人采购'},
 
-                ]],
+                ]]
+                ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="data" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "id": 2,
+                    "wbsys":"WBS要素2",
+                    "wbssbm": "WBS识别码",
+                    "hjje": "合计金额",
+                    "rgf": "人工费1",
+                    "cbrcg": "承包人采购",
+                    "fbrcg": "发包人采购",
+                    "jxf1": "机械费1",
+                    "rgf2": "人工费2",
+                    "cbrcg2": "承包人采购2",
+                    "fbrcg2":"承包人采购2",
+                    "jxf2": "机械费2",
+                    "csf_1": "措施费-1",
+                    "csf_2": "措施费-2",
+                    "csf2": "措施费2",
+                    "qtf":"其他费",
+                    "gf":"规费",
+                    "sf":"税金",
+                    "hj": "合计",
+                    "pid": -1
+
+                }
+                </c:forEach>
+                </c:if>
+            ],
                 done: function () {
                     layer.closeAll('loading');
                 }
@@ -135,7 +165,22 @@
                     {field: 'wbssbm', title: 'WBS识别码'},
                     {field: 'money', title: '金额'},
 //                  {field: 'pid', title: 'pid'},
-                ]],
+                ]]
+                ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="data" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "d_id": 1,
+                    "wbsys": "wbs要素",
+                    "wbssbm": "wbs识别码",
+                    "money": "888888",
+                    "d_pid": -1
+
+                }
+                </c:forEach>
+                </c:if>
+            ],
                 done: function () {
                     layer.closeAll('loading');
                 }