update

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

@@ -916,16 +916,35 @@ let rationCalcBasesNameKinds = {
 };
 
 let rationCalcBases = {
-    '定额基价人工费': function (node, isTender) {
+    '人工费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender);
+    },
+    '材料费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender);
+    },
+    '施工机具费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE], priceTypes.ptMarketPrice, isTender);
+    },
+    '商品砼费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptMarketPrice, isTender);
+    },
+    '设备购置费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
+    },
+    '定额人工费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptBasePrice, isTender);
     },
-    '定额基价材料费': function (node, isTender) {
+    '定额材料费': function (node, isTender) {
         return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptBasePrice, isTender);
     },
-    '定额基价机械费': function (node, isTender) {
+    '定额施工机具使用费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE], priceTypes.ptBasePrice, isTender);
     },
-    '定额基价机上人工费': function (node, isTender) {
+    '定额设备费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender);
+    }
+
+/*    '定额基价机上人工费': function (node, isTender) {
         return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
     },
     '人工费价差': function (node, isTender) {
@@ -1020,7 +1039,7 @@ let rationCalcBases = {
             return calcTools.labourDays(node, isTender)
         else
             return 0;
-    }
+    }*/
 };
 
 let analyzer = {

web/building_saas/main/js/models/main_consts.js

@@ -276,48 +276,26 @@ const billText = {
 };
 
 let cpFeeTypes = [
-    {type: 'direct', name: '直接费'},
-    {type: 'labour', name: '人工费'},
-    {type: 'material', name: '材料费'},
-    {type: 'machine', name: '机械费'},
-    {type: 'mainMaterial', name: '主材费'},
-    {type: 'equipment', name: '设备费'},
+    {type: 'marketLabour', name: '人工费'},
+    {type: 'marketMaterial', name: '材料费'},
+    {type: 'marketMachine', name: '施工机具使用费'},
+    {type: 'marketEquipment', name: '设备费'},
+    {type: 'marketDirect', name: '直接费'},
+    {type: 'labour', name: '定额人工费'},
+    {type: 'material', name: '定额材料费'},
+    {type: 'machine', name: '定额施工机具使用费'},
+    {type: 'equipment', name: '定额设备费'},
+    {type: 'direct', name: '定额直接费'},
+    {type: 'measure', name: '措施费'},
+    {type: 'measure1', name: '措施费I'},
+    {type: 'measure2', name: '措施费II'},
     {type: 'manage', name: '企业管理费'},
+    {type: 'force', name: '规费'},
     {type: 'profit', name: '利润'},
-    {type: 'risk', name: '风险费'},
-    {type: 'labourDiff', name: '人工价差'},
-    {type: 'materialDiff', name: '材料价差'},
-    {type: 'machineDiff', name: '机械价差'},
-    {type: 'adjustLabour', name: '调整人工费'},
-    {type: 'adjustMachineLabour', name: '调整机上人工费'},
-    {type: 'unratedMaterial', name: '未计价材料费'},
-    {type: 'organizeMeasures', name: '组织措施费'},
-    {type: 'safeCivilization', name: '安全文明施工费'},
-    {type: 'night', name: '夜间施工费'},
-    {type: 'secondHandling', name: '二次搬运费'},
-    {type: 'winterRainy', name: '冬雨季施工增加费'},
-    {type: 'protection', name: '已完工程及设备保护费'},
-    {type: 'clean', name: '工程定位复测点交及场地清理费'},
-    {type: 'quotaDetermine', name: '工程定额测定费'},
-    {type: 'materialInspect', name: '材料检验试验费'},
-    {type: 'acceptance', name: '住宅工程质量分户验收费'},
-    {type: 'docManage', name: '档案管理费'},
-    {type: 'forceFee', name: '规费'},
-    {type: 'fiveOne', name: '五险一金'},
-    {type: 'sewage', name: '工程排污费'},
     {type: 'tax', name: '税金'},
-
-// {type: 'estimate', name: '暂估费'},
-    {type: 'common', name: '工程造价'},
-    {type: 'fee1', name: '费用1'}//,
-    // {type: 'fee2', name: '费用2'},
-    // {type: 'fee3', name: '费用3'},
-    // {type: 'fee4', name: '费用4'},
-    // {type: 'fee5', name: '费用5'},
-    // {type: 'fee6', name: '费用6'},
-    // {type: 'fee7', name: '费用7'},
-    // {type: 'fee8', name: '费用8'},
-    // {type: 'fee9', name: '费用9'}
+    {type: 'common', name: '建安费'}
+    // {type: 'fee1', name: '费用1'},
+    // {type: 'fee2', name: '费用2'}
 
 ];
 //8-27 zhang 这个已经不能用来判断工程类型了

web/over_write/js/chongqing_2018.js

@@ -46,9 +46,9 @@ if(typeof materialComponent !== 'undefined'){
 }
 
 // CSL, 2018-08-21 计算程序、基数 的覆盖。---------------------------------------------------------------------------------
-let isCQ2018 = true;
+// let isCQ2018 = true;
 
-if(typeof baseMaterialTypes !== 'undefined'){
+/*if(typeof baseMaterialTypes !== 'undefined'){
     baseMaterialTypes.push(gljType.OTHER_MATERIAL);
     allMaterialTypes.delete(gljType.EQUIPMENT);
     baseMachineTypes.delete(gljType.MACHINE_COMPOSITION);
@@ -56,10 +56,10 @@ if(typeof baseMaterialTypes !== 'undefined'){
         gljType.INSPECTION_FEE, gljType.MAINTENANCE, gljType.DISMANTLING_FREIGHT_FEE,
         gljType.VERIFICATION_FEE, gljType.OTHER_FEE, gljType.OTHER_MACHINE_USED);
     baseMachineMasterTypes.push(gljType.INSTRUMENT);
-}
+}*/
 
 
-function overwriteRationCalcBases (taxType){
+/*function overwriteRationCalcBases (taxType){
     if (rationCalcBases){
         for (let key in rationCalcBases) {
             delete rationCalcBases[key];
@@ -90,7 +90,7 @@ function overwriteRationCalcBases (taxType){
         rationCalcBases['材料费价差'] = function (node, isTender) {
             return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptDiffPrice, isTender);
         };
-/*        if (isJY){
+/!*        if (isJY){
             rationCalcBases['计价材料价差'] = function (node, isTender) {
                 let baseMaterialTypesWithoutOtherMaterial = [
                     gljType.GENERAL_MATERIAL,
@@ -102,7 +102,7 @@ function overwriteRationCalcBases (taxType){
                 ];
                 return calcTools.rationBaseFee(node, baseMaterialTypesWithoutOtherMaterial, priceTypes.ptDiffPrice, isTender);
             };
-        };*/
+        };*!/
         rationCalcBases['机上人工费价差'] = function (node, isTender) {
             return calcTools.rationBaseFee(node, [gljType.MACHINE_LABOUR], priceTypes.ptDiffPrice, isTender);
         };
@@ -131,9 +131,9 @@ function overwriteRationCalcBases (taxType){
             rationCalcBases['安拆费及场外运输费'] = function (node, isTender) {
                 return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.DISMANTLING_FREIGHT_FEE, isTender);
             };
-/*            rationCalcBases['燃料动力费'] = function (node, isTender) {
+/!*            rationCalcBases['燃料动力费'] = function (node, isTender) {
                 return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.FUEL_POWER_FEE, isTender);
-            };*/
+            };*!/
             rationCalcBases['定额仪器仪表费'] = function (node, isTender) {
                 return calcTools.rationBaseFee(node, [gljType.INSTRUMENT], priceTypes.ptBasePrice, isTender);
             };
@@ -175,9 +175,9 @@ function overwriteRationCalcBases (taxType){
         //         return 0;
         // };
     };
-};
+};*/
 
-(function overwriteFeeTypes() {
+/*(function overwriteFeeTypes() {
     if (typeof cpFeeTypes == 'undefined') return;
     cpFeeTypes = [
         {type: 'marketLabour', name: '人工费'},
@@ -199,7 +199,7 @@ function overwriteRationCalcBases (taxType){
         {type: 'tax', name: '税金'},
         {type: 'common', name: '建安费'}
     ];
-})();
+})();*/
 
 
 //清单计算基数相关