安装增加费管理费计算

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

@@ -150,6 +150,9 @@ let calcTools = {
     isRationItem: function(treeNode){
         return this.isRationCategory(treeNode) && treeNode.data.type === rationType.ration;
     },
+    isCalcManageRation:function(treeNode){
+      return this.isRationCategory(treeNode) && (treeNode.data.type === rationType.ration || treeNode.data.type === rationType.install);
+    },
     isVolumePrice: function (treeNode) {
         return this.isRationCategory(treeNode) && treeNode.data.type === rationType.volumePrice;
     },

web/building_saas/main/js/models/installation_fee.js

@@ -663,6 +663,8 @@ var installation_fee = {
                 data.quantity = '1';
                 data.contain ='1';
                 data.nextID = nextID;
+                //取管理费费率
+                if(installationFeeObj.feeRateMap[rule.code]) data.manageFeeRate = installationFeeObj.feeRateMap[rule.code];
                 data.glj = {
                     'RGFTZ':{
                         rationID:data.ID,

web/building_saas/main/js/views/installation_fee_view.js

@@ -2,6 +2,7 @@
  * Created by zhang on 2018/1/30.
  */
 let installationFeeObj={
+    feeRateMap:{},
     rationInstallSheet:null,
     rationInstallData:[],
     rationInstallSetting:{
@@ -272,7 +273,6 @@ let installationFeeObj={
         me.feeItemSheet.repaint();
     },
     onFeeDetailSelectionChange:function (e,info) {
-        console.log('detail selection change');
         let me = installationFeeObj;
         if(me.detailReloadSelection){
             info.sheet.setSelection(me.detailReloadSelection.row,me.detailReloadSelection.col,1,1);
@@ -820,7 +820,6 @@ let installationFeeObj={
         let me = this,installation_fee = projectObj.project.installation_fee;
         let modifyRule = me.modifyFeeRuleData[0];
         let updateMap = null;
-        console.log(me.modifyEditedObj);
         if(me.modifyEditedObj==null){
             $("#modify_feeRule").modal('hide');
             return;
@@ -874,7 +873,6 @@ let installationFeeObj={
         modifyFee.position = recode.code;
         modifyFee.billID = recode.ID;
         me.modifyFeeRuleSheet.setValue(riselection.row,positionCol,me.getDisplayText(modifyFee));
-        console.log(me.modifyEditedObj);
     },
     updateRationInstallPosition:function(recode){
         let me = this, installation_fee = projectObj.project.installation_fee;
@@ -1039,7 +1037,6 @@ let installationFeeObj={
                   }
               }
          }
-        console.log(updateData);
          if(updateData.length > 0){
              installation_fee.updateInstallation(updateData,function () {
                  me.refreshView();
@@ -1119,7 +1116,6 @@ let installationFeeObj={
         }
         me.modifyEditedObj[fieldID] = value;
         me.modifyFeeRuleData[info.row][fieldID] = value;
-        console.log(me.modifyEditedObj);
     },
     onFeeDetailValueChange:function (e,info) {
         if(info.newValue==info.oldValue){

web/over_write/js/guangdong_2018.js

@@ -30,7 +30,7 @@ function overwriteRationCalcBases (){
     // 广东建筑管理费特殊计算：管理费=ROUND(∑(人工费+施工机具费)*定额的管理费费率*0.01，精度)。与定额同级的量价、人材机则按管理费费率为0计算。
     rationCalcBases['管理费'] = function (node, isTender) {
         let rst = 0;
-        if (calcTools.isRationItem(node) && node.data.gljList && node.data.manageFeeRate) {
+        if (calcTools.isCalcManageRation(node)  && node.data.gljList && node.data.manageFeeRate) {
             rst = (rationCalcBases['人工费'](node, isTender) + rationCalcBases['机具费'](node, isTender)) * node.data.manageFeeRate * 0.01;
             rst = rst.toDecimal(decimalObj.ration.unitPrice);
         };
@@ -173,6 +173,242 @@ if (typeof gljOprObj !== 'undefined') {
     ]
 }
 
+if (typeof installationFeeObj !== 'undefined') {
+  installationFeeObj.feeRateMap={
+    "AZF0101":"39.86",
+    "AZF0102":"39.92",
+    "AZF0103":"39.92",
+    "AZF0104":"39.86",
+    "AZF0105":"39.86",
+    "AZF0106":"28.74",
+    "AZF0107":"30.66",
+    "AZF0108":"29.43",
+    "AZF0109":"27.72",
+    "AZF0110":"29.35",
+    "AZF0111":"27.73",
+    "AZF0112":"27.72",
+    "AZF0113":"29.44",
+    "AZF0114":"20.56",
+    "AZF0115":"39.86",
+    "AZF0116":"39.86",
+    "AZF0117":"39.86",
+    "AZF0118":"39.86",
+    "AZF0119":"39.86",
+    "AZF0120":"39.86",
+    "AZF0121":"39.86",
+    "AZF0122":"39.86",
+    "AZF0123":"39.86",
+    "AZF0124":"28.74",
+    "AZF0125":"30.66",
+    "AZF0126":"30.66",
+    "AZF0127":"30.66",
+    "AZF0128":"27.72",
+    "AZF0129":"29.35",
+    "AZF0130":"29.35",
+    "AZF0131":"27.73",
+    "AZF0132":"27.73",
+    "AZF0133":"27.73",
+    "AZF0134":"27.73",
+    "AZF0135":"27.72",
+    "AZF0136":"27.72",
+    "AZF0137":"27.72",
+    "AZF0138":"27.72",
+    "AZF0139":"29.44",
+    "AZF0140":"29.44",
+    "AZF0141":"29.44",
+    "AZF0142":"20.56",
+    "AZF0143":"20.56",
+    "AZF0144":"20.56",
+    "AZF0145":"20.56",
+    "AZF0146":"20.56",
+    "AZF0147":"20.56",
+    "AZF0148":"20.56",
+    "AZF0149":"20.56",
+    "AZF0150":"39.92",
+    "AZF0151":"28.74",
+    "AZF0152":"30.66",
+    "AZF0153":"29.43",
+    "AZF0154":"27.72",
+    "AZF0155":"29.35",
+    "AZF0156":"27.73",
+    "AZF0157":"27.72",
+    "AZF0158":"29.44",
+    "AZF0159":"20.56",
+    "AZF0160":"28.74",
+    "AZF0161":"28.74",
+    "AZF0162":"28.74",
+    "AZF0163":"28.74",
+    "AZF0164":"28.74",
+    "AZF0165":"28.74",
+    "AZF0166":"28.74",
+    "AZF0167":"28.74",
+    "AZF0168":"28.74",
+    "AZF0169":"28.74",
+    "AZF0170":"28.74",
+    "AZF0171":"28.74",
+    "AZF0172":"28.74",
+    "AZF0173":"28.74",
+    "AZF0174":"28.74",
+    "AZF0175":"28.74",
+    "AZF0176":"28.74",
+    "AZF0177":"28.74",
+    "AZF0178":"28.74",
+    "AZF0179":"28.74",
+    "AZF0180":"28.74",
+    "AZF0181":"28.74",
+    "AZF0182":"28.74",
+    "AZF0183":"28.74",
+    "AZF0184":"30.66",
+    "AZF0185":"30.66",
+    "AZF0186":"30.66",
+    "AZF0187":"30.66",
+    "AZF0188":"30.66",
+    "AZF0189":"30.66",
+    "AZF0190":"30.66",
+    "AZF0191":"30.66",
+    "AZF0192":"30.66",
+    "AZF0193":"30.66",
+    "AZF0194":"30.66",
+    "AZF0195":"30.66",
+    "AZF0196":"30.66",
+    "AZF0197":"30.66",
+    "AZF0198":"30.66",
+    "AZF0199":"30.66",
+    "AZF0200":"30.66",
+    "AZF0201":"30.66",
+    "AZF0202":"30.66",
+    "AZF0203":"30.66",
+    "AZF0204":"30.66",
+    "AZF0205":"30.66",
+    "AZF0206":"30.66",
+    "AZF0207":"30.66",
+    "AZF0208":"27.72",
+    "AZF0209":"27.72",
+    "AZF0210":"27.72",
+    "AZF0211":"27.72",
+    "AZF0212":"27.72",
+    "AZF0213":"27.72",
+    "AZF0214":"27.72",
+    "AZF0215":"27.72",
+    "AZF0216":"27.72",
+    "AZF0217":"27.72",
+    "AZF0218":"27.72",
+    "AZF0219":"27.72",
+    "AZF0220":"27.72",
+    "AZF0221":"27.72",
+    "AZF0222":"27.72",
+    "AZF0223":"27.72",
+    "AZF0224":"27.72",
+    "AZF0225":"27.72",
+    "AZF0226":"27.72",
+    "AZF0227":"27.72",
+    "AZF0228":"27.72",
+    "AZF0229":"27.72",
+    "AZF0230":"27.72",
+    "AZF0231":"27.72",
+    "AZF0232":"27.73",
+    "AZF0233":"27.73",
+    "AZF0234":"27.73",
+    "AZF0235":"27.73",
+    "AZF0236":"27.73",
+    "AZF0237":"27.73",
+    "AZF0238":"27.73",
+    "AZF0239":"27.73",
+    "AZF0240":"27.73",
+    "AZF0241":"27.73",
+    "AZF0242":"27.73",
+    "AZF0243":"27.73",
+    "AZF0244":"27.73",
+    "AZF0245":"27.73",
+    "AZF0246":"27.73",
+    "AZF0247":"27.73",
+    "AZF0248":"27.73",
+    "AZF0249":"27.73",
+    "AZF0250":"27.73",
+    "AZF0251":"27.73",
+    "AZF0252":"27.73",
+    "AZF0253":"27.73",
+    "AZF0254":"27.73",
+    "AZF0255":"27.73",
+    "AZF0256":"27.72",
+    "AZF0257":"27.72",
+    "AZF0258":"27.72",
+    "AZF0259":"27.72",
+    "AZF0260":"27.72",
+    "AZF0261":"27.72",
+    "AZF0262":"27.72",
+    "AZF0263":"27.72",
+    "AZF0264":"27.72",
+    "AZF0265":"27.72",
+    "AZF0266":"27.72",
+    "AZF0267":"27.72",
+    "AZF0268":"27.72",
+    "AZF0269":"27.72",
+    "AZF0270":"27.72",
+    "AZF0271":"27.72",
+    "AZF0272":"27.72",
+    "AZF0273":"27.72",
+    "AZF0274":"27.72",
+    "AZF0275":"27.72",
+    "AZF0276":"27.72",
+    "AZF0277":"27.72",
+    "AZF0278":"27.72",
+    "AZF0279":"27.72",
+    "AZF0280":"29.44",
+    "AZF0281":"29.44",
+    "AZF0282":"29.44",
+    "AZF0283":"29.44",
+    "AZF0284":"29.44",
+    "AZF0285":"29.44",
+    "AZF0286":"29.44",
+    "AZF0287":"29.44",
+    "AZF0288":"29.44",
+    "AZF0289":"29.44",
+    "AZF0290":"29.44",
+    "AZF0291":"29.44",
+    "AZF0292":"29.44",
+    "AZF0293":"29.44",
+    "AZF0294":"29.44",
+    "AZF0295":"29.44",
+    "AZF0296":"29.44",
+    "AZF0297":"29.44",
+    "AZF0298":"29.44",
+    "AZF0299":"29.44",
+    "AZF0300":"29.44",
+    "AZF0301":"29.44",
+    "AZF0302":"29.44",
+    "AZF0303":"29.44",
+    "AZF0304":"20.56",
+    "AZF0305":"20.56",
+    "AZF0306":"20.56",
+    "AZF0307":"20.56",
+    "AZF0308":"20.56",
+    "AZF0309":"20.56",
+    "AZF0310":"20.56",
+    "AZF0311":"20.56",
+    "AZF0312":"20.56",
+    "AZF0313":"20.56",
+    "AZF0314":"20.56",
+    "AZF0315":"20.56",
+    "AZF0316":"20.56",
+    "AZF0317":"20.56",
+    "AZF0318":"20.56",
+    "AZF0319":"20.56",
+    "AZF0320":"20.56",
+    "AZF0321":"20.56",
+    "AZF0322":"20.56",
+    "AZF0323":"20.56",
+    "AZF0324":"20.56",
+    "AZF0325":"20.56",
+    "AZF0326":"20.56",
+    "AZF0327":"20.56",
+    "AZF0328":"27.72",
+    "AZF0329":"27.72",
+    "AZF0330":"39.86",
+    "AZF0331":"27.72"
+    }
+}
+
 // 导入导出接口
 // 需要用固定类别关联的费用字典，用固定类别来映射
 // 数据节选自标准pdf文件《《建设工程政府投资项目造价数据标准》信息公开版》，附录C-费用名称与费用代号