Merge branch '1.0.0_online' of http://192.168.1.12:3000/SmartCost/ConstructionCost into 1.0.0_online

modules/all_models/compilation.js

@@ -49,6 +49,8 @@ let modelSchema = {
     name: String,
     //描述
     description: String,
+    //代码覆盖路径
+    overWriteUrl:String,
     // 创建时间
     create_time: Number,
     // 创建者id

modules/main/routes/main_route.js

@@ -29,7 +29,8 @@ module.exports =function (app) {
                         projectData: projectData,
                         versionName: req.session.sessionCompilation.name + '免费版',
                         projectReadOnly: projectReadOnly,
-                        LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
+                        LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                        overWriteUrl:req.session.sessionCompilation.overWriteUrl
                     });
             } else {
                 res.redirect('/pm');

modules/pm/facade/pm_facade.js

@@ -510,7 +510,8 @@ function getBuildingArea(projFeature){
 async function getSummaryInfoByTender(tenderID, summaryType) {
     const notDeleted = [{deleteInfo: null}, {'deleteInfo.deleted': false}];
     let tender = await projectModel.findOne({ID: tenderID, $or: notDeleted});
-    let summaryItemID;
+    let parentName;
+    let summaryList = [];
     if(!tender){
         return null;
     }
@@ -522,14 +523,28 @@ async function getSummaryInfoByTender(tenderID, summaryType) {
     if(!project){
         return null;
     }
+    let summaryInfo = await getSummaryInfo([project.ID]);
     if(summaryType === projectType.engineering){
-        summaryItemID = engineering.ID;
+        parentName = engineering.name ? engineering.name : '';
+        let tenders = await projectModel.find({ParentID: engineering.ID, $or: notDeleted});
+        for(let t of tenders){
+            if(summaryInfo[t.ID]){
+                summaryInfo[t.ID]['name'] = t.name ? t.name : '';
+                summaryList.push(summaryInfo[t.ID]);
+            }
+        }
     }
     else {
-        summaryItemID = project.ID;
+        parentName = project.name ? project.name : '';
+        let engs = await projectModel.find({ParentID: project.ID, $or: notDeleted});
+        for(let e of engs){
+            if(summaryInfo[e.ID]){
+                summaryInfo[e.ID]['name'] = e.name ? e.name : '';
+                summaryList.push(summaryInfo[e.ID]);
+            }
+        }
     }
-    let summaryInfo = await getSummaryInfo([project.ID]);
-    return summaryInfo[summaryItemID];
+    return {parent: {name: parentName}, subList: summaryList};
 }
 
 async function getSummaryInfo(projectIDs){

modules/pm/models/project_model.js

@@ -99,7 +99,7 @@ ProjectsDAO.prototype.getUserProject = function (userId, ProjId, callback) {
             callback(0, '', template);
         }
     });
-}
+};
 
 ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId, datas, callback) {
     let data, project, updateLength = 0, hasError = false, deleteInfo = null, i, newProject;

web/building_saas/main/html/main.html

@@ -1594,7 +1594,16 @@
          <script type="text/javascript" src="/public/web/storageUtil.js"></script>
         <!-- endinject -->
 
+    <% if (overWriteUrl != undefined) { %>
+         <script type="text/javascript" src="<%= overWriteUrl%>"></script>
+    <% } %>
+
+
         <script type="text/javascript">
+            optionsOprObj.getOptions();
+            projectInfoObj.showProjectInfo();
+            projectObj.checkMainSpread();
+            projectObj.loadProjectData();
            // autoFlashHeight();
         </script>
 

web/building_saas/main/js/main.js

@@ -5,9 +5,6 @@
 $(function () {
     loadMainSize();
     $("#header-menu").removeAttr('style');
-    projectInfoObj.showProjectInfo();
-    projectObj.checkMainSpread();
-    projectObj.loadProjectData();
 
     $('#tab_baobiao').on('shown.bs.tab', function (e) {
         $(e.relatedTarget.hash).removeClass('active');

web/building_saas/main/js/models/main_consts.js

@@ -18,7 +18,7 @@ const ModuleNames = {
     installation_fee:'installation_fee'
 };
 
-const gljType = {
+let gljType = {
     // 人工
     LABOUR: 1,
 

web/building_saas/main/js/views/options_view.js

@@ -54,7 +54,6 @@ let optionsOprObj = {
     }
 };
 
-optionsOprObj.getOptions();
 
 $('#poj-set').on('shown.bs.modal', function () {
     let orgV1 = optionsOprObj.getOption(optionsOprObj.optionsTypes.GENERALOPTS, 'rationQuanACToBillsQuan');

web/over_write/js/chongqing_2018.js

@@ -0,0 +1,27 @@
+/**
+ * Created by zhang on 2018/8/14.
+ */
+if(gljType){
+    gljType = {
+        LABOUR: 1,// 人工
+        GENERAL_MATERIAL: 201, // 普通材料
+        CONCRETE: 202,// 混凝土
+        MORTAR: 203,// 砂浆
+        MIX_RATIO: 204,// 配合比
+        COMMERCIAL_CONCRETE: 205, // 商品混凝土
+        COMMERCIAL_MORTAR: 206, // 商品砂浆
+        OTHER_MATERIAL: 207, // 商品砂浆
+        GENERAL_MACHINE: 301,// 机械台班
+        MACHINE_LABOUR: 303, // 机上人工
+        MACHINE_COMPOSITION: 302,// 机械组成物
+        INSTRUMENT: 304,// 仪器仪表
+        FUEL_POWER_FEE:305,//燃料动力费
+        DEPRECIATION_FEE:306,//折旧费
+        INSPECTION_FEE:307,//检修费
+        MAINTENANCE:308,//维护费
+        DISMANTLING_FREIGHT_FEE:309,//安拆费及场外运费
+        VERIFICATION_FEE:310,//校验费
+        OTHER_FEE:311,//其他费用
+        MAIN_MATERIAL: 4,// 主材
+    };
+}