1111

src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -73,7 +73,7 @@ public class JkxlController extends BaseController {
     List<JkxlData> list = jkxlService.getList(id);
     List<JkxlData> list1 = new ArrayList<>();
     for(JkxlData jkxlData: list){
-      if( StringUtils.isNoneBlank(String.valueOf(jkxlData.getOriginalTotalCost()))){
+      if(jkxlData.getOriginalTotalCost() != null){
           list1.add(jkxlData);
       }
     }

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

@@ -12,6 +12,7 @@
     <title>wbs</title>
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
+    <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
 </head>
 <style>
     .btn_out{
@@ -71,7 +72,9 @@
                 <td id=""><c:if test="${data.type eq '1'}">补增值税税率调整差额</c:if><c:if test="${data.type eq '2'}">扣减甲供材超供材料费</c:if></td>
                 <td>${data.fee}</td>
                 <td>
-                    <input type="button" class="layui-btn layui-btn-primary layui-btn-xs" value="调整" onclick="wbsup(${data.type});"/>
+                 <c:forEach items="${map.list1}" var="data2" varStatus="index">
+                    <input type="button" class="layui-btn layui-btn-primary layui-btn-xs" value="调整" onclick="wbsup(${data2.id});"/>
+                 </c:forEach>
                 </td>
             </tr>
                 </c:forEach>
@@ -295,19 +298,26 @@
 </script>
 <script>
     function wbsup(id){
-        $.ajax({
-            type : "post",
-            url : "#",
-            data:id,
-            success : function(result) {
+        $.post(
+            // type : "post",
+            "${ctx}/jkxl/gettz",
+            {"id":id},
+            function(result) {
                 var trlue="";
-                for(var i=0;i<=result.length;i++){
-                    trlue = trlue + "<tr><td>"+result.xxx+"</td><td>"+result.xxx+"</td><td>"+result.xxx+"</td><td>"+result.xxx+"</td></tr>";
-                }
-                trlue=trlue+"<tr><td>合计</td><td></td><td>100%</td><td>"+result.xxx+"</td></tr>";
+                // if(type === '1') {
+                    for (var i = 0; i <= result.length; i++) {
+                        trlue = trlue + "<tr><td>" + result.describe + "</td><td>" + result.wbsCode + "</td><td>" + result.originalRate + "</td><td>" + result.bzFee + "</td></tr>";
+                    }
+                // } else {
+                //     for (var i = 0; i <= result.length; i++) {
+                //         trlue = trlue + "<tr><td>" + result.describe + "</td><td>" + result.wbsCode + "</td><td>" + result.originalRate + "</td><td>" + result.jkFee + "</td></tr>";
+                //     }
+                // }
+
+                trlue=trlue+"<tr><td>合计</td><td></td><td>100%</td><td></td></tr>";
                 $("#mytbody").html(trlue);
             }
-        });
+        );
 //		var trlue="";
 //		for(var i=0;i<=3;i++){
 //			trlue = trlue + "<tr><td>基础工程</td><td>xxx</td><td>20%</td><td>20</td></tr>";
@@ -316,7 +326,7 @@
 //		$("#mytbody").html(trlue);
         layer.open({
             type:1,
-            area:['600px','512px'],
+            area:['600px','400px'],
             title:['调整','color:#fff;background-color:#999999;'],
             shadeClose:false,
             content: $('#motaikuang'),
@@ -342,15 +352,15 @@
         }
         // alert(jsonData);
 
-        $.ajax({
-            type : "post",
-            url : "#",
-            contentType : "application/json;charset=UTF-8",
-            data:JSON.stringify(jsonData),
-            success : function(result) {
-                window.location.reload();
-            }
-        });
+        // $.ajax({
+        //     type : "post",
+        //     url : "#",
+        //     contentType : "application/json;charset=UTF-8",
+        //     data:JSON.stringify(jsonData),
+        //     success : function(result) {
+        //         window.location.reload();
+        //     }
+        // });
     }
 </script>
 </html>