22

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

@@ -165,40 +165,39 @@
                 <%--url: '${ctxp}/webpage/modules/sys/free/selfwbs.json',--%>
                 page: false,
                 cols: [[
-                    {type: 'numbers',align:'center',width:50, rowspan:'3'},
-                    {field: 'wbsys', title: 'WBS要素', align:'center',width:200, rowspan:'3'},
-//                  {field: 'cj', title: '层级',align:'center',width:60, rowspan:'3'},
-                    {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码",rowspan:3},
-                    {field:'fbfxysj', align:'center', title: '分布分项(原数据)',colspan:'5'},
+                    {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:'csf1',align:'center',title:'措施费一',colspan:'2'},
-                    {field:'csf2',align:'center',width:90,title:'措施费二',rowspan:'3'},
-                    {field:'qtf',align:'center',width:80,title:'其他费',rowspan:'3'},
-                    {field:'gf',align:'center',width:60,title:'规费',rowspan:'3'},
-                    {field:'sf',align:'center',width:60,title:'税金',rowspan:'3'},
-                    {field:'hj',align:'center',width:80,title:'合计',rowspan:'3'}
-//                  {field:'11',align:'center',width:40,title:'',rowspan:'3'}
+                    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},
+                    {field:'hj',align:'center',width:80,title:'合计',rowspan:'2',totalRow: true}
 //                  {templet: '#oper-col', title: 'oper'}
                 ],[
-                    {field:'hjje', width:90,align:'center',title:'合计金额',rowspan:'2'},
-                    {field:'rgf', width:80,align:'center',title:'人工费',rowspan:'2'},
-                    {field:'cl', width:80,align:'center',title:'材料',colspan:'2'},
-                    {field:'jxf1', width:80,align:'center',title:'机械费',rowspan:'2'},
+                    {field:'hjje', width:90,align:'center',title:'合计金额',totalRow: true},
+                    {field:'zjgcf', width:100,align:'center',title:'直接工程费',totalRow: true},
+                    {field:'rgf1', width:80,align:'center',title:'人工费',totalRow: true},
+                    {field:'cbrcg1', width:100,align:'center',title:'承包人采购',totalRow: true},
+                    {field:'fbrcg1', width:100,align:'center',title:'发包人采购',totalRow: true},
+                    {field:'jxf1', width:80,align:'center',title:'机械费',totalRow: true},
 
-                    {field:'rgf2', width:80,align:'center',title:'人工费',rowspan:'2'},
-                    {field:'cl2', width:80,align:'center',title:'材料',colspan:'2'},
-//              	 {field:'cbrcg2', width:100,title:'承包人采购'},
-//              	 {field:'fbrcg2', width:100,title:'发包人采购'},
-                    {field:'jxf2', width:80,align:'center',title:'机械费',rowspan:'2'},
+                    {field:'rgf2', width:80,align:'center',title:'人工费',totalRow: true},
+                    {field:'cbrcg2', width:100,align:'center',title:'承包人采购',totalRow: true},
+                    {field:'fbrcg2', width:100,align:'center',title:'发包人采购',totalRow: true},
+                    {field:'jxf2', width:80,align:'center',title:'机械费',totalRow: true},
 
-                    {field:'csf_1', width:100,align:'center',title:'措施费-1',rowspan:'2'},
-                    {field:'csf_2', width:100,align:'center',title:'措施费-2',rowspan:'2'}
-                ],[
-                    {field:'cbrcg', width:100,align:'center',title:'承包人采购'},
-                    {field:'fbrcg', width:100,align:'center',title:'发包人采购'},
-                    {field:'cbrcg2', width:100,align:'center',title:'承包人采购'},
-                    {field:'fbrcg2', width:100,align:'center',title:'发包人采购'},
+                    {field:'rgf3', width:80,align:'center',title:'人工费',totalRow: true},
+                    {field:'cbrcg3', width:100,align:'center',title:'承包人采购',totalRow: true},
+                    {field:'fbrcg3', width:100,align:'center',title:'发包人采购',totalRow: true},
+                    {field:'jxf3', width:80,align:'center',title:'机械费',totalRow: true},
 
+                    {field:'csf_1',width:100,title:'措施费-1',align:'center',totalRow: true},
+                    {field:'csf_2',width:100,title:'措施费-2',align:'center',totalRow: true},
+                    {field:'csf2',align:'center',width:90,title:'措施费二',totalRow: true},
+                    {field:'qtf',align:'center',width:80,title:'其他费',totalRow: true},
+                    {field:'gf',align:'center',width:60,title:'规费',totalRow: true},
+                    {field:'sf',align:'center',width:60,title:'税金',totalRow: true},
                 ]]
                 ,data: [
                 <c:if test="${ not empty map.list}">
@@ -208,15 +207,24 @@
                     "id": "${data.wbsCode}",
                     "wbsys":"${data.describe}",
                     "wbssbm": "${data.wbsCode}",
+
                     "hjje": "${data.originalTotalCost}",
-                    "rgf": "${data.originalRgCost}",
-                    "cbrcg": "${data.originalCbrCost}",
-                    "fbrcg": "${data.originalFbrCost}",
+                    "zjgcf":"0",
+                    "rgf1": "${data.originalRgCost}",
+                    "cbrcg1": "${data.originalCbrCost}",
+                    "fbrcg1": "${data.originalFbrCost}",
                     "jxf1": "${data.originalJxCost}",
-                    "rgf2": "${data.rgCost}",
+
+                    "rgf2": "${data.jxCost}",
                     "cbrcg2": "${data.cbrCost}",
                     "fbrcg2":"${data.fbrCost}",
                     "jxf2": "${data.jxCost}",
+
+                    "rgf3": "0",
+                    "cbrcg3": "0",
+                    "fbrcg3": "0",
+                    "jxf3": "0",
+
                     "csf_1": "${data.measuresFee1}",
                     "csf_2": "${data.measuresFee2}",
                     "csf2": "${data.measuresFee3}",