①跟踪机上人工费没有按预算价计算问题。

②干掉计算程序界面表格多余空行。

public/web/sheet/sheet_common.js

@@ -23,7 +23,7 @@ var sheetCommonObj = {
         var me = this;
         var spreadNS = GC.Spread.Sheets;
         if(setting.headRows == 2){
-            return me.buildSpanHeader(sheet, setting, rowCount);//初始化合并表格列头
+            return me.buildSpanHeader(sheet, setting);//初始化合并表格列头
         }
         sheet.suspendPaint();
         sheet.suspendEvent();
@@ -50,6 +50,7 @@ var sheetCommonObj = {
         sheet.showRowOutline(false);
         sheet.options.allowCellOverflow = false;
         me.buildHeader(sheet, setting);
+        sheet.setRowCount(rowCount, spreadNS.SheetArea.viewport);
         sheet.resumeEvent();
         sheet.resumePaint();
     },
@@ -63,7 +64,7 @@ var sheetCommonObj = {
         return spreadBook;
     },
 
-    buildSpanHeader:function (sheet, setting, rowCount) {
+    buildSpanHeader:function (sheet, setting) {
         let temSetting = {
             "emptyRows":0,
             "headRows":2,
@@ -73,7 +74,7 @@ var sheetCommonObj = {
             "cols":[]
         };
         let spanSetting =   sheetCommonObj.transferToTreeSetting(setting,temSetting);
-        TREE_SHEET_HELPER.loadSheetHeader(spanSetting,sheet,rowCount);
+        TREE_SHEET_HELPER.loadSheetHeader(spanSetting, sheet);
 
     },
 

web/building_saas/main/js/models/calc_program.js

@@ -378,7 +378,7 @@ let calcTools = {
                 for (let md of mds) {
                     if (md.type == detailType) {
                         let q = md["consumption"] ? md["consumption"] : 0;
-                        let p = md["basePrice"] ? md["basePrice"] : 0;
+                        let p = md["marketPrice"] ? md["marketPrice"] : 0;
                         mdSum = mdSum + (q * p).toDecimal(decimalObj.glj.unitPriceHasMix);
                         mdSum = (mdSum).toDecimal(decimalObj.glj.unitPriceHasMix);
                     }