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

modules/main/facade/info_price_facade.js

@@ -34,7 +34,7 @@ let nameWeightMap ={
 
 
 async function getOptions(data,compilation){//data 是预留对象，暂时不用
-  let compilationID = compilation._id;
+  let compilationID = '5b52b027fd3bb0000b257cf8';
   let areaMap={};
   let periodMap={};
   let areas =await infoAreasModel.find({"compilationID":compilationID}).lean();
@@ -59,7 +59,7 @@ async function getOptions(data,compilation){//data 是预留对象，暂时不
 async function getClassByAreaID(data,compilation){
   //要先知道根据期数和编办查找库ID
   let newList = [];
-  let lib = await infoLibModel.findOne({compilationID:compilation._id,period:data.period})
+  let lib = await infoLibModel.findOne({compilationID:'5b52b027fd3bb0000b257cf8',period:data.period})
   if(lib){
     let tList =await getClassList(data.areaID,lib.ID);
     newList.push(...tList);
@@ -99,7 +99,7 @@ async function getClassByAreaID(data,compilation){
 
 async function getDataByCondition(data,compilation){
   let result = {};
-  data.condition["compilationID"] = compilation._id;
+  data.condition["compilationID"] = '5b52b027fd3bb0000b257cf8';
   //特殊处理重庆的，地区选择非“通用”时，搜索范围应是当前选择的地区，加上“通用”中的信息价。
   if (data.condition.commonInfoPriceID) { 
     let idArray = [data.condition.areaID,data.condition.commonInfoPriceID];
@@ -327,7 +327,7 @@ async function getDataByFuzzyMatch(keyword, data){
 
 
 async function mutiApplyInfoPrice(data,compilation){
-  data.condition["compilationID"] = compilation._id;
+  data.condition["compilationID"] = '5b52b027fd3bb0000b257cf8';
   let infoPrices = await infoItemsModel.find(data.condition).lean();
   let tasks = [];
   let projectGLJMap = {};

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 },

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/html/equipment_purchase.html

@@ -2,6 +2,8 @@
 <div class="container-fluid">
     <div class="row">
         <div class="toolsbar px-1 d-flex " style="width: 100%;height: 30px;">
+          <a href="javascript:void(0)" class="btn btn-light btn-sm" id="equipment_insert" data-toggle="tooltip"
+          data-placement="bottom" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
           <a href="javascript:void(0)" class="btn btn-light btn-sm" id="equipment_upLevel" data-toggle="tooltip"
             data-placement="bottom" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
           <a href="javascript:void(0)" class="btn btn-light btn-sm" id="equipment_downLevel" data-toggle="tooltip"

web/building_saas/main/html/main.html

@@ -128,11 +128,11 @@
                 data-placement="bottom" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
              <!--  <a id="switchTznr" href="javascript:void(0);" class="btn btn-light btn-sm"><i class="fa fa-eye"
                 aria-hidden="true"></i> 显示特征</a>  -->
-             <!--  <div class="btn-group ">
+               <div class="btn-group ">
                 <a class="dropdown-toggle btn btn-light btn-sm" data-toggle="dropdown" href="#" id="moreMenuA" role="button"
                   aria-haspopup="true" aria-expanded="false">更多</a>
                 <div class="dropdown-menu dropright" id="moreMenu">
-                  <a id="displayA" href="javascript:void(0);" data-toggle="dropdown"
+                  <!-- <a id="displayA" href="javascript:void(0);" data-toggle="dropdown"
                     class="dropdown-item dropdown-toggle"><i class="fa fa-list-ol"></i> 显示至...</a>
                   <div id="subDisplay" class="dropdown-menu dropdown-menu-left"
                     style="min-width: 6.5rem; position: absolute; transform: translate3d(158px, 3px, 0px); top: 0px; left: 0px; will-change: transform;"
@@ -168,13 +168,13 @@
                   <% } else { %>
                   <a href="javascript:void(0)" class="dropdown-item" name="lockBills"> <i class="fa fa-lock"
                       aria-hidden="true"></i> 锁定清单</a>
-                  <% } %>
+                  <% } %> -->
                   <a id="menu_calc_program_manage" href="javascript:void(0);" class="dropdown-item"><i
                       class="fa fa-calculator" aria-hidden="true"></i> 总计算程序</a>
-                  <a id="menu_index_info" href="javascript:void(0);" style="display: none" class="dropdown-item"><i
-                      class="fa fa-database" aria-hidden="true"></i> 指标信息</a>
+                 <!--  <a id="menu_index_info" href="javascript:void(0);" style="display: none" class="dropdown-item"><i
+                      class="fa fa-database" aria-hidden="true"></i> 指标信息</a> -->
                 </div>
-              </div> -->
+              </div> 
              <!--  <a href="javascript:void(0)" class="btn btn-light btn-sm" id="locate-sub">分项</a>
               <a href="javascript:void(0)" class="btn btn-light btn-sm" id="locate-measure">措施</a>
               <a href="javascript:void(0)" class="btn btn-light btn-sm" id="locate-other">其他</a> -->
@@ -211,6 +211,10 @@
                 <!-- <li class="nav-item">
                               <a class="nav-link px-3" href="javascript:void(0)" id = 'stdBillsTab' relaPanel="#qd">清单规则</a>
                           </li>-->
+                <li class="nav-item">
+                  <a class="nav-link px-1 right-nav-link" href="javascript:void(0)" id='stdBillsGuidanceTab'
+                    relaPanel="#zy">章节表</a>
+                </li>
                 <li class="nav-item" id="li_stdRationTab">
                   <a class="nav-link px-1 right-nav-link" href="javascript:void(0)" id="stdRationTab"
                     relaPanel="#de">定额库</a>

web/building_saas/main/js/controllers/project_controller.js

@@ -154,9 +154,9 @@ ProjectController = {
 
             if (std) {
                 let fixedNode = getRootFixedNode(target);
-                if(!isFlag(fixedNode.data) || (fixedNode.data.flagsIndex.fixed.flag !== fixedFlag.SUB_ENGINERRING && fixedNode.data.flagsIndex.fixed.flag !== fixedFlag.MEASURE)){
+                /* if(!isFlag(fixedNode.data) || (fixedNode.data.flagsIndex.fixed.flag !== fixedFlag.SUB_ENGINERRING && fixedNode.data.flagsIndex.fixed.flag !== fixedFlag.MEASURE)){
                     return false;
-                }
+                } */
                 //焦点行属于分部分项
                 if(fixedNode.data.flagsIndex.fixed.flag === fixedFlag.SUB_ENGINERRING){
                     std.type = billType.FX;
@@ -177,12 +177,11 @@ ProjectController = {
                             return false;
                         }
                     }
-                }
-                else {
+                }else {
                     std.type = billType.BILL;
                 }
-
-                let newCode = project.Bills.newFormatCode(std.code);
+                std.type = billType.FB;
+                let newCode =std.code; // project.Bills.newFormatCode(std.code);
                 newSource = project.Bills.insertStdBills(parentID, nextSiblingID, std, newCode);
             } else {
                 newSource = project.Bills.insertBills(parentID, nextSiblingID);

web/building_saas/main/js/models/bills.js

@@ -198,7 +198,7 @@ var Bills = {
             var newData = null, that = this;
             insertData.forEach(function (data) {
                 if (data.type === idTree.updateType.new) {
-                    data.data.code = that.newFormatCode(stdBillsData.code);
+                    data.data.code = stdBillsData.code;//that.newFormatCode(stdBillsData.code);
                     data.data.name = stdBillsData.name;
                     data.data.unit = stdBillsData.unit;
                     // 工程量计算规则

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');
                 }
             }

web/building_saas/main/js/views/equipment_purchase_view.js

@@ -344,6 +344,33 @@ let equipmentPurchaseObj  = {
     newEquipment:function(ParentID='-1',seq=0){
         return {ID:uuid.v1(),ParentID,seq}
     },
+
+    insertEquipment:async function(number){
+        let me = this;
+        const newData = [];
+        let seq = 0;
+        let ParentID = '-1';
+        let brotherNodes = [];
+        let selected = me.getSelected();
+        if(!selected){//没有选中节点的情况，添加到最后
+            brotherNodes = me.parentMap['-1'];
+            if(brotherNodes && brotherNodes.length > 0){
+                seq = brotherNodes[brotherNodes.length -1].seq;   
+            } 
+        }else{
+            let node = selected;//选中节点时插入为选中的下一行
+            seq = node.seq;
+            ParentID = node.ParentID;
+        }
+        for (let i = 0; i < number; i++) {
+            seq+=1;
+            newData.push(me.newEquipment(ParentID,seq));
+        }
+        let updateData = me.calcSeq(ParentID,seq);
+        updateData.push({documents:newData,type:'insert'});
+        me.updateEquipments(updateData)   
+    },
+
     sumTotal: function(updateData){
         let dataMap = {};
         let temParentMap = {};
@@ -424,7 +451,7 @@ let equipmentPurchaseObj  = {
         this.showData();
         $.bootstrapLoading.end();
     },
-    insertEquipments:async function(equipments){
+  /*   insertEquipments:async function(equipments){
         try {
             $.bootstrapLoading.start();
             let projectID = projectObj.project.ID();
@@ -435,7 +462,7 @@ let equipmentPurchaseObj  = {
             alert('插入失败，请重试');
         }
         $.bootstrapLoading.end();
-    },
+    }, */
     deleteEquipment:async function(ID){
         try {
             let projectID = projectObj.project.ID();
@@ -454,28 +481,7 @@ let equipmentPurchaseObj  = {
             if (!number) {
                 return;
             }  
-            const newData = [];
-            let row = me.rightClickTarget.row;
-            let seq = 0;
-            let ParentID = '-1';
-            let brotherNodes = [];
-            if(row == undefined){//没有选中节点的情况，添加到最后
-                brotherNodes = me.parentMap['-1'];
-                if(brotherNodes && brotherNodes.length > 0){
-                    seq = brotherNodes[brotherNodes.length -1].seq;   
-                } 
-            }else{
-                let node = me.data[row];//选中节点时插入为选中的下一行
-                seq = node.seq;
-                ParentID = node.ParentID;
-            }
-            for (let i = 0; i < number; i++) {
-                seq+=1;
-                newData.push(me.newEquipment(ParentID,seq));
-            }
-            let updateData = me.calcSeq(ParentID,seq);
-            updateData.push({documents:newData,type:'insert'});
-            me.updateEquipments(updateData)   
+            me.insertEquipment(number);
         });
     },
 
@@ -523,6 +529,11 @@ $(function () {
         equipmentPurchaseObj.initSpread();
         equipmentPurchaseObj.showData();
     })
+    //插入
+    $('#equipment_insert').click(function(){
+        let me = equipmentPurchaseObj;
+        me.insertEquipment(1);
+    })
 
     //降级
     $('#equipment_downLevel').click(function(){

web/building_saas/main/js/views/glj_col.js

@@ -17,7 +17,7 @@ let gljCol = {
             {headerName: "定额价", headerWidth: 65, dataCode: "basePrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"
             {headerName: "定额消耗", headerWidth: 65, dataCode: "rationItemQuantity", dataType: "Number", hAlign: "right"},   // dataType: "Number", formatter: "0.00"
             {headerName: "总消耗量", headerWidth: 80, dataCode: "totalQuantity", dataType: "Number", hAlign: "right"},
-            {headerName: "暂估", headerWidth: 45, dataCode: "isEstimate", dataType: "String", hAlign: "center", vAlign: "center", cellType: "checkBox"},
+            {headerName: "暂估", headerWidth: 45, dataCode: "isEstimate", dataType: "String", hAlign: "center", vAlign: "center", cellType: "checkBox", visible: false},
             {headerName: "调后市场价", headerWidth: 80, dataCode: "tenderPrice", dataType: "Number", hAlign: "right", visible: false},
             {headerName: "调后消耗量", headerWidth: 80, dataCode: "tenderQuantity", dataType: "Number", hAlign: "right", visible: false}
         ],
@@ -49,12 +49,12 @@ let gljCol = {
             {headerName: "调整价", headerWidth: 70, dataCode: "adjustPrice", hAlign: "right", dataType: "Number",spanRows: [2]},//,decimalField:"glj.unitPrice"
             {headerName: "定额价", headerWidth: 70, dataCode: "basePrice", hAlign: "right", dataType: "Number",validator:"number",spanRows: [2]},//decimalField:'glj.unitPrice',
             {headerName: "总消耗量", headerWidth: 90, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity',spanRows: [2]},
-            {headerName: "暂估", headerWidth: 45, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox',spanRows: [2]},
+            {headerName: "暂估", headerWidth: 45, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox',spanRows: [2], visible: false},
             {headerName: "主要\n材料", headerWidth: 45, dataCode: "is_main_material", hAlign: "center", dataType: "String",cellType:'checkBox',spanRows: [2]},
-            {headerName: "不计税设备", headerWidth: 55, dataCode: "no_tax_eqp", dataType: "String",cellType: "checkBox",spanRows: [2]},
-            {headerName: "评标材料", headerWidth: 35, dataCode: "is_eval_material", dataType: "String",cellType: "checkBox",spanRows: [2]},
-            {headerName: "供货方式", headerWidth: 70, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap,spanRows: [2]},
-            {headerName: "甲供数量", headerWidth: 90, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number",decimalField:'glj.quantity',spanRows: [2]},
+            {headerName: "不计税设备", headerWidth: 55, dataCode: "no_tax_eqp", dataType: "String",cellType: "checkBox",spanRows: [2], visible: false},
+            {headerName: "评标材料", headerWidth: 35, dataCode: "is_eval_material", dataType: "String",cellType: "checkBox",spanRows: [2], visible: false},
+            {headerName: "供货方式", headerWidth: 70, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap,spanRows: [2], visible: false},
+            {headerName: "甲供数量", headerWidth: 90, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number",decimalField:'glj.quantity',spanRows: [2], visible: false},
             {headerName: "三材类别", headerWidth: 70, dataCode: "materialType", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:materialComboMap,spanRows: [2]},
             {headerName: "三材系数", headerWidth: 70, dataCode: "materialCoe", hAlign: "right", dataType: "Number",validator:"number",spanRows: [2]},//,decimalField:'material'
             {headerName: "交货方式", headerWidth: 70, dataCode: "delivery", hAlign: "left", dataType: "String",spanRows: [2]},
@@ -64,7 +64,7 @@ let gljCol = {
             {headerName: "质量等级", headerWidth: 80, dataCode: "qualityGrace", hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "品牌", headerWidth: 80, dataCode: "brand", hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String",spanRows: [2]},
-            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox",spanRows: [2], visible: true},
+            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox",spanRows: [2], visible: false},
             {headerName: ["调价后","市场价"], headerWidth: 75, dataCode: "tenderPrice", hAlign: "right", dataType: "Number",validator:"number",spanCols: [2,1], visible: false},
             {headerName: ["","总消耗量"], headerWidth: 90, dataCode: "tenderQuantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity',spanCols: [0,1], visible: false}
         ],

web/building_saas/main/js/views/project_view.js

@@ -928,6 +928,8 @@ var projectObj = {
             if(colSettingObj.getVisible('itemCharacterText')){
                 switchTznrHtml(false);
             }
+            let budgetType = projectObj.project.property.budgetType||commonConstants.BudgetType.BUILDING
+            if(budgetType === commonConstants.BudgetType.BUILDING) $("#stdBillsGuidanceTab").hide();//建筑项目不显示章节表
             if (!err) {
                 that.project.projectGLJ.calcQuantity(true);//计算分部分项和技术措施项目消耗量;
                 let quantityTime = +new Date();
@@ -2985,10 +2987,14 @@ function testShow() {
 $('#delete_row').on('show.bs.modal', function (e) {//这里用show,在shown之前调用，页面不会出现按钮闪现的情况
     var controller = projectObj.mainController, project = projectObj.project;
     var selected = controller.tree.selected, parent = selected.parent;
-    var showinfo = "<label>确认要删除当前选中行吗？</label>";
+    var showinfo = "<label>是否删除其下的子项？</label><br><label>【是】则删除分部行及其下的所有子项，</label><br><label>【取消】则取消删除</label>";
     var showN = false;
-    var cancelText = "否";
-    if(selected.sourceType == project.Bills.getSourceType()&&selected.data.type==billType.FB&&selected.children.length>0){//选中的是分部，并且有子项
+    var cancelText = "取消";
+    if(isSingleSelect()&&mbzm_obj.hasReferenceRation(selected)){//“有模板关联的定额”右键点击删除，弹窗提示“删除主子目时将删除对应的关联子目，是否继续？  是 否” (只有单选中一条定额并且是有模板关联的定额)
+        showinfo = "<label>删除主子目时将删除对应的关联子目，是否继续？</label>";
+        cancelText = "否"
+    }
+  /*   if(selected.sourceType == project.Bills.getSourceType()&&selected.data.type==billType.FB&&selected.children.length>0){//选中的是分部，并且有子项
         if(isSingleSelect()||selectionChecking()){
             showinfo = "<label>是否删除其下的子项？</label><br><label>【是】则删除分部行及其下的所有子项，</label><br><label>【否】则仅删除当前分部行，子项保留，</label><br><label>【取消】则取消删除</label>";
             showN = true;
@@ -2996,7 +3002,7 @@ $('#delete_row').on('show.bs.modal', function (e) {//这里用show,在shown之
         }
     }else if(isSingleSelect()&&mbzm_obj.hasReferenceRation(selected)){//“有模板关联的定额”右键点击删除，弹窗提示“删除主子目时将删除对应的关联子目，是否继续？  是 否” (只有单选中一条定额并且是有模板关联的定额)
         showinfo = "<label>删除主子目时将删除对应的关联子目，是否继续？</label>";
-    }
+    } */
     $('#delete_showinfo').html(showinfo);
     showN==true? $('#deleteN').show():$('#deleteN').hide();
     $('#deleteCancel').text(cancelText);

web/building_saas/main/js/views/select_FB_view.js

@@ -48,11 +48,12 @@ let selectFBObject = {
 
     showData:function(){
         let budgetType = projectObj.project.property.budgetType||commonConstants.BudgetType.BUILDING;
-        if(budgetType===commonConstants.BudgetType.BUILDING){//建筑安装工程显示清单树 显示定额章节树
+        this.showRationTree();
+       /*  if(budgetType===commonConstants.BudgetType.BUILDING){//建筑安装工程显示清单树 显示定额章节树
             this.showRationTree();
         }else{//城市轨道交通工程 显示分部
             this.showBillTree();
-        }
+        } */
     },
     showRationTree:async function(){
         let rationLibID = rationLibObj.getDefaultStdRationLibID();
@@ -125,7 +126,7 @@ let selectFBObject = {
             name:nodeData.name,
             unit:nodeData.unit
         }
-        if(nodeData.name  && budgetType === commonConstants.BudgetType.BUILDING){
+        if(nodeData.name ){
             let index = nodeData.name.indexOf(' ');
             if(index !== -1){
                 d.code = nodeData.name.substring(0,index);

web/building_saas/main/js/views/std_billsGuidance_lib.js

@@ -90,7 +90,7 @@ const billsGuidance = (function () {
         headers: [
             {name: '项目编码', dataCode: 'code', width: 140, vAlign: 'center', hAlign: 'left', formatter: '@'},
             {name: '项目名称', dataCode: 'name', width: 190, vAlign: 'center', hAlign: 'left', formatter: '@'},
-            {name: '单位', dataCode: 'unit', width: 45, vAlign: 'center', hAlign: 'center', formatter: '@'},
+            {name: '单位', dataCode: 'unit', width: 60, vAlign: 'center', hAlign: 'center', formatter: '@'},
         ],
         rowHeaderWidth:1,
         events: {
@@ -102,7 +102,10 @@ const billsGuidance = (function () {
                 if(!node){
                     return;
                 }
-                if(node.children.length > 0){
+                if(!projectReadOnly) {
+                    billsLibObj.insertBills(stdBillsJobData, stdBillsFeatureData, node);
+                }
+             /*    if(node.children.length > 0){
                     node.setExpanded(!node.expanded);
                     //设置展开收起状态
                     sessionStorage.setItem('stdBillsGuidanceExpState', bills.tree.getExpState(bills.tree.items));
@@ -117,7 +120,7 @@ const billsGuidance = (function () {
                     args.sheet.repaint();
                 } else if(!projectReadOnly) {
                     billsLibObj.insertBills(stdBillsJobData, stdBillsFeatureData, node);
-                }
+                } */
             }
         }
     };
@@ -431,7 +434,6 @@ const billsGuidance = (function () {
         }
         let modules = [bills];
         initWorkBooks(modules);
-
     }
     //展开至搜索出来点的节点
     //@param {Array}nodes @return {void}