Merge branch 'budget' of http://192.168.1.41:3000/SmartCost/ConstructionCost into budget

modules/main/templates/constructionBillsTemplate.js

@@ -20,30 +20,30 @@ const buildingTemplate = [
   { ID: 226, ParentID: 22, NextSiblingID: 227, code: '2.2.6', name: '前期工作费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 2261, ParentID: 226, NextSiblingID: 2262, code: '2.2.6.1', name: '可行性研究费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 2262, ParentID: 226, NextSiblingID: 2263, code: '2.2.6.2', name: '环境影响评价费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2263, ParentID: 226, NextSiblingID: 2264, code: '2.2.6.3', name: '节能评估费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2264, ParentID: 226, NextSiblingID: 2265, code: '2.2.6.4', name: '社会稳定风险评估费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2265, ParentID: 226, NextSiblingID: 2266, code: '2.2.6.5', name: '防洪评价费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2266, ParentID: 226, NextSiblingID: 2267, code: '2.2.6.6', name: '文物勘探及保护费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2267, ParentID: 226, NextSiblingID: -1, code: '2.2.6.7', name: '其他前期工作费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2263, ParentID: 226, NextSiblingID: 2264, code: '2.2.6.3', name: '地震安全评价费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2264, ParentID: 226, NextSiblingID: 2265, code: '2.2.6.4', name: '地质灾害危险性评估费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2265, ParentID: 226, NextSiblingID: 2266, code: '2.2.6.5', name: '节能评估费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2266, ParentID: 226, NextSiblingID: 2267, code: '2.2.6.6', name: '社会稳定风险评估费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2267, ParentID: 226, NextSiblingID: 2268, code: '2.2.6.7', name: '防洪评价费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2268, ParentID: 226, NextSiblingID: 2269, code: '2.2.6.8', name: '文物勘探及保护费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2269, ParentID: 226, NextSiblingID: -1, code: '2.2.6.9', name: '其他前期工作费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 227, ParentID: 22, NextSiblingID: 228, code: '2.2.7', name: '研究试验费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 228, ParentID: 22, NextSiblingID: 229, code: '2.2.8', name: '勘察设计费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2281, ParentID: 228, NextSiblingID: 2282, code: '2.2.8.1', name: '勘察费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2282, ParentID: 228, NextSiblingID: -1, code: '2.2.8.2', name: '设计费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.DESIGN_FEE }], type: billType.BILL },
-  { ID: 229, ParentID: 22, NextSiblingID: 2210, code: '2.2.9', name: '咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2291, ParentID: 229, NextSiblingID: 2292, code: '2.2.9.1', name: '设计咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.DESIGN_COUNSEL_FEE }], type: billType.BILL },
-  { ID: 2292, ParentID: 229, NextSiblingID: 2293, code: '2.2.9.2', name: '工程造价咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2293, ParentID: 229, NextSiblingID: -1, code: '2.2.9.3', name: '施工图审查费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2210, ParentID: 22, NextSiblingID: 2211, code: '2.2.10', name: '全过程工程咨询服务费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2211, ParentID: 22, NextSiblingID: 2212, code: '2.2.11', name: '引进技术和设备其他费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2212, ParentID: 22, NextSiblingID: 2213, code: '2.2.12', name: '专利及专有技术使用费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2213, ParentID: 22, NextSiblingID: 2214, code: '2.2.13', name: '工程保险费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2214, ParentID: 22, NextSiblingID: 2215, code: '2.2.14', name: '特殊设备安全监督检验费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2215, ParentID: 22, NextSiblingID: 2216, code: '2.2.15', name: '安全生产保障费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2216, ParentID: 22, NextSiblingID: 2217, code: '2.2.16', name: '水土保持补偿费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2217, ParentID: 22, NextSiblingID: 2218, code: '2.2.17', name: '城市基础设施配套费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2218, ParentID: 22, NextSiblingID: 2219, code: '2.2.18', name: '人防易地建设费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2219, ParentID: 22, NextSiblingID: -1, code: '2.2.19', name: '其他费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 23, ParentID: 2, NextSiblingID: -1, code: '2.3', name: '与试运行有关的其他费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 228, ParentID: 22, NextSiblingID: 229, code: '2.2.8', name: '工程勘察费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 229, ParentID: 22, NextSiblingID: 2210, code: '2.2.9', name: '工程设计费', unit: '', calcBase: '', quantity: '',  flags: [{ fieldName: 'fixed', flag: fixedFlag.DESIGN_FEE }], type: billType.BILL },
+  { ID: 2210, ParentID: 22, NextSiblingID: 2211, code: '2.2.10', name: '咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 22101, ParentID: 2210, NextSiblingID: 22102, code: '2.2.10.1', name: '设计咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.DESIGN_COUNSEL_FEE }], type: billType.BILL },
+  { ID: 22102, ParentID: 2210, NextSiblingID: -1, code: '2.2.10.2', name: '工程造价咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2211, ParentID: 22, NextSiblingID: 2212, code: '2.2.11', name: '全过程工程咨询服务费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2212, ParentID: 22, NextSiblingID: 2213, code: '2.2.12', name: '引进技术和设备其他费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2213, ParentID: 22, NextSiblingID: 2214, code: '2.2.13', name: '专利及专有技术使用费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2214, ParentID: 22, NextSiblingID: 2215, code: '2.2.14', name: '工程保险费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2215, ParentID: 22, NextSiblingID: 2216, code: '2.2.15', name: '特殊设备安全监督检验费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2216, ParentID: 22, NextSiblingID: 2217, code: '2.2.16', name: '安全生产保障费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2217, ParentID: 22, NextSiblingID: 2218, code: '2.2.17', name: '水土保持补偿费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2218, ParentID: 22, NextSiblingID: 2219, code: '2.2.18', name: '城市建设配套费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2219, ParentID: 22, NextSiblingID: 2220, code: '2.2.19', name: '人防易地建设费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2220, ParentID: 22, NextSiblingID: -1, code: '2.2.20', name: '其他费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 23, ParentID: 2, NextSiblingID: -1, code: '2.3', name: '与试运行及生产有关的其他费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 231, ParentID: 23, NextSiblingID: 232, code: '2.3.1', name: '综合联调及试运行费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 232, ParentID: 23, NextSiblingID: 233, code: '2.3.2', name: '生产准备及开办费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 2321, ParentID: 232, NextSiblingID: 2322, code: '2.3.2.1', name: '生产职工培训费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
@@ -53,9 +53,8 @@ const buildingTemplate = [
   { ID: 31, ParentID: 3, NextSiblingID: 32, code: '3.1', name: '基本预备费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.BASIC_BUDGET_RESERVE }], type: billType.BILL },
   { ID: 32, ParentID: 3, NextSiblingID: -1, code: '3.2', name: '价差预备费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.DIFF_BUDGET_RESERVE }], type: billType.BILL },
   { ID: 4, ParentID: -1, NextSiblingID: 5, code: '4', name: '专项费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.CONSTRUCTION_SPECIAL_FEE }], type: billType.DXFY },
-  { ID: 41, ParentID: 4, NextSiblingID: 42, code: '4.1', name: '车辆购置费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 42, ParentID: 4, NextSiblingID: 43, code: '4.2', name: '建设期贷款利息', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.LOAN_INTEREST }], type: billType.BILL },
-  { ID: 43, ParentID: 4, NextSiblingID: -1, code: '4.3', name: '铺底流动资金', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 41, ParentID: 4, NextSiblingID: 42, code: '4.1', name: '建设期贷款利息', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.LOAN_INTEREST }], type: billType.BILL },
+  { ID: 42, ParentID: 4, NextSiblingID: -1, code: '4.2', name: '铺底流动资金', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 5, ParentID: -1, NextSiblingID: -1, code: '5', name: '建设项目总概算', unit: '', calcBase: '{工程费用}+{工程建设其他费用}+{预备费}+{专项费用}', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.CONSTRUCTION_BUDGET }], type: billType.DXFY },
 ];
 
@@ -69,11 +68,11 @@ const railTemplate = [
   { ID: 212, ParentID: 21, NextSiblingID: 213, code: '2.1.2', name: '临时占地费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 213, ParentID: 21, NextSiblingID: 214, code: '2.1.3', name: '树木及绿化赔偿费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 214, ParentID: 21, NextSiblingID: 215, code: '2.1.4', name: '道路及市政设施损坏赔偿费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 215, ParentID: 21, NextSiblingID: 216, code: '2.1.5', name: '管线迁改费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 215, ParentID: 21, NextSiblingID: 216, code: '2.1.5', name: '管线迁改费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.PIPELINE_CHANGE_FEE }], type: billType.BILL },
   { ID: 216, ParentID: 21, NextSiblingID: -1, code: '2.1.6', name: '交通疏解费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 22, ParentID: 2, NextSiblingID: 23, code: '2.2', name: '与项目建设有关的其他费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 221, ParentID: 22, NextSiblingID: 222, code: '2.2.1', name: '场地准备费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 222, ParentID: 22, NextSiblingID: 223, code: '2.2.2', name: '项目建设管理费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 221, ParentID: 22, NextSiblingID: 222, code: '2.2.1', name: '场地准备及临时设施费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 222, ParentID: 22, NextSiblingID: 223, code: '2.2.2', name: '项目建设管理费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.CONSTRUCTION_MANAGE_FEE }], type: billType.BILL },
   { ID: 223, ParentID: 22, NextSiblingID: 224, code: '2.2.3', name: '建设工程监理费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 224, ParentID: 22, NextSiblingID: 225, code: '2.2.4', name: '招标代理服务费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 225, ParentID: 22, NextSiblingID: 226, code: '2.2.5', name: '招标交易服务费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
@@ -89,35 +88,34 @@ const railTemplate = [
   { ID: 2269, ParentID: 226, NextSiblingID: 22610, code: '2.2.6.9', name: '文物勘探及保护费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 22610, ParentID: 226, NextSiblingID: -1, code: '2.2.6.10', name: '其他前期工作费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 227, ParentID: 22, NextSiblingID: 228, code: '2.2.7', name: '研究试验费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 228, ParentID: 22, NextSiblingID: 229, code: '2.2.8', name: '勘察设计费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2281, ParentID: 228, NextSiblingID: 2282, code: '2.2.8.1', name: '勘察费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2282, ParentID: 228, NextSiblingID: -1, code: '2.2.8.2', name: '设计费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.DESIGN_FEE }], type: billType.BILL },
-  { ID: 229, ParentID: 22, NextSiblingID: 2210, code: '2.2.9', name: '咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2291, ParentID: 229, NextSiblingID: 2292, code: '2.2.9.1', name: '设计咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2292, ParentID: 229, NextSiblingID: 2293, code: '2.2.9.2', name: '工程造价咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2293, ParentID: 229, NextSiblingID: -1, code: '2.2.9.3', name: '施工图审查费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2210, ParentID: 22, NextSiblingID: 2211, code: '2.2.10', name: '全过程工程咨询服务费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2211, ParentID: 22, NextSiblingID: 2212, code: '2.2.11', name: '引进技术和设备其他费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2212, ParentID: 22, NextSiblingID: 2213, code: '2.2.12', name: '专利及专有技术使用费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2213, ParentID: 22, NextSiblingID: 2214, code: '2.2.13', name: '特殊设备安全监督检验费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2214, ParentID: 22, NextSiblingID: 2215, code: '2.2.14', name: '工程保险费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2215, ParentID: 22, NextSiblingID: 2216, code: '2.2.15', name: '安全生产保障费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2216, ParentID: 22, NextSiblingID: 2217, code: '2.2.16', name: '配合辅助工程费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2217, ParentID: 22, NextSiblingID: -1, code: '2.2.17', name: '其他', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 228, ParentID: 22, NextSiblingID: 229, code: '2.2.8', name: '工程勘察费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 229, ParentID: 22, NextSiblingID: 2210, code: '2.2.9', name: '工程设计费', unit: '', calcBase: '', quantity: '',  flags: [{ fieldName: 'fixed', flag: fixedFlag.DESIGN_FEE }], type: billType.BILL },
+  { ID: 2210, ParentID: 22, NextSiblingID: 2211, code: '2.2.10', name: '咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 22101, ParentID: 2210, NextSiblingID: 22102, code: '2.2.10.1', name: '设计咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.DESIGN_COUNSEL_FEE }], type: billType.BILL },
+  { ID: 22102, ParentID: 2210, NextSiblingID: 22103, code: '2.2.10.2', name: '工程造价咨询费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 22103, ParentID: 2210, NextSiblingID: -1, code: '2.2.10.3', name: '施工图审查费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2211, ParentID: 22, NextSiblingID: 2212, code: '2.2.11', name: '全过程工程咨询服务费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2212, ParentID: 22, NextSiblingID: 2213, code: '2.2.12', name: '引进技术和设备其他费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2213, ParentID: 22, NextSiblingID: 2214, code: '2.2.13', name: '专利及专有技术使用费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2214, ParentID: 22, NextSiblingID: 2215, code: '2.2.14', name: '特殊设备安全监督检验费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2215, ParentID: 22, NextSiblingID: 2216, code: '2.2.15', name: '工程保险费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2216, ParentID: 22, NextSiblingID: 2217, code: '2.2.16', name: '安全生产保障费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2217, ParentID: 22, NextSiblingID: 2219, code: '2.2.17', name: '配合辅助工程费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2219, ParentID: 22, NextSiblingID: -1, code: '2.2.19', name: '其他费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 23, ParentID: 2, NextSiblingID: -1, code: '2.3', name: '与试运行有关的其他费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 231, ParentID: 23, NextSiblingID: 232, code: '2.3.1', name: '生产准备及开办费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2311, ParentID: 231, NextSiblingID: 2312, code: '2.3.1.1', name: '生产职业培训费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2312, ParentID: 231, NextSiblingID: 2313, code: '2.3.1.2', name: '生产办公和生活家具用具购置费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2313, ParentID: 231, NextSiblingID: -1, code: '2.3.1.3', name: '工器具购置费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 232, ParentID: 23, NextSiblingID: 233, code: '2.3.2', name: '综合联调及试运行费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2321, ParentID: 232, NextSiblingID: 2322, code: '2.3.2.1', name: '综合联调费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
-  { ID: 2322, ParentID: 232, NextSiblingID: -1, code: '2.3.2.2', name: '试运行费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 231, ParentID: 23, NextSiblingID: 232, code: '2.3.1', name: '综合联调及试运行费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2311, ParentID: 231, NextSiblingID: 2312, code: '2.3.1.1', name: '综合联调费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.JOINT_DEBUGGING_FEE }], type: billType.BILL },
+  { ID: 2312, ParentID: 231, NextSiblingID: -1, code: '2.3.1.2', name: '试运行费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 232, ParentID: 23, NextSiblingID: 233, code: '2.3.2', name: '生产准备及开办费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2321, ParentID: 232, NextSiblingID: 2322, code: '2.3.2.1', name: '生产职工培训费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2322, ParentID: 232, NextSiblingID: 2323, code: '2.3.2.2', name: '生产办公和生活家具用具购置费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2323, ParentID: 232, NextSiblingID: -1, code: '2.3.2.3', name: '工器具购置费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 233, ParentID: 23, NextSiblingID: -1, code: '2.3.3', name: '试运营前安全评价费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 3, ParentID: -1, NextSiblingID: 4, code: '3', name: '预备费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.BUDGET_RESERVE }], type: billType.DXFY },
   { ID: 31, ParentID: 3, NextSiblingID: 32, code: '3.1', name: '基本预备费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.BASIC_BUDGET_RESERVE }], type: billType.BILL },
   { ID: 32, ParentID: 3, NextSiblingID: -1, code: '3.2', name: '价差预备费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.DIFF_BUDGET_RESERVE }], type: billType.BILL },
   { ID: 4, ParentID: -1, NextSiblingID: 5, code: '4', name: '专项费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.CONSTRUCTION_SPECIAL_FEE }], type: billType.DXFY },
-  { ID: 41, ParentID: 4, NextSiblingID: 42, code: '4.1', name: '车辆购置费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 41, ParentID: 4, NextSiblingID: 42, code: '4.1', name: '车辆购置费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.VEHICLE_PURCHASE_FEE }], type: billType.BILL },
   { ID: 42, ParentID: 4, NextSiblingID: 43, code: '4.2', name: '建设期贷款利息', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.LOAN_INTEREST }], type: billType.BILL },
   { ID: 43, ParentID: 4, NextSiblingID: -1, code: '4.3', name: '铺底流动资金', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 5, ParentID: -1, NextSiblingID: -1, code: '5', name: '建设项目总概算', unit: '', calcBase: '{工程费用}+{工程建设其他费用}+{预备费}+{专项费用}', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.CONSTRUCTION_BUDGET }], type: billType.DXFY },

