1.造价书界面，上方的“返回项目管理界面”按钮丢失

2.清单基数窗口调整，以在笔记本电脑中显示完整
3.广东建筑，生成的子目增加内容项，面积增加费费栏默认不给框勾选

web/building_saas/main/html/main.html

@@ -1402,7 +1402,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">
@@ -1450,7 +1450,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/models/calc_base.js

@@ -771,7 +771,6 @@ let baseFigureTemplate = {
         return rst;
     },
     'JGZCF': function (tender) {//甲供主材费
-        debugger;
         let rst = 0;
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){

web/building_saas/main/js/models/overHeight.js

@@ -197,7 +197,7 @@ const OVER_HEIGHT = (() => {
     // 是否是超高子目
     function isOverHeight(node) {
         return node
-            && node.sourceType === projectObj.project.Ration.getSourceType()
+            && node.sourceType === ModuleNames.ration
             && node.data.type === rationType.overHeight;
     }
     // 获取超高降效列号

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/item_increase_fee_view.js

@@ -167,6 +167,11 @@ let itemIncreaseFeeObj = {
         }
         return datas;
     },
+    isItemIncrease: function (node) {
+        return node
+        && node.sourceType === ModuleNames.ration
+        && node.data.type === rationType.itemIncrease;
+    },
     onItemValueChange:function (sender,args) {
         let me = itemIncreaseFeeObj;
         let dataCode = me.itemSetting.header[args.col].dataCode;

web/building_saas/main/js/views/main_tree_col.js

@@ -421,8 +421,8 @@ let MainTreeCol = {
         mainNodeCheckBox:function (node,setting,field) {//分部分项、措施项目下的清单、定额
             let Bills = projectObj.project.Bills;
             if((Bills.isFBFX(node)||Bills.isMeasure(node)) && node.sourceType != ModuleNames.ration_glj){
-                //有基数计算时面积增加费不可勾选
-                if(field == 'areaIncreaseFee' && node.data.calcBase && node.data.calcBase!="") return;
+                //有基数计算时或超高子目,面积增加费不可勾选
+                if(field == 'areaIncreaseFee' && node.data.calcBase && node.data.calcBase!="" || itemIncreaseFeeObj.isItemIncrease(node)) return;
                 return sheetCommonObj.getCheckBox(false);
             }
 

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

@@ -3462,8 +3462,8 @@ function changeCalcBaseFeeRate(toggle) {
         $('#calcBaseFeeRate').find('.modal-body').find('button:first').hide();
         $('#calcBaseFeeRate').find('.modal-body').find('ul:first').show();
         $('#calcBaseExp').remove();
-        let $input = $('<input>').attr('id', 'calcBaseExp').addClass('form-control');
-        $('#expArea').prepend($input);
+        let $textarea = $('<textarea>').attr('id', 'calcBaseExp').prop('rows', 2).addClass('form-control').css('resize', 'none');
+        $('#expArea').prepend($textarea);
     }
     else if(toggle === 'feeRate'){
         $('#mixedHeader').hide();
@@ -3478,7 +3478,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);
     }
 }