蔡德晨 5 年 前
コミット
7081d0ff71

+ 4 - 0
src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -26,6 +26,8 @@ public class OverheadLineService {
     private FeeAdjustService feeAdjustService;
     @Autowired
     private RuleRatioService ruleRatioService;
+    @Autowired
+    private SettlementService settlementService;
 
 
 
@@ -97,6 +99,8 @@ public class OverheadLineService {
        ImportExcel qt = new ImportExcel(file,1,BashInfo.SHEET_QTFY);  //其他项目清单计价表
        ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );  //工程项目竣工结算汇总表
        ImportExcel gzhz = new ImportExcel(file,1,BashInfo.SHEET_GCHZ );   //架空线路工程费用汇总表
+       //数据核验并保存数据库
+       settlementService.save(file,id);
        //获取补增值税税率调整差额和扣减甲供材超供材料费
        double[] wsbFees = ExcelUtil.getDoubleArray(total, new String[]{BashInfo.BZZSSL,BashInfo.KJJGCC},1,2);
        double[] originalTotalFees = ExcelUtil.getDoubleArray(gzhz,BashInfo.HZ_ALL,1,2); //获取合计费

+ 29 - 0
src/main/java/com/jeeplus/modules/sg/overheadline/util/BashInfo.java

@@ -10,18 +10,21 @@ public class BashInfo {
     public static final String SHEET_QTFY = "其他项目清单计价表";
     public static final String SHEET_GFQD = "规费项目清单计价表";
     public static final String SHEET_GCHZ = "架空线路工程费用汇总表";
+
     public static final String JCGC = "1 基础工程";
     public static final String GTGC = "2 杆塔工程";
     public static final String JDGC = "3 接地工程";
     public static final String JXGC = "4 架线工程";
     public static final String FJAZGC = "5 附件安装工程";
     public static final String FZGC = "6 辅助工程";
+
     public static final String RATIO_RGTC = "人工调差系数";
     public static final String RATIO_CLTC = "材料调差系数";
     public static final String RATIO_JXTC = "机械调差系数";
     public static final String RATIO_CCRGTC = "拆除人工调差系数";
     public static final String RATIO_CCCLTC = "拆除材料调差系数";
     public static final String RATIO_CCJXTC = "拆除机械调差系数";
+
     public static final String CS_LS = "临时设施费";
     public static final String CS_AQWM = "安全文明施工费";
     public static final String GF_WXZY = "危险作业意外伤害保险费";
@@ -33,12 +36,14 @@ public class BashInfo {
     public static final String GCJS = "工程结算价";
     public static final String TBJG = "竣工结算价合计";
     public static final String TBJG1 = "投标报价";
+
     public static final String HZ_JCGC = "基础工程";
     public static final String HZ_GTGC = "杆塔工程";
     public static final String HZ_JDGC = "接地工程";
     public static final String HZ_JXGC = "架线工程";
     public static final String HZ_FJAZGC = "附件安装工程";
     public static final String HZ_FZ = "辅助工程";
+
     public static final String TZ_RGF = "人工费";
     public static final String TZ_CBRCG = "承包分采购";
     public static final String TZ_FBRCG = "发包人采购";
@@ -50,6 +55,30 @@ public class BashInfo {
     public static final String TZ_GF = "规费";
     public static final String TZ_SF = "税费";
 
+    public static final String JS_FBFX="分部分项工程费";
+    public static final String JS_CBRF="承包人采购设备费";
+    public static final String JS_CSXM="措施项目费";
+    public static final String JS_QTXM="其他项目费";
+    public static final String JS_GF="规费";
+    public static final String JS_SJ="税金 (税率: 9%)";
+    public static final String JS_FBRF="发包人采购材料费";
+    public static final String JS_JGJS="竣工结算价合计";
+    public static final String JS_BZZS="补增值税税率调整差额";
+    public static final String JS_KJJG="扣减甲供材超供材料费";
+    public static final String JS_GCJS="工程结算价";
+
+    public static final String RESON_FBFX="分部分项工程费";
+    public static final String RESON_CBRF="承包人采购设备费";
+    public static final String RESON_CSXM="措施项目费";
+    public static final String RESON_QTXM="其他项目费";
+    public static final String RESON_GF="规费";
+    public static final String RESON_SJ="税金 (税率: 9%)";
+    public static final String RESON_FBRF="发包人采购材料费";
+    public static final String RESON_JGJS="竣工结算价合计";
+    public static final String RESON_BZZS="补增值税税率调整差额";
+    public static final String RESON_KJJG="扣减甲供材超供材料费";
+    public static final String RESON_GCJS="工程结算价";
+
 
 
     //主体模块WBSID

+ 6 - 0
src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -10,6 +10,7 @@ import com.jeeplus.modules.sg.overheadline.entity.*;
 import com.jeeplus.modules.sg.overheadline.service.FeeAdjustService;
 import com.jeeplus.modules.sg.overheadline.service.OverheadLineService;
 import com.jeeplus.modules.sg.overheadline.service.RuleRatioService;
+import com.jeeplus.modules.sg.overheadline.service.SettlementService;
 import com.jeeplus.modules.sg.overheadline.util.BashInfo;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,8 @@ public class OverheadLineController extends BaseController {
   private OverheadLineService overheadLineService;
   @Autowired
   private FeeAdjustService feeAdjustService;
+  @Autowired
+  private SettlementService settlementService;
 
 
   /**
@@ -84,10 +87,13 @@ public class OverheadLineController extends BaseController {
     list.addAll(getTotal(list));
     //查询未识别数据
     List<JkxlAdjustFee> list2 = feeAdjustService.getTzFee(jkxlAdjustFee);
+    //数据校验展示
+    List<Settlement> list3 = settlementService.selectSettlementService(id);
     HashMap map = new HashMap();
     map.put("list1",list1);
     map.put("list",list);
     map.put("list2",list2);
+    map.put("list3",list3);
     model.addAttribute("map",map);
     return "modules/sg/free/wbslist";
   }

+ 0 - 133
src/main/webapp/webpage/modules/sg/free/other.json

@@ -1,133 +0,0 @@
-{
-  "code": 0,
-  "msg": "ok",
-  "data": [
-    {
-      "d_id": 1,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": -1
-    },
-    {
-      "d_id": 2,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 1
-    },
-    {
-      "d_id": 3,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 1
-    },
-    {
-      "d_id": 4,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 1
-    },
-    {
-      "d_id": 5,
-     "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": -1
-    },
-    {
-      "d_id": 6,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 5
-    },
-    {
-      "d_id": 7,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 5
-    },
-    {
-      "d_id": 8,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 6
-    },
-    {
-      "d_id": 9,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 6
-    },
-    {
-      "d_id": 10,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 9
-    },
-    {
-      "d_id": 11,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 9
-    },
-    {
-      "d_id": 12,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 10
-    },
-    {
-      "d_id": 13,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 10
-    },
-    {
-      "d_id": 14,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 10
-    },
-    {
-      "d_id": 15,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 13
-    },
-    {
-      "d_id": 16,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 13
-    },
-    {
-      "d_id": 17,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 16
-    },
-    {
-      "d_id": 18,
-      "wbsys": "wbs要素",
-      "wbssbm": "wbs识别码",
-      "money": "888888",
-      "d_pid": 16
-    }
-  ],
-  "count": 18
-}

+ 0 - 249
src/main/webapp/webpage/modules/sg/free/selfwbs.json

@@ -1,249 +0,0 @@
-{
-  "code": 0,
-  "msg": "ok",
-  "data": [
-    {
-      "id": 1,
-      "wbsys":"WBS要素1",
-      "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": 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": 3,
-     "wbsys":"WBS要素3",
-      "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": 4,
-     "wbsys":"WBS要素4",
-      "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": 5,
-      "wbsys":"WBS要素5",
-      "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": 6,
-       "wbsys":"WBS要素6",
-      "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": 5
-    },
-    {
-      "id": 7,
-      "wbsys":"WBS要素7",
-      "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": 5
-    },
-    {
-      "id": 8,
-      "wbsys":"WBS要素8",
-      "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": 6
-    },
-    {
-      "id": 9,
-       "wbsys":"WBS要素9",
-      "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": 6
-    },
-    {
-      "id": 10,
-      "wbsys":"WBS要素10",
-      "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": 9
-    },
-    {
-      "id": 11,
-      "wbsys":"WBS要素11",
-      "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": 9
-    }
-  ],
-  "count": 11
-}

+ 0 - 354
src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -1,354 +0,0 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: user
-  Date: 2019/8/7
-  Time: 18:39
-  To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ include file="/webpage/include/taglib.jsp"%>
-<html>
-<head>
-    <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{
-        width: 100px;
-        margin: 0;
-        float: right;
-        margin-right:2%;
-    }
-    .div_main_form{
-        width: 50%;
-        margin-left: 10px;
-    }
-    .layui-icon-layer{
-        display: none;
-    }
-    .layui-icon-file{
-        display: none;
-    }
-
-     .layui-table-view .layui-table {width:100%}
-</style>
-<body style="background-color: white ;height: 100%">
-    <sys:message content="${message}"/>
-    <!-----------本体部分--------->
-    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
-        <legend>本体部分</legend>
-    </fieldset>
-    <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
-        <%--<button type="button" class="layui-btn layui-btn-fluid btn_out" onclick="export()">导出</button>--%>
-       <c:forEach items="${map.list1}" var="data1" varStatus="index">
-         <a class="layui-btn" href="${ctx}/jkxl/export?id=${data1.id}">导出</a>
-       </c:forEach>
-            <%--<table:importExcel url="${ctx}/propertycostreminder/propertyCostReminder/import"></table:importExcel>--%>
-        <table id="table1" class="layui-table" lay-filter="table1"></table>
-    </div>
-    <!-----------其他部分--------->
-    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
-        <legend>其他部分</legend>
-    </fieldset>
-    <div class="" style="margin-left: 10px;margin-right: 10px;">
-        <table id="table2" class="layui-table" lay-filter="table2"></table>
-    </div>
-    <!-----------未识别部分--------->
-    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
-        <legend>未识别部分</legend>
-    </fieldset>
-    <div class="" style="margin-left: 10px;width:70%;margin-right: 10px;">
-        <input hidden="hidden" name="" id="newid" value=""/>
-        <input hidden="hidden" name="" id="xmmc1" value=""/>
-        <input hidden="hidden" name="" id="fyje1" value=""/>
-        <table class="layui-hide" id="xmmc" lay-filter="freestr"></table>
-    </div>
-    <div style="width: 100%;height: 100px"></div>
-    <script type="text/html" id="barDemo">
-        <a class="layui-btn  layui-btn-xs" lay-event="fttz">分摊调整</a>
-        <a class="layui-btn layui-btn-xs" lay-event="ddtz">单独调整</a>
-        <!--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>-->
-    </script>
-</body>
-<script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
-<script>
-    layui.config({
-        base: '${ctxp}/static/plugin/assets/'
-    }).extend({
-        treetable: 'treetable-lay/treetable'
-    }).use(['layer', 'table', 'treetable'], function () {
-        var $ = layui.jquery;
-        var table = layui.table;
-        var layer = layui.layer;
-        var treetable = layui.treetable;
-
-        var renderTable1 = function () {
-            layer.load(2);
-            treetable.render({
-                treeColIndex: 1,
-                treeSpid: -1,
-                treeIdName: 'id',
-                treePidName: 'pid',
-                treeDefaultClose: false,
-                treeLinkage: false,
-                elem: '#table1',
-                <%--url: '${ctxp}/webpage/modules/sys/free/selfwbs.json',--%>
-                page: false,
-                cols: [[
-                    {type:'numbers',title: '序号', rowspan: 2, totalRowText: "合计",},
-                    {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
-
-                    {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码",rowspan:'2'},
-                    {field:'fbfxysj', align:'center', title: '分部分项(原数据)',colspan:'6'},
-                    {field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
-                    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'11'},
-
-                    {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
-//                  {templet: '#oper-col', title: 'oper'}
-                ],[
-                    {field:'hjje', width:120,align:'center',title:'合计金额',totalRow: true},
-                    {field:'zjgcf', width:120,align:'center',title:'直接工程费',totalRow: true},
-                    {field:'rgf1', width:120,align:'center',title:'人工费',totalRow: true},
-                    {field:'cbrcg1', width:120,align:'center',title:'承包人采购',totalRow: true},
-                    {field:'fbrcg1', width:120,align:'center',title:'发包人采购',totalRow: true},
-                    {field:'jxf1', width:120,align:'center',title:'机械费',totalRow: true},
-
-                    {field:'rgf2', width:120,align:'center',title:'人工费',totalRow: true},
-                    {field:'cbrcg2', width:120,align:'center',title:'承包人采购',totalRow: true},
-                    {field:'fbrcg2', width:120,align:'center',title:'发包人采购',totalRow: true},
-                    {field:'jxf2', width:120,align:'center',title:'机械费',totalRow: true},
-
-                    {field:'rgf3', width:120,align:'center',title:'人工费',totalRow: true},
-                    {field:'cbrcg3', width:120,align:'center',title:'承包人采购',totalRow: true},
-                    {field:'fbrcg3', width:120,align:'center',title:'发包人采购',totalRow: true},
-                    {field:'jxf3', width:120,align:'center',title:'机械费',totalRow: true},
-
-                    {field:'csf_1',width:120,title:'措施费-1',align:'center',totalRow: true},
-                    {field:'csf_2',width:120,title:'措施费-2',align:'center',totalRow: true},
-                    {field:'csf2',align:'center',width:120,title:'措施费二',totalRow: true},
-                    {field:'qtf',align:'center',width:120,title:'其他费',totalRow: true},
-                    {field:'gf',align:'center',width:120,title:'规费',totalRow: true},
-                    {field:'sf',align:'center',width:120,title:'税金',totalRow: true},
-                    {field:'gxfy',align:'center',width:120,title: '共性费用',rowspan:'2',totalRow: true},
-                ]]
-                ,data: [
-                <c:if test="${ not empty map.list}">
-                <c:forEach items="${map.list}" var="data" varStatus="index">
-                    <c:if test="${data.feeType eq '1'}">
-                {
-                    "id": "${data.wbsCode}",
-                    "wbsys":"${data.describe}",
-                    "wbssbm": "${data.wbsCode}",
-
-                    "hjje": "${data.originalTotalCost}",
-                    "zjgcf":"${data.zjgcFee}",
-                    "rgf1": "${data.originalRgCost}",
-                    "cbrcg1": "${data.originalCbrCost}",
-                    "fbrcg1": "${data.originalFbrCost}",
-                    "jxf1": "${data.originalJxCost}",
-
-                    "rgf2": "${data.jxCost}",
-                    "cbrcg2": "${data.cbrCost}",
-                    "fbrcg2":"${data.fbrCost}",
-                    "jxf2": "${data.jxCost}",
-
-                    "rgf3": "<c:if test="${ empty data.rgFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.rgFtFee}">${data.rgFtFee}</c:if> ",
-                    "cbrcg3": "<c:if test="${ empty data.cbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.cbrFtFee}">${data.cbrFtFee}</c:if>",
-                    "fbrcg3": "<c:if test="${ empty data.fbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.fbrFtFee}">${data.fbrFtFee}</c:if>",
-                    "jxf3": "<c:if test="${ empty data.jxFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.jxFtFee}">${data.jxFtFee}</c:if>",
-
-                    "csf_1": "${data.measuresFee1}",
-                    "csf_2": "${data.measuresFee2}",
-                    "csf2": "<c:if test="${ empty data.measuresFee3 and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.measuresFee3}">${data.measuresFee3}</c:if>",
-                    "qtf":"${data.otherCost}",
-                    "gf":"${data.fees}",
-                    "sf":"${data.tex}",
-                    "hj": "${data.totalFee}",
-                    "gxfy": "${data.gxFee}",
-                    "pid": "${data.parentNode}"
-                },
-                    </c:if>
-                </c:forEach>
-                </c:if>
-            ],
-                done: function () {
-                    layer.closeAll('loading');
-                }
-            });
-        };
-
-        renderTable1();
-    });
-</script>
-<script>
-    layui.use(['table', 'form', 'element', 'treetable'], function () {
-        var $ = layui.jquery;
-        var table = layui.table;
-        var form = layui.form;
-        var element = layui.element;
-        var treetable = layui.treetable;
-
-        // 渲染表格
-        var renderTable2 = function () {
-            layer.load(2);
-            treetable.render({
-                treeColIndex: 1,
-                treeSpid: -1,
-                treeIdName: 'd_id',
-                treePidName: 'd_pid',
-                elem: '#table2',
-                <%--url: '${ctxp}/webpage/modules/sys/free/other.json',--%>
-                page: false,
-                cols: [[
-                    {type: 'numbers'},
-//                  {field: 'id', title: 'WBS要素'},
-                    {field: 'wbsys', title: 'WBS要素'},
-                    {field: 'wbssbm', title: 'WBS识别码'},
-                    {field: 'money', title: '金额'},
-//                  {field: 'pid', title: 'pid'},
-                ]]
-                ,data: [
-                <c:if test="${ not empty map.list}">
-                <c:forEach items="${map.list}" var="data" varStatus="index">
-                <c:if test="${data.feeType eq '0'}">
-                {
-                    "d_id": "${data.wbsCode}",
-                    "wbsys": "${data.describe}",
-                    "wbssbm": "${data.wbsCode}",
-                    "money": "${data.totalFee}",
-                    "d_pid": "${data.parentNode}"
-
-                },
-                    </c:if>
-                </c:forEach>
-                </c:if>
-            ],
-                done: function () {
-                    layer.closeAll('loading');
-                }
-            });
-        };
-
-        renderTable2();
-    });
-</script>
-<script>
-    layui.use('table', function(){
-        var table = layui.table;
-    });
-</script>
-<script>
-    layui.use('table', function(){
-        var table = layui.table;
-
-        table.render({
-            elem: '#xmmc'
-            ,title: '为标识'
-            ,cols: [[
-                {field:'xmmc', width:200,title:'项目名称'}
-                ,{field:'fyje', width:178,title:'费用金额'}
-                ,{width:178,  toolbar: '#barDemo',title:'操作'}
-            ]]
-            ,data:[
-            <c:if test="${ not empty map.list}">
-               <c:forEach items="${map.list2}" var="data" varStatus="index">
-                {
-                    "id":"${data.id}",
-                    <%--"xmmc": <c:if test="${data.type eq '1'}">"补增值税税率调整差额"</c:if><c:if test="${data.type eq '2'}">"扣减甲供材超供材料费"</c:if>,--%>
-                    "xmmc": "${data.type}",
-                    "fyje": "${data.fee}"
-                },
-                </c:forEach>
-                </c:if>
-            ]
-            ,page: false
-        });
-        //监听工具条
-        table.on('tool(freestr)', function(obj){
-            var datacount="";
-            var data = obj.data;
-            if(obj.event === 'fttz'){
-                sureradio(data);
-            } else if(obj.event === 'ddtz'){
-                sureradio2(data);
-            }
-            // alert(datacount);
-        });
-    });
-</script>
-<script>
-    function sureradio2(data){
-        var newid = data.id;
-        var xmmc = data.xmmc;
-        var fyje = data.fyje;
-        $("#newid").val(newid);
-        $("#xmmc1").val(xmmc);
-        $("#fyje1").val(fyje);
-//		alert(fyje);
-        layui.use(['table','layer'],function(){
-
-            layer.open({
-                type: 2,
-                title: '单独调整',
-                area: ['70%', '90%'],
-                shade: 0.8,
-//		  closeBtn: 0,
-//      fixed: true, //不固定
-                maxmin: true,
-                shadeClose: true,
-                content: '${ctxp}/webpage/modules/sg/free/alongst.jsp'
-                , btn: ['确定','关闭']
-                ,yes: function(index, layero){
-                    var bodyparent = layer.getChildFrame('body', index);
-                    bodyparent.find('#freenl').click();
-                }
-                ,btn2: function(index, layero){
-//		  		alert(layero);
-                    layer.close(index);
-                }
-            })
-        })
-    }
-</script>
-<script>
-    function sureradio(data,target){
-        var newid = data.id;
-        var xmmc = data.xmmc;
-        var fyje = data.fyje;
-        $("#newid").val(newid);
-        $("#xmmc1").val(xmmc);
-        $("#fyje1").val(fyje);
-        layui.use(['table','layer'],function(){
-
-           layer.open({
-                type: 2,
-                title: xmmc,
-                area: ['40%', '90%'],
-                shade: 0.8,
-                shadeClose: true,
-                content: '${ctxp}/webpage/modules/sg/free/avgpage.jsp'
-                , btn: ['调整','关闭']
-                ,yes: function(index, layero){
-                    var body = layer.getChildFrame('body', index);
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
-                    var inputForm = body.find('#inputForm');
-                    var top_iframe;
-                    if(target){
-                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
-                    }else{
-                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                    }
-                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
-                    iframeWin.contentWindow.doSubmit();
-
-                    layer.close(index);//关闭对话框。
-
-                }
-
-            })
-        })
-    }
-</script>
-</html>