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

modules/main/templates/constructionBillsTemplate.js

@@ -60,8 +60,8 @@ const buildingTemplate = [
 
 /* 概算汇总，城市轨道交通工程，建设其他费清单模板 */
 const railTemplate = [
-  { ID: 2, ParentID: -1, NextSiblingID: 3, code: '2', name: '工程建设其他费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.CONSTRUCTION_OTHER_FEE }], type: billType.DXFY },
-  { ID: 21, ParentID: 2, NextSiblingID: 22, code: '2.1', name: '前期费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
+  { ID: 2, ParentID: -1, NextSiblingID: 3, code: '2', chapterCode: '十八', sectionCode: '', name: '工程建设其他费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: fixedFlag.CONSTRUCTION_OTHER_FEE }], type: billType.DXFY },
+  { ID: 21, ParentID: 2, NextSiblingID: 22, code: '2.1', chapterCode: '', sectionCode: '36', name: '前期费用', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 211, ParentID: 21, NextSiblingID: 212, code: '2.1.1', name: '土地征用及补偿费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 2111, ParentID: 211, NextSiblingID: 2112, code: '2.1.1.1', name: '集体土地征地补偿安置费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
   { ID: 2112, ParentID: 211, NextSiblingID: -1, code: '2.1.1.2', name: '国有土地上房屋征收与补偿费', unit: '', calcBase: '', quantity: '', flags: [{ fieldName: 'fixed', flag: null }], type: billType.BILL },
@@ -70,7 +70,7 @@ const railTemplate = [
   { 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: 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: 22, ParentID: 2, NextSiblingID: 23, code: '2.2', chapterCode: '', sectionCode: '37', 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 },
@@ -102,7 +102,7 @@ const railTemplate = [
   { 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: 23, ParentID: 2, NextSiblingID: -1, code: '2.3', chapterCode: '', sectionCode: '37', 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 },
@@ -111,10 +111,10 @@ const railTemplate = [
   { 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: 3, ParentID: -1, NextSiblingID: 4, code: '3', chapterCode: '十九', sectionCode: '38', 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: 4, ParentID: -1, NextSiblingID: 5, code: '4', chapterCode: '二十', sectionCode: '39', 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: 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 },

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

web/building_saas/glj/html/project_glj.html

@@ -33,14 +33,14 @@
                 <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="GENERAL_MACHINE">机械</a></li>
                 <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="MAIN_MATERIAL">主材</a></li>
                 <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="EQUIPMENT">设备</a></li>-->
-        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="FBFX">分部分项人材机</a></li>
+      <!--   <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="FBFX">分部分项人材机</a></li>
         <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="TECH">措施项目人材机</a></li>
         <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="JGCL">甲供材料</a></li>
-        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZGCL">暂估材料</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZGCL">暂估材料</a></li> -->
         <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="SCHZ">三材汇总</a></li>
         <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZYCL">主要材料</a></li>
-        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="AMAE">承包人主要材料设备</a></li>
-        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="PBCL">评标材料</a></li>
+<!--         <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="AMAE">承包人主要材料设备</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="PBCL">评标材料</a></li> -->
       </ul>
     </div>
     <div class="main-content col p-0" id="material_adjust" style="overflow: hidden; display: none">

web/users/html/index.html

@@ -33,7 +33,7 @@
       <!--banner-->
       <div class="hero bg-dark section " style="background-image: url(/web/users/images/bg_01.png);" id="home">
          <div class="container text-center">
-            <h1 class="text-white mb-4 f-50 ">市政计价免费版，永久免费</h1>
+            <h1 class="text-white mb-4 f-50 ">市政建筑计价免费版，永久免费</h1>
             <p class="lead text-white mb-5">跨平台，打开浏览器即可使用，全新在线计价体验。
             <div class="btn_hero">
                <a href="/login" class="btn btn-danger mr-2">登录软件</a>