Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -81,8 +81,8 @@ public class SettementUtil {
     public static final String RESON_FBRF2="《分布分项工程量清单计价表》,招标人采购汇总金额,<span style='font-weight: bold;'>xxx</span>,";
     //电缆
     public static final String RESON_DLFBRF1="《建筑分布分项工程量清单计价表》,发包人采购汇总金额,<span style='font-weight: bold;'>xxx</span>,";
-    public static final String RESON_DLFBRF2="《安装分布分项工程量清单计价表》,发包人采购汇总金”,<span style='font-weight: bold;'>xxx</span>,";
-    //变电站
+    public static final String RESON_DLFBRF2="《安装分布分项工程量清单计价表》,发包人采购汇总金额,<span style='font-weight: bold;'>xxx</span>,";
+    //变电
     public static final String BDZ_FBRF="《工程项目投标报价汇总表》,招标人采购材料费,<span style='font-weight: bold;'>xxx</span>,";
     public static final String BDZ_FBRF1="《建筑分布分项工程量清单计价表》,招标人采购金额,<span style='font-weight: bold;'>xxx</span>,";
     public static final String BDZ_FBRF2="《安装分布分项工程量清单计价表》,招标人采购金额,<span style='font-weight: bold;'>xxx</span>,";
@@ -111,7 +111,7 @@ public class SettementUtil {
     /*
        工程结算
     */
-    public static final String RESON_GCJS="《工程项目竣工结算汇总表》,“工程结算价”,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_GCJS="《工程项目竣工结算汇总表》,工程结算价,<span style='font-weight: bold;'>xxx</span>,";
     public static final String RESON_GCJS1="《工程项目竣工结算汇总表》,竣工结算家合计,<span style='font-weight: bold;'>xxx</span>,";
     public static final String RESON_GCJS2="《工程项目竣工结算汇总表》,补增值税税率调整差额,<span style='font-weight: bold;'>xxx</span>,";
     public static final String RESON_GCJS3="《工程项目竣工结算汇总表》,扣减甲供材超供材料费,<span style='font-weight: bold;'>xxx</span>,";

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

@@ -307,7 +307,13 @@ table.on('tool(settle)', function(obj){
             type: 1,
             title:data.setname,
             // skin: 'layui-layer-rim',
-            area: ['80%', '90%'],
+            area: ['70%', '90%'],
+            offset:['7%','14%'],
+            shade: 0.8,
+            shadeClose: true,
+            fixed: true, //不固定
+            maxmin: true,
+            btn:['关闭'],
             // content: "<div style='padding: 16px'>"+data.reason+"</div>"
             content: div_table(data)
         });

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

@@ -75,8 +75,8 @@
         <input hidden="hidden" name="" id="fyje1" value=""/>
         <table class="layui-hide" id="xmmc" lay-filter="freestr"></table>
     </div>
-    <div class="layui-form" style="display: none;padding: 12px" id="mydiv">
-        <table class="layui-table">
+    <div class="layui-form" style="display: none;padding: 10px" id="mydiv">
+        <table class="layui-table" id="show">
             <colgroup>
                 <col width="150">
                 <col width="150">
@@ -126,6 +126,7 @@
         var name = data.setname;
         var arr  = data.reason.split(',');
         var count = 0;
+        var tr="";
         for (var i = 0; i < arr.length;i+=3) {
             if(name=="分部分项工程费"){
                 $("#hide").show();
@@ -138,15 +139,14 @@
                     if(arr[i].indexOf("范围内")!=-1) {
                         $("#myspan1").html(arr[i]);
                     }else{
-                        var tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
+                         tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
                         $("#mytbody1").append(tr);
                     }
                 }else {
                     if(arr[i].indexOf("范围内")!=-1) {
                         $("#myspan2").html(arr[i]);
-                        // $("#myspan1").html(count);
                     }else{
-                        var tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
+                         tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
                         $("#mytbody2").append(tr);
                     }
                 }
@@ -155,19 +155,19 @@
                 $("#myspan2").hide();
                 if(arr[i].indexOf("范围内")!=-1) {
                     $("#myspan1").html(arr[i]);
-                    // $("#myspan1").html(count);
                 }else{
-                    var tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
+                    tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
                     $("#mytbody1").append(tr);
                 }
             }
-            // if(arr[i].indexOf("范围内")!=-1) {
-            //     $("#myspan1").html(arr[i]);
-            //     // $("#myspan1").html(count);
-            // }else{
-            //     var tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
-            //     $("#mytbody1").append(tr);
-            // }
+        }
+        $("table#show tbody tr:first").css("background","#f9f9f9");
+        $("table#hide tbody tr:first").css("background","#f9f9f9");
+        if($("table#show tbody tr:last td:nth-child(2)").text()== "小计"){
+            $("table#show tbody tr:last").css("background","#f9f9f9");
+        }
+        if($("table#hide tbody tr:last td:nth-child(2)").text()=="小计"){
+            $("table#hide tbody tr:last").css("background","#f9f9f9");
         }
         return $("#mydiv");
     }