江西计算基数

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

@@ -934,9 +934,9 @@ let rationCalcBasesNameKinds = {
     JC_ZCF:     ['主材费价差'],
     JC_SBF:     ['设备费价差'],
 
-    JG_RGF:     ['甲供定额基价人工费', '甲供定额人工费'],
-    JG_CLF:     ['甲供定额基价材料费', '甲供定额材料费'],
-    JG_JXF:     ['甲供定额基价机械费', '甲供定额施工机具费'],
+    JG_RGF:     ['甲供定额基价人工费', '甲供定额人工费', '甲供人工费'],
+    JG_CLF:     ['甲供定额基价材料费', '甲供定额材料费', '甲供材料费'],
+    JG_JXF:     ['甲供定额基价机械费', '甲供定额施工机具费', '甲供机械费'],
     JG_ZCF:     ['甲供主材费'],
     JG_SBF:     ['甲供设备费'],
 

web/over_write/js/jiangxi_2017.js

@@ -4,31 +4,32 @@
 
 let isJX2017 = true;
 
+// 一般计税取不含税市场价、不含税定额价。简易计税取含税市场价、含税定额价。打开项目时，4个价格根据计税类型只载入其二，所以这里可不作区分。
 function overwriteRationCalcBases (taxType){
     if (typeof rationCalcBases == 'undefined') return;
     for (let key in rationCalcBases) delete rationCalcBases[key];
-    let isJY = taxType == '2';
+    // let isJY = taxType == '2';
 
     rationCalcBases['人工费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptBasePrice, isTender);
+        return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender);
     };
     rationCalcBases['定额人工费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptBasePrice, isTender);
     };
     rationCalcBases['材料费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptBasePrice, isTender);
+        return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender);
     };
     rationCalcBases['机械费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE, gljType.INSTRUMENT, gljType.OTHER_MACHINE_USED], priceTypes.ptBasePrice, isTender);
+        return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
     };
     rationCalcBases['定额机械费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE, gljType.INSTRUMENT, gljType.OTHER_MACHINE_USED], priceTypes.ptBasePrice, isTender);
+        return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptBasePrice, isTender);
     };
     rationCalcBases['主材费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptMarketPrice, isTender);
     };
     rationCalcBases['设备费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender);
+        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
     };
     rationCalcBases['人工费价差'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptDiffPrice, isTender);
@@ -37,7 +38,7 @@ function overwriteRationCalcBases (taxType){
         return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptDiffPrice, isTender);
     };
     rationCalcBases['机械费价差'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE], priceTypes.ptDiffPrice, isTender);
+        return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptDiffPrice, isTender);
     };
     rationCalcBases['主材费价差'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptDiffPrice, isTender);
@@ -49,13 +50,13 @@ function overwriteRationCalcBases (taxType){
         return calcTools.labourDays(node, isTender);
     };
     rationCalcBases['甲供人工费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供定额人工费', isTender);
+        return calcTools.partASupplyFee(node, '甲供人工费', isTender);
     };
     rationCalcBases['甲供材料费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供定额材料费', isTender);
+        return calcTools.partASupplyFee(node, '甲供材料费', isTender);
     };
     rationCalcBases['甲供机械费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供定额基价机械费', isTender);
+        return calcTools.partASupplyFee(node, '甲供机械费', isTender);
     };
     rationCalcBases['甲供主材费'] = function (node, isTender) {
         return calcTools.partASupplyFee(node, '甲供主材费', isTender);
@@ -64,13 +65,13 @@ function overwriteRationCalcBases (taxType){
         return calcTools.partASupplyFee(node, '甲供设备费', isTender);
     };
     rationCalcBases['甲定人工费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定定额基价人工费', isTender);
+        return calcTools.partASupplyFee(node, '甲定人工费', isTender);
     };
     rationCalcBases['甲定材料费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定定额基价材料费', isTender);
+        return calcTools.partASupplyFee(node, '甲定材料费', isTender);
     };
     rationCalcBases['甲定机械费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定定额基价机械费', isTender);
+        return calcTools.partASupplyFee(node, '甲定机械费', isTender);
     };
     rationCalcBases['甲定主材费'] = function (node, isTender) {
         return calcTools.partASupplyFee(node, '甲定主材费', isTender);
@@ -83,31 +84,31 @@ function overwriteRationCalcBases (taxType){
     };
     rationCalcBases['分包人工费'] = function (node, isTender) {
         if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptBasePrice, isTender)
+            return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender)
         else
             return 0;
     };
     rationCalcBases['分包材料费'] = function (node, isTender) {
         if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptBasePrice, isTender)
+            return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender)
         else
             return 0;
     };
     rationCalcBases['分包机械费'] = function (node, isTender) {
         if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE], priceTypes.ptBasePrice, isTender)
+            return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender)
         else
             return 0;
     };
     rationCalcBases['分包主材费'] = function (node, isTender) {
         if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptBasePrice, isTender)
+            return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptMarketPrice, isTender)
         else
             return 0;
     };
     rationCalcBases['分包设备费'] = function (node, isTender) {
         if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender)
+            return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender)
         else
             return 0;
     };