update

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

@@ -3,92 +3,6 @@
  * 计算程序。所有定额、清单、父清单的计算都从此入。
  */
 
-/*  新版GLD 取消了默认清单模板，所以这里废弃。先留着，预防不时之需。
-let defaultBillTemplate = {
-    ID: 15,
-    name: "清单公式",
-    calcItems: [
-        {
-            ID: 1,
-            code: "1",
-            name: "定额直接费",
-            dispExpr: "F2+F3+F4",
-            statement: "人工费+材料费+机械费",
-            feeRate: null,
-            memo: ''
-        },
-        {
-            ID: 2,
-            code: "1.1",
-            name: "人工费",
-            dispExpr: "HJ",
-            statement: "合计",
-            feeRate: 50,
-            fieldName: 'labour',
-            memo: ''
-        },
-        {
-            ID: 3,
-            code: "1.2",
-            name: "材料费",
-            dispExpr: "HJ",
-            statement: "合计",
-            feeRate: 30,
-            fieldName: 'material',
-            memo: ''
-        },
-        {
-            ID: 4,
-            code: "1.3",
-            name: "机械费",
-            dispExpr: "HJ",
-            statement: "合计",
-            feeRate: 20,
-            fieldName: 'machine',
-            memo: ''
-        },
-        {
-            ID: 5,
-            code: "2",
-            name: "企业管理费",
-            dispExpr: "F1",
-            statement: "定额直接费",
-            feeRate: null,
-            fieldName: 'manage',
-            memo: ''
-        },
-        {
-            ID: 6,
-            code: "3",
-            name: "利润",
-            dispExpr: "F1",
-            statement: "定额直接费",
-            feeRate: null,
-            fieldName: 'profit',
-            memo: ''
-        },
-        {
-            ID: 7,
-            code: "4",
-            name: "风险费用",
-            dispExpr: "F1",
-            statement: "定额直接费",
-            feeRate: null,
-            fieldName: 'risk',
-            memo: ''
-        },
-        {
-            ID: 8,
-            code: "5",
-            name: "综合单价",
-            dispExpr: "F1+F5+F6+F7",
-            statement: "定额直接费+企业管理费+利润+风险费用",
-            feeRate: null,
-            fieldName: 'common',
-            memo: ''
-        }
-    ]
-};*/
 let calcTools = {
     getNodeByFlag: function (flag) {
         let bill = cbTools.findBill(flag);

web/over_write/js/chongqing_2018.js

@@ -177,37 +177,29 @@ function overwriteRationCalcBases (taxType){
     };
 };
 
-var cpFeeTypes2018 = [
-    {type: 'rationUnitPrice', name: '定额综合单价'},
-    {type: 'labour', name: '人工费'},
-    {type: 'material', name: '材料费'},
-    {type: 'machine', name: '施工机具使用费'},
-    {type: 'mainMaterial', name: '主材费'},
-    {type: 'manage', name: '企业管理费'},
-    {type: 'profit', name: '利润'},
-    {type: 'risk', name: '一般风险费'},
-    {type: 'labourDiff', name: '人工价差'},
-    {type: 'materialDiff', name: '材料价差'},
-    {type: 'machineDiff', name: '施工机具使用价差'},
-    {type: 'otherRisk', name: '其他风险费'},
-    {type: 'unratedMaterial', name: '未计价材料费'},
-    {type: 'organizeMeasures', name: '组织措施费'},
-    {type: 'safeCivilization', name: '安全文明施工费'},
-    {type: 'document', name: '建设工程竣工档案编制费'},
-    {type: 'acceptance', name: '住宅工程质量分户验收费'},
-    {type: 'forceFee', name: '规费'},
-    {type: 'tax', name: '税金'},
-    {type: 'VAT', name: '增值税'},
-    {type: 'surtax', name: '附加税'},
-    {type: 'environmentTax', name: '环境保护税'},
-    {type: 'common', name: '工程造价'}
-];
-
-if(typeof cpFeeTypes !== 'undefined'){
-    cpFeeTypes.splice(0, cpFeeTypes.length);
-    for (let e of cpFeeTypes2018) cpFeeTypes.push(e);
-}
-
+(function overwriteFeeTypes() {
+    if (typeof cpFeeTypes == 'undefined') return;
+    cpFeeTypes = [
+        {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: 'tax', name: '税金'},
+        {type: 'common', name: '建安费'}
+    ];
+})();
 
 
 //清单计算基数相关