1.新增一些固定类被

2.计算基数窗口调整适应笔记本

public/common_constants.js

@@ -75,6 +75,24 @@
         PREVENTIVE_MAINTENANCE_FEE: 32,
         // 修复养护费
         REPAIR_MAINTENANCE_FEE: 33,
+        // 日常养护费
+        DAILY_MAINTENANCE_FEE: 34,
+        // 日常巡查费
+        DAILY_PATROL_FEE: 35,
+        // 日常保养费
+        DAILY_UPKEEP_FEE: 36,
+        // 信息化系统养护费
+        INFORMATIZATION_MAINTENANCE_FEE: 37,
+        // 技术状况评定费
+        TECH_ASSESSMENT_FEE: 38,
+        // 系统维护费
+        SYSTEM_MAINTENANCE_FEE: 39,
+        // 养护机械设备购置费
+        MAINTENANCE_MACHINE_ACQUISITION_FEE: 40,
+        // 养护工程费
+        MAINTENANCE_FEE: 41,
+        // 应急养护费
+        EMERGENCY_FEE: 42
     };
 
     // 补充人材机库

web/building_saas/main/html/main.html

@@ -1212,7 +1212,7 @@
                         <span aria-hidden="true">&times;</span>
                     </button>
                 </div>
-                <div class="modal-body">
+                <div class="modal-body pb-0">
                     <div class="tab-content">
                         <div class="tab-pane active" id="m-js" role="tabpanel">
                             <div class="form-group" id="expArea">
@@ -1260,7 +1260,7 @@
                                         </li>
                                     </ul>
                                 </div>
-                                <div class=" modal-auto-height col-9" style="overflow: hidden; padding: 0; margin: 0;" id="billsBaseSpread">
+                                <div class=" modal-auto-height col-9" style="overflow: hidden; padding: 0; margin: 0; height: 360px;" id="billsBaseSpread">
                                 </div>
                             </div>
                         </div>

web/building_saas/main/js/views/calc_base_view.js

@@ -58,7 +58,7 @@ let calcBaseView = {
                 allowResizeColumns: true
             };
             sheet.setColumnCount(headers.length);
-            sheet.setRowHeight(0, 40, GC.Spread.Sheets.SheetArea.colHeader);
+            sheet.setRowHeight(0, 20, GC.Spread.Sheets.SheetArea.colHeader);
             sheet.setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
             for(let i = 0, len = headers.length; i < len; i++){
                 sheet.setValue(0, i, headers[i].name, GC.Spread.Sheets.SheetArea.colHeader);

web/building_saas/main/js/views/project_view.js

@@ -3295,7 +3295,7 @@ function changeCalcBaseFeeRate(toggle) {
         $('#normalHeader').show();
         $('#calcBaseFeeRate').find('.modal-title').text('计算基数选择').show();
         $('#calcBaseExp').remove();
-        let $textarea = $('<textarea>').attr('id', 'calcBaseExp').prop('rows', 3).addClass('form-control').css('resize', 'none');
+        let $textarea = $('<textarea>').attr('id', 'calcBaseExp').prop('rows', 2).addClass('form-control').css('resize', 'none');
         $('#expArea').prepend($textarea);
     }
     else if(toggle === 'feeRate'){
@@ -3311,7 +3311,7 @@ function changeCalcBaseFeeRate(toggle) {
         $('#calcBaseFeeRate').find('.modal-body').find('button:first').show();
         $('#calcBaseFeeRate').find('.modal-body').find('ul:first').show();
         $('#calcBaseExp').remove();
-        let $textarea = $('<textarea>').attr('id', 'calcBaseExp').prop('rows', 3).addClass('form-control').css('resize', 'none');
+        let $textarea = $('<textarea>').attr('id', 'calcBaseExp').prop('rows', 2).addClass('form-control').css('resize', 'none');
         $('#expArea').prepend($textarea);
     }
 }