1111

src/main/java/com/jeeplus/modules/sg/entity/JkxlData.java

@@ -19,6 +19,7 @@ public class JkxlData {
     private Double jxCost;
     private Double measuresFee1;
     private Double measuresFee2;
+    private Double measuresFee3;
     private Double otherCost;
     private Double fees;
     private Double tax;
@@ -31,6 +32,15 @@ public class JkxlData {
     private String mountMatter;
     private String mountServer;
 
+
+    public Double getMeasuresFee3() {
+        return measuresFee3;
+    }
+
+    public void setMeasuresFee3(Double measuresFee3) {
+        this.measuresFee3 = measuresFee3;
+    }
+
     @ExcelField(title="挂接物料", align=2, sort=6)
     public String getMountMatter() {
         return mountMatter;

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

@@ -58,7 +58,7 @@
                 treeDefaultClose: false,
                 treeLinkage: false,
                 elem: '#table1',
-                url: '${ctxp}/webpage/modules/sys/free/selfwbs.json',
+                <%--url: '${ctxp}/webpage/modules/sys/free/selfwbs.json',--%>
                 page: false,
                 cols: [[
                     {type: 'numbers',align:'center',width:50, rowspan:'3'},
@@ -97,30 +97,29 @@
 
                 ]]
                 ,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>
+                <c:if test="${ not empty list}">
+                <c:forEach items="${list}" var="data" varStatus="index">
                 {
-                    "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
+                    "id": ${data.wbsCode},
+                    "wbsys":"${data.describe}",
+                    "wbssbm": "${data.wbsCode}",
+                    "hjje": "${data.originalTotalCost}",
+                    "rgf": "${data.originalRgCost}",
+                    "cbrcg": "${data.originalCbrCost}",
+                    "fbrcg": "${data.originalFbrCost}",
+                    "jxf1": "${data.originalJxCost}",
+                    "rgf2": "${data.rgCost}",
+                    "cbrcg2": "${data.cbrCost}",
+                    "fbrcg2":"${data.fbrCost}",
+                    "jxf2": "${data.jxCost}",
+                    "csf_1": "${data.measuresFee1}",
+                    "csf_2": "${data.measuresFee2}",
+                    "csf2": "${data.measuresFee3}",
+                    "qtf":"${data.otherCost}",
+                    "gf":"${data.fees}",
+                    "sf":"${data.tax}",
+                    "hj": "${data.totalFee}",
+                    "pid": ${data.parentNode}
 
                 }
                 </c:forEach>
@@ -156,7 +155,7 @@
                 treeIdName: 'd_id',
                 treePidName: 'd_pid',
                 elem: '#table2',
-                url: '${ctxp}/webpage/modules/sys/free/other.json',
+                <%--url: '${ctxp}/webpage/modules/sys/free/other.json',--%>
                 page: false,
                 cols: [[
                     {type: 'numbers'},
@@ -165,22 +164,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
+                ]],
+                <%--,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>
-            ],
+                <%--}--%>
+                <%--</c:forEach>--%>
+                <%--</c:if>--%>
+            <%--],--%>
                 done: function () {
                     layer.closeAll('loading');
                 }