modules/pm/models/project_model.js

@@ -256,7 +256,7 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
                             if (item.key === 'engineeringName') {
                                 item.value = data.updateData.name;
                             } else if (item.key === 'fileKind') {
-                                item.value = {'1': '投标', '2': '招标'}[data.updateData.property.fileKind]
+                                item.value = {'1': '建筑安装工程', '2': '城市轨道交通工程'}[data.updateData.property.budgetType]
                             } else if (item.key === 'taxModel') {
                                 item.value = {'1': '一般计税法', '2': '简易计税法'}[data.updateData.property.taxType]
                             }

modules/reports/facade/rpt_tpl_data_facade.js

@@ -50,7 +50,7 @@ async function prepareMultiProjectData(userId, prjIds, filter) {
                             rawDataObj = {};
                             rawDataObj.prj = rst;
                             rawDataObj.prjData = results;
-                            /*
+                            //*
                             prjMdl.project.getBasicInfo(prjId).then(function(basicRst) {
                                 if (basicRst !== null && basicRst !== undefined) {
                                     let doc = (rawDataObj.prj._doc)?rawDataObj.prj._doc:rawDataObj.prj;

modules/reports/util/rpt_construct_data_util.js

@@ -1334,6 +1334,7 @@ function getDeepProperty(propKey, orgObj, destArr) {
     let parent = orgObj, lastVal = null;
     for (let key of keys) {
         if (parent instanceof Array) {
+            lastVal = null;
             for (let item of parent) {
                 if (item[dftPropKey] === key) {
                     lastVal = getActPropertyVal(dftPropVal, secDftPropVal, item);

public/common_constants.js

@@ -109,7 +109,14 @@
         LOAN_INTEREST: 1010,
         // 建设项目总概算
         CONSTRUCTION_BUDGET: 1011,
-
+        // 项目建设管理费
+        CONSTRUCTION_MANAGE_FEE: 1012,
+        // 管线迁改费
+        PIPELINE_CHANGE_FEE: 1013,
+        // 车辆购置费vehicle
+        VEHICLE_PURCHASE_FEE: 1014,
+        // 综合联调费
+        JOINT_DEBUGGING_FEE: 1015,
     };
     // 清单类型
     const billType = {

web/building_saas/budget-summary/js/budgetSummarySetting.js

@@ -23,7 +23,7 @@ const budgetInstallationSetting = {
             font: "Arial"
         }
     }, {
-        width: 140,
+        width: 200,
         head: {
             titleNames: ["名称"],
             spanCols: [1],
@@ -283,7 +283,7 @@ const budgetRailSetting = {
             font: "Arial"
         }
     }, {
-        width: 140,
+        width: 200,
         head: {
             titleNames: ["名称"],
             spanCols: [1],

web/building_saas/main/js/models/calc_base.js

@@ -1194,6 +1194,14 @@ let baseFigureTemplate = {
     JCYBF: function () {
         return 0;
     },
+    // 管线迁改费
+    GXQGF: function () {
+        return cbTools.getBillsFee(fixedFlag.PIPELINE_CHANGE_FEE, 'common', 'totalFee');
+    },
+    // 车辆购置费
+    CLGZF: function () {
+        return cbTools.getBillsFee(fixedFlag.VEHICLE_PURCHASE_FEE, 'common', 'totalFee');
+    }
 };
 const progreesiveBases = ['SZDLGCAQWMSGF', 'SZQLGCAQWMSGF', 'SZSDGCAQWMSGF', 'CGDGGCAQWMSGF', 'CGGJQGCAQWMSGF', 'CGDXGCAQWMSGF', 'CGGDGCAQWMSGF'];
 let figureClassTemplate = {
@@ -1311,7 +1319,7 @@ const budgetFigureMap = {
     },
     '设计费': {
         base: 'SJF',
-        fixedFlag: fixedFlag.DESIGN_COUNSEL_FEE,
+        fixedFlag: fixedFlag.DESIGN_FEE,
         filter: [fixedFlag.DESIGN_COUNSEL_FEE],
         pick: true,
     },
@@ -1333,6 +1341,18 @@ const budgetFigureMap = {
         filter: [fixedFlag.CONSTRUCTION_FEE, fixedFlag.CONSTRUCTION_OTHER_FEE, fixedFlag.BUDGET_RESERVE, fixedFlag.CONSTRUCTION_SPECIAL_FEE],
         pick: false,
     },
+    '管线迁改费': {
+        base: 'GXQGF',
+        fixedFlag: fixedFlag.PIPELINE_CHANGE_FEE,
+        filter: [fixedFlag.CONSTRUCTION_MANAGE_FEE],
+        pick: true,
+    },
+    '车辆购置费': {
+        base: 'CLGZF',
+        fixedFlag: fixedFlag.VEHICLE_PURCHASE_FEE,
+        filter: [fixedFlag.JOINT_DEBUGGING_FEE],
+        pick: true,
+    },
     /* '价差预备费': {
         base: 'JCYBF',
         fixedFlag: fixedFlag.DIFF_BUDGET_RESERVE,

web/building_saas/main/js/views/calc_base_view.js

@@ -337,7 +337,7 @@ let calcBaseView = {
                 const changedCells = [{ row, col }];
                 budgetSheet.setValue(row, col, me.getInputExpr());
                 budgetSummaryObj.edit(budgetSheet, changedCells);
-                if (projectObj.project.calcBase.success || selected.data.calcBase === me.getInputExpr()) {
+                if (projectObj.project.calcBase.success || budgetTree.selected.data.calcBase === me.getInputExpr()) {
                     $('#calcBaseFeeRate').modal('hide');
                 }
             }