编办计价规则bug，进入项目管理界面，更新编办session

modules/pm/controllers/pm_controller.js

@@ -3,6 +3,7 @@
  */
 import UnitPriceFileModel from "../../glj/models/unit_price_file_model";
 import moment from 'moment';
+import CompilationModel from "../../users/models/compilation_model";
 let mongoose = require('mongoose');
 let ProjectsData = require('../models/project_model').project;
 let labourCoe = require('../../main/facade/labour_coe_facade');
@@ -185,6 +186,11 @@ module.exports = {
         if (sessionCompilation === undefined) {
             return response.redirect('/logout');
         }
+        let compilationModel = new CompilationModel();
+        //更新编办信息
+        let compilationData = await compilationModel.getCompilationById(sessionCompilation._id);
+        request.session.sessionCompilation = compilationData;
+        sessionCompilation = request.session.sessionCompilation;
 
         // 清单计价
         let billValuation = sessionCompilation.bill_valuation !== undefined ?

modules/users/models/compilation_model.js

@@ -48,21 +48,23 @@ class CompilationModel extends BaseModel {
         }
 
         if (compilationData.bill_valuation.length > 0) {
+            let enableValuation = [];
             for (let index in compilationData.bill_valuation) {
                 if (compilationData.bill_valuation[index].enable) {
-                    continue;
+                    enableValuation.push(compilationData.bill_valuation[index]);
                 }
-                delete compilationData.bill_valuation[index];
             }
+            compilationData.bill_valuation = enableValuation;
         }
 
         if (compilationData.ration_valuation.length > 0) {
+            let enableValuation = [];
             for (let index in compilationData.ration_valuation) {
                 if (compilationData.ration_valuation[index].enable) {
-                    continue;
+                    enableValuation.push(compilationData.bill_valuation[index]);
                 }
-                delete compilationData.ration_valuation[index];
             }
+            compilationData.ration_valuation = enableValuation;
         }
 
         return compilationData;

modules/users/models/engineering_lib_model.js

@@ -47,8 +47,7 @@ class EngineeringLibModel extends BaseModel {
                 engineeringLibIdList.push(engineering.engineering_id);
             }
         }
-        // console.log(data);
-        // console.log(engineeringTemp);
+
 
         // 查找对应的id数据
         let condition = {_id: {"$in": engineeringLibIdList}};
@@ -74,6 +73,7 @@ class EngineeringLibModel extends BaseModel {
 
         // 替换计价规则数据
         let valuationData = JSON.parse(JSON.stringify(data));
+
         for(let valuation of valuationData) {
             if (valuation === null) {
                 continue;

web/building_saas/pm/js/pm_share.js

@@ -721,6 +721,9 @@ const pmShare = (function () {
     function eventListener(){
         //tab
         $('#tab_pm_share').on('shown.bs.tab', function () {
+            //侧滑隐藏
+            $('.slide-sidebar').removeClass('open');
+            $('.slide-sidebar').css('width', '0');
             projTreeObj.tree = null;
             if(projTreeObj.workBook){
                 projTreeObj.workBook.destroy();