1111

src/main/java/com/jeeplus/modules/sg/util/BashInfo.java

@@ -29,7 +29,7 @@ public class BashInfo {
     public static final String BZZSSL = "补增值税税率调整差额";
     public static final String KJJGCC = "扣减甲供材超供材料费";
     public static final String GCJS = "工程结算价";
-    public static final String TBJG = "投标报价";
+    public static final String TBJG = "竣工结算价合计";
     public static final String HZ_JCGC = "基础工程";
     public static final String HZ_GTGC = "杆塔工程";
     public static final String HZ_JDGC = "接地工程";

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

@@ -536,7 +536,7 @@ public class JkxlController extends BaseController {
         rate1 = jkxlData.getTotalFee()/tz;
         gxFee1 = gxFee*rate1;
         totalF = gxFee1 + jkxlData.getTotalFee();
-        jkxlData.setGxFee(gxFee1);
+        jkxlData.setGxFee(Math.abs(gxFee1));
         jkxlData.setTotalFee(totalF);
       }
     }else {
@@ -548,7 +548,7 @@ public class JkxlController extends BaseController {
         rate1 = jkxlData.getTotalFee()/tz;
         gxFee1 = gxFee*rate1;
         totalF = jkxlData.getTotalFee()-gxFee1;
-        jkxlData.setGxFee(gxFee1);
+        jkxlData.setGxFee(Math.abs(gxFee1));
         jkxlData.setTotalFee(totalF);
       }
 

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

@@ -103,8 +103,8 @@
                     {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:'10'},
-                    {field:'gxfy',align:'center',width:120,title: '共性费用',rowspan:'2',totalRow: true},
+                    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'11'},
+
                     {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
 //                  {templet: '#oper-col', title: 'oper'}
                 ],[
@@ -131,6 +131,7 @@
                     {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}">