update

public/web/sheet/sheet_common.js

@@ -266,12 +266,15 @@ var sheetCommonObj = {
                       val =scMathUtil.roundToString(val,decimal);
                       sheet.setFormatter(-1, col,getFormatter(decimal), GC.Spread.Sheets.SheetArea.viewport);
                   }else {
-                      val =scMathUtil.roundToString(val,2);
+                    val = val + '';
                   }
               }
               if(val!=null && setting.header[col].cellType == "checkBox"){
                   this.setCheckBoxCell(row,col,sheet,val);
               }
+              if(setting.header[col].getText) {
+                val = setting.getText[setting.header[col].getText](data[row], val)
+              }
               sheet.setValue(row, col, val, ch);
               if(col==treeCol){
                   let treeType = sheetCommonObj.getTreeNodeCellType(data,row,parentMap,treeCol);

web/building_saas/css/main.css

@@ -287,7 +287,7 @@ height:300px
   background: #f7f7f9;
   padding:1px 0 0 2px
 }
-.bottom-content .nav-tabs .nav-link, .side-tabs .nav-tabs .nav-link {
+.bottom-content .nav-tabs .nav-link, .side-tabs .divide_side-tabs .nav-tabs .nav-link {
   border-radius: 0;
   padding: 0.2em 0.5em
 }
@@ -299,14 +299,14 @@ height:300px
   left:22px;
   z-index: 999
 }
-.side-tabs .nav-tabs .nav-item {
+.side-tabs .divide_side-tabs .nav-tabs .nav-item {
 z-index: 999
 }
-.side-tabs .nav-tabs {
+.side-tabs .divide_side-tabs .nav-tabs {
   border-bottom: none;
   margin-bottom: -1px
 }
-.side-tabs .nav-tabs .nav-link {
+.side-tabs .divide_side-tabs .nav-tabs .nav-link {
   border-radius: 0;
   padding: 0em 0.5em;
   line-height: 30px;
@@ -316,11 +316,11 @@ z-index: 999
   border:2px solid #ff6501;
   border-bottom: 1px solid #fff
 }
-.side-tabs .nav-tabs .nav-link.active {
+.side-tabs .divide_side-tabs .nav-tabs .nav-link.active {
   border-top: none;
   border-bottom:1px solid #fff
 }
-.side-tabs a.active, .sub-nav a.active {
+.side-tabs .divide_side-tabs a.active, .sub-nav a.active {
   background: #ccc
 }
 .poj-manage {

web/building_saas/main/html/main.html

@@ -71,7 +71,7 @@
                 <li class="nav-item"><a class="active" data-toggle="tab" href="#zaojiashu" id="tab_zaojiashu" role="tab">造价书</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#project_glj" id="tab_project_glj" data-name="tab_project_glj" role="tab">工料机汇总</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#fee_rates" id="tab_fee_rate" role="tab" >费率</a></li>
-                <li class="nav-item"><a data-toggle="tab" href="#divide" id="tab_divide" role="tab" >分摊</a></li>
+                <li class="nav-item"><a data-toggle="tab" href="#divide" id="tab_divide" role="tab" style="display: none;">分摊</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#calc_program_manage" id="tab_calc_program_manage" role="tab" style="display:none">总计算程序</a></li>
                <!-- <li class="nav-item"><a data-toggle="tab" href="#tender_price" id="tab_tender_price" role="tab">调价</a></li>-->
                 <li class="nav-item"><a data-toggle="tab" href="#reports" role="tab" id="tab_report" onclick="rptTplObj.iniPage();">报表</a></li>

web/building_saas/main/js/views/project_info.js

@@ -67,9 +67,10 @@ var projectInfoObj = {
     },
     showProjectInfo: function (data) {
         if (data) {
-            //如果是工程量清单项目，则显示导入功能
+            //如果是工程量清单项目，则显示导入、分摊功能
             if (data.property.valuationType === 'ration') {
                 $('#importSpan').show();
+                $('#tab_divide').show();
             }
 
             //打开预算项目时，右侧“清单规则”显示为“项目表”，打开工程量清单项目时，右侧“清单规则”显示为“清单范本”。