项目管理中加入编办信息

modules/pm/routes/pm_route.js

@@ -9,9 +9,14 @@ let pmController = require('./../controllers/pm_controller');
 module.exports = function (app) {
 
     app.get('/pm', function(req, res){
-        res.render('building_saas/pm/html/project-management.html',
-            {userAccount: req.session.userAccount,
-                userID: req.session.sessionUser.ssoId});
+        // 获取编办信息
+        let sessionCompilation = req.session.sessionCompilation;
+        let renderData = {
+            userAccount: req.session.userAccount,
+            userID: req.session.sessionUser.ssoId,
+            compilationData: sessionCompilation,
+        };
+        res.render('building_saas/pm/html/project-management.html', renderData);
     });
 
     let pmRouter = express.Router();

modules/users/controllers/boot_controller.js

@@ -27,7 +27,7 @@ class BootController extends BaseController {
         // 判断是否有存入编办信息
         if (sessionCompilation === undefined && compilationId !== '') {
             let compilationModel = new CompilationModel();
-            let compilationData = await compilationModel.findDataByCondition({_id: compilationId});
+            let compilationData = await compilationModel.getCompilationById(compilationId);
 
             request.session.sessionCompilation = compilationData;
         }

modules/users/controllers/login_controller.js

@@ -74,13 +74,13 @@ class LoginController {
 
             let compilationModel = new CompilationModel();
             compilationList = preferenceSetting.login_ask === 1 ? await compilationModel.getList() : [];
-
             // 获取编办信息
             let sessionCompilation = request.session.sessionCompilation;
-            if (preferenceSetting.login_ask === 0 && sessionCompilation === undefined &&
+            if (preferenceSetting.login_ask === 0 && !sessionCompilation &&
                 preferenceSetting.select_version !== '') {
-                let compilationData = await compilationModel.findDataByCondition({_id: preferenceSetting.select_version});
 
+                let compilationData = await compilationModel.getCompilationById(preferenceSetting.select_version);
+                console.log(compilationData);
                 request.session.sessionCompilation = compilationData;
             }
 

modules/users/controllers/user_controller.js

@@ -175,7 +175,7 @@ class UserController extends BaseController {
             if (data.login_ask === 1) {
                 // 查找对应编办
                 let compilationModel = new CompilationModel();
-                let compilationData = await compilationModel.findDataByCondition({_id: selectVersion});
+                let compilationData = await compilationModel.getCompilationById(selectVersion);
 
                 request.session.sessionCompilation = compilationData;
             }

modules/users/models/compilation_model.js

@@ -29,11 +29,22 @@ class CompilationModel extends BaseModel {
     async getList() {
         // 筛选字段
         let field = {_id: 1, name: 1, is_release: 1};
-        let compilationData = await this.findDataByCondition({name: {$ne: ''}}, field, false);
+        let compilationData = await this.findDataByCondition({name: {$ne: ''}, is_release: true}, field, false);
 
         return compilationData === null ? [] : compilationData;
     }
 
+    /**
+     * 根据id获取可用的编办数据
+     *
+     * @param {String} id
+     * @return {Promise}
+     */
+    getCompilationById(id) {
+        let condition = {_id: id, is_release: true};
+        return this.findDataByCondition(condition);
+    }
+
 }
 
 export default CompilationModel;

modules/users/routes/login_route.js

@@ -21,6 +21,7 @@ module.exports = function (app) {
 
     router.get("/logout", function (req, res) {
         delete req.session.sessionUser;
+        delete req.session.sessionCompilation;
         res.redirect("/");
     });
     app.use('/',router)

web/building_saas/pm/html/project-management.html

@@ -316,16 +316,25 @@
                         <div class="form-group">
                             <label>计价方式</label>
                             <div>
+                                <% if(compilationData !== undefined && compilationData.bill_valuation.length > 0) { %>
+                                <% compilationData.bill_valuation.forEach(function(bill_valuation) { %>
                                 <label class="custom-control custom-radio">
-                                    <input id="radio1" name="radio" type="radio" class="custom-control-input">
+                                    <input id="radio1" name="radio" type="radio" class="custom-control-input" value="<%= bill_valuation._id %>">
                                     <span class="custom-control-indicator"></span>
-                                    <span class="custom-control-description">清单计价</span>
+                                    <span class="custom-control-description"><%= bill_valuation.name %></span>
                                 </label>
+                                <% }) %>
+                                <% } %>
+
+                                <% if(compilationData !== undefined && compilationData.ration_valuation.length > 0) { %>
+                                <% compilationData.ration_valuation.forEach(function(ration_valuation) { %>
                                 <label class="custom-control custom-radio">
-                                    <input id="radio2" name="radio" type="radio" class="custom-control-input">
+                                    <input id="radio1" name="radio" type="radio" class="custom-control-input" value="<%= ration_valuation._id %>">
                                     <span class="custom-control-indicator"></span>
-                                    <span class="custom-control-description">定额计价</span>
+                                    <span class="custom-control-description"><%= ration_valuation.name %></span>
                                 </label>
+                                <% }) %>
+                                <% } %>
                             </div>
                         </div>
                     </form>