Merge branch 'budget' of http://192.168.1.41:3000/SmartCost/ConstructionCost into budget

web/building_saas/main/html/gather_fees.html

@@ -14,10 +14,10 @@
 
     <div class="container-fluid">
         <div class="row">
-            <div class="col-lg-2 p-0">
+            <div class="col-lg-3 p-0">
                 <div class="grid main-data-full" id="gfMainSpread"></div>
             </div>
-            <div class="col-lg-10 p-0">
+            <div class="col-lg-9 p-0">
                 <div class="grid main-data-full" id="gfDetailSpread"></div>
             </div>
         </div>

web/building_saas/main/js/views/gather_fees_view.js

@@ -7,8 +7,8 @@ let gatherFeesView = {
     mainSetting: {
         header:[
             // {headerName:"ID",headerWidth:80,dataCode:"ID", hAlign: "center"},
-            {headerName:"费用类别",headerWidth:120,dataCode:"name", dataType: "String"},
-            {headerName:"金额",headerWidth:80,dataCode:"totalFee", dataType: "String",hAlign: "right"}
+            {headerName:"费用类别",headerWidth:160,dataCode:"name", dataType: "String"},
+            {headerName:"金额",headerWidth:100,dataCode:"totalFee", dataType: "String",hAlign: "right"}
         ],
         view:{
             comboBox:[],
@@ -94,12 +94,15 @@ let gatherFeesView = {
       $('#lblGatherFee').text(`费用汇总 ${obj.totalFee}`);
       sheetCommonObj.showData(me.mainSheet, me.mainSetting, me.datas);
       me.mainSheet.setRowCount(me.datas.length);
-      sheetCommonObj.showData(me.detailSheet, me.detailSetting, me.datas[0].calcItems);
-      me.getfeeRateColor(me.datas[0].calcItems);
-      customRowHeader(me.detailSheet, me.datas[0].calcItems.length);
 
-      let count = gatherFeesView.datas[gatherFeesView.mainSheet.getActiveRowIndex()].calcItems.length;
-      gatherFeesView.detailSheet.setRowCount(count, GC.Spread.Sheets.SheetArea.viewport);
+      let count = 0;
+      if (me.datas.length > 0){
+          sheetCommonObj.showData(me.detailSheet, me.detailSetting, me.datas[0].calcItems);
+          me.getfeeRateColor(me.datas[0].calcItems);
+          customRowHeader(me.detailSheet, me.datas[0].calcItems.length);
+          count = me.datas[me.mainSheet.getActiveRowIndex()].calcItems.length;
+      }
+      me.detailSheet.setRowCount(count, GC.Spread.Sheets.SheetArea.viewport);
       $.bootstrapLoading.end();
     },
     onMainEnterCell: function(sender, args) {

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

@@ -2381,8 +2381,8 @@ $('#insert').click(function () {
 $('#delete').click(function () {
     let project = projectObj.project;
     let selected = project.mainTree.selected;
-    if(isSingleSelect()&&selected.sourceType == project.Bills.getSourceType()&&selected.data.type==billType.FB&&selected.children.length<=0){//选中的是分部，并且没有子项，直接删除
-        project.Bills.deleteSelectedNode();
+    if(selected.sourceType == project.Bills.getSourceType()&&selected.data.type==billType.FB&&selected.children.length<=0){//选中的是分部，并且没有子项，直接删除
+        project.Bills.deleteSelectedNodes();//project.Bills.deleteSelectedNode();
     }else {
         $("#delete_row").modal({show:true});//弹出删除提示框;
     }