费用汇总

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

@@ -2741,8 +2741,8 @@ class CalcProgram {
     };
 
     gatherRationFees(programID){
-        $.bootstrapLoading.start();
-        setTimeout(()=>{
+        // $.bootstrapLoading.start();
+        // setTimeout(()=>{
             // 先把符合的定额筛选出来，以提高速度。
             let rations = []; 
             for (const r of projectObj.project.Ration.datas) {
@@ -2777,9 +2777,9 @@ class CalcProgram {
 
                 gatherObj[ft.type] = ftObj;
             };
-            console.log(gatherObj);
-        });
-        $.bootstrapLoading.end();    
+            return gatherObj;
+        // });
+        // $.bootstrapLoading.end();    
     }
 };
 

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

@@ -21,19 +21,16 @@ let gatherFeesView = {
             // {headerName:"ID",headerWidth:80,dataCode:"ID", hAlign: "center"},
             {headerName:"费用代号",headerWidth:CP_Col_Width.code, dataCode:"code", dataType: "String"},
             {headerName:"费用名称",headerWidth:CP_Col_Width.name, dataCode:"name", dataType: "String"},
-            {headerName:"计算基数",headerWidth:CP_Col_Width.dispExprUser, dataCode:"dispExprUser", dataType: "String",cellType:'cusButton',callback:'calcBase',disable:'calcBase'},
+            {headerName:"计算基数",headerWidth:CP_Col_Width.dispExprUser, dataCode:"dispExprUser", dataType: "String"},
             {headerName:"费率",headerWidth:CP_Col_Width.feeRate, dataCode:"feeRate", dataType: "Number",hAlign: "right",decimalField:"feeRate"},
-            {headerName: "单价", headerWidth: CP_Col_Width.unitFee, dataCode: "unitFee", dataType: "Number"},
-            {headerName: "合价", headerWidth: CP_Col_Width.totalFee, dataCode: "totalFee", dataType: "Number"},
-            {headerName: "调后单价", headerWidth: CP_Col_Width.unitFee, dataCode: "tenderUnitFee", dataType: "Number"},
-            {headerName: "调后合价", headerWidth: CP_Col_Width.totalFee, dataCode: "tenderTotalFee", dataType: "Number"},
+            {headerName: "金额", headerWidth: CP_Col_Width.totalFee, dataCode: "totalFee", dataType: "Number"},
             {headerName:"费用类别",headerWidth:CP_Col_Width.displayFieldName, dataCode:"displayFieldName", dataType: "String", hAlign: "center"},
             {headerName:"基数说明",headerWidth:CP_Col_Width.statement, dataCode:"statement", dataType: "String"},
             {headerName:"备注",headerWidth:CP_Col_Width.memo, dataCode:"memo", dataType: "String"}
         ],
         view:{
             comboBox:[],
-            lockColumns:[2,5],
+            lockColumns:[0,1,2,3,4,5,6,7],
             colHeaderHeight: CP_Col_Width.colHeader,
             rowHeaderWidth: CP_Col_Width.rowHeader
         },
@@ -87,8 +84,8 @@ let gatherFeesView = {
         me.getfeeRateColor(me.datas[0].calcItems);
         customRowHeader(me.detailSheet, me.datas[0].calcItems.length);
         if(!projectReadOnly){
-            me.loadMainContextMenu();
-            me.loadDetailContextMenu();
+            // me.loadMainContextMenu();
+            // me.loadDetailContextMenu();
         }
         else {
             if(me.mainSetting.view.lockColumns){
@@ -124,6 +121,10 @@ let gatherFeesView = {
         me.detailSpread.suspendPaint();
         var dData = me.datas[row].calcItems;
         me.detailSheet.setRowCount(dData.length, GC.Spread.Sheets.SheetArea.viewport);
+        let gatherObj = projectObj.project.calcProgram.gatherRationFees(me.datas[row].ID);
+        for (const d of dData) {
+           d['totalFee'] = gatherObj[d.fieldName]?.totalFee;
+        }
         sheetCommonObj.showData(me.detailSheet, me.detailSetting, dData);
         me.getfeeRateColor(dData);
         customRowHeader(me.detailSheet, dData.length);