bugs

web/building_saas/main/js/views/calc_program_manage.js

@@ -551,7 +551,9 @@ $(document).ready(function(){
             calcProgramManage.buildSheet()
         else
             calcProgramManage.mainSpread.refresh();
-        calcProgramManage.detailSheet.setRowCount(calcProgramManage.datas[0].calcItems.length, GC.Spread.Sheets.SheetArea.viewport);
+
+        let count = calcProgramManage.datas[calcProgramManage.mainSheet.getActiveRowIndex()].calcItems.length;
+        calcProgramManage.detailSheet.setRowCount(count, GC.Spread.Sheets.SheetArea.viewport);
     });
 
     $("#calcProgramFileSelect").change(function() {

web/over_write/js/guangdong_2018.js

@@ -79,7 +79,7 @@ function overwriteRationCalcBases (){
     cpFeeTypes = [
         {type: 'labour', name: '人工费'},
         {type: 'material', name: '材料费'},
-        {type: 'machine', name: '机械费'},
+        {type: 'machine', name: '机具费'},
         {type: 'mainMaterial', name: '主材费'},
         {type: 'equipment', name: '设备费'},
         {type: 'direct', name: '直接费'},