浏览代码

标段列表,管理标段调整

MaiXinRong 2 年之前
父节点
当前提交
b4573052f9
共有 4 个文件被更改,包括 45 次插入1 次删除
  1. 34 1
      app/controller/tender_controller.js
  2. 1 0
      app/middleware/session_auth.js
  3. 2 0
      app/router.js
  4. 8 0
      app/view/tender/sub_menu.ejs

+ 34 - 1
app/controller/tender_controller.js

@@ -295,7 +295,7 @@ module.exports = app => {
                 accountInfo,
                 accountInfo,
                 userPermission,
                 userPermission,
             };
             };
-            await this._list('tender/index.ejs', renderData, 'tender/modal.ejs');
+            await this._listCache('tender/index.ejs', renderData, 'tender/modal.ejs');
         }
         }
 
 
         /**
         /**
@@ -321,6 +321,39 @@ module.exports = app => {
         }
         }
 
 
         /**
         /**
+         * 标段管理(Get)
+         *
+         * @param ctx
+         * @return {Promise<void>}
+         */
+        async listManage(ctx) {
+            this.jsFiles = this.app.jsFiles.tender.manage;
+            // 先判断权限
+            // 获取用户新建标段权利
+            const accountInfo = await this.ctx.service.projectAccount.getDataById(this.ctx.session.sessionUser.accountId);
+            const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
+            if (userPermission !== null && userPermission.tender !== undefined && userPermission.tender.indexOf('1') !== -1) {
+                const renderData = {
+                    accountInfo,
+                    userPermission,
+                };
+                await this._listCache('tender/manage.ejs', renderData, 'tender/manage_modal.ejs', 'manage');
+            } else {
+                this.ctx.redirect(ctx.request.header.referer);
+            }
+        }
+
+        async listDefaultOrg(ctx) {
+            this.jsFiles = this.app.jsFiles.tender.list;
+            const accountInfo = await this.ctx.service.projectAccount.getDataById(this.ctx.session.sessionUser.accountId);
+            const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
+            const renderData = {
+                accountInfo,
+                userPermission,
+            };
+            await this._list('tender/index.ejs', renderData, 'tender/modal.ejs');
+        }
+        /**
          * 标段概况(Get)
          * 标段概况(Get)
          *
          *
          * @param {object} ctx - egg全局变量
          * @param {object} ctx - egg全局变量

+ 1 - 0
app/middleware/session_auth.js

@@ -81,6 +81,7 @@ module.exports = options => {
             }
             }
 
 
         } catch (error) {
         } catch (error) {
+            this.log(error);
             if (this.helper.isAjax(this.request)) {
             if (this.helper.isAjax(this.request)) {
                 return this.body = {
                 return this.body = {
                     err: 2,
                     err: 2,

+ 2 - 0
app/router.js

@@ -137,6 +137,7 @@ module.exports = app => {
      */
      */
     // 金额概况
     // 金额概况
     app.get('/list', sessionAuth, 'tenderController.listDefault');
     app.get('/list', sessionAuth, 'tenderController.listDefault');
+    app.get('/listOrg', sessionAuth, 'tenderController.listDefaultOrg');
     app.post('/list/load', sessionAuth, 'tenderController.listLoad');
     app.post('/list/load', sessionAuth, 'tenderController.listLoad');
     app.post('/list/load2', sessionAuth, 'tenderController.listLoad2');
     app.post('/list/load2', sessionAuth, 'tenderController.listLoad2');
     app.get('/list/info', sessionAuth, 'tenderController.listInfo');
     app.get('/list/info', sessionAuth, 'tenderController.listInfo');
@@ -148,6 +149,7 @@ module.exports = app => {
 
 
     // 管理标段
     // 管理标段
     app.get('/list/manage', sessionAuth, 'tenderController.listManage');
     app.get('/list/manage', sessionAuth, 'tenderController.listManage');
+    app.get('/list/manageOrg', sessionAuth, 'tenderController.listManageOrg');
     app.post('/list/add', sessionAuth, 'tenderController.addTender');
     app.post('/list/add', sessionAuth, 'tenderController.addTender');
     app.post('/list/update', sessionAuth, 'tenderController.updateTender');
     app.post('/list/update', sessionAuth, 'tenderController.updateTender');
     app.post('/list/del', sessionAuth, 'tenderController.deleteTender');
     app.post('/list/del', sessionAuth, 'tenderController.deleteTender');

+ 8 - 0
app/view/tender/sub_menu.ejs

@@ -22,12 +22,20 @@
                     </label>
                     </label>
                     <% } %>
                     <% } %>
                     <% if (ctx.app.config.is_debug) { %>
                     <% if (ctx.app.config.is_debug) { %>
+                    <label class="btn btn-sm btn-light <% if (ctx.url === '/listOrg') { %>active<% } %>" onclick="window.location.href='/listOrg'">
+                        <input type="radio" name="options" id="option1" autocomplete="off"> 标段列表
+                    </label>
                     <label class="btn btn-sm btn-light <% if (ctx.url === '/list/infoOrg') { %>active<% } %>" onclick="window.location.href='/list/infoOrg'">
                     <label class="btn btn-sm btn-light <% if (ctx.url === '/list/infoOrg') { %>active<% } %>" onclick="window.location.href='/list/infoOrg'">
                         <input type="radio" name="options" id="option1" autocomplete="off"> 金额概况(旧)
                         <input type="radio" name="options" id="option1" autocomplete="off"> 金额概况(旧)
                     </label>
                     </label>
                     <label class="btn btn-sm btn-light  <% if (ctx.url === '/list/progressOrg') { %>active<% } %>" onclick="window.location.href='/list/progressOrg'">
                     <label class="btn btn-sm btn-light  <% if (ctx.url === '/list/progressOrg') { %>active<% } %>" onclick="window.location.href='/list/progressOrg'">
                         <input type="radio" name="options" id="option2" autocomplete="off"> 计量进度(旧)
                         <input type="radio" name="options" id="option2" autocomplete="off"> 计量进度(旧)
                     </label>
                     </label>
+                    <% if (userPermission !== null && userPermission.tender !== undefined && userPermission.tender.indexOf('1') !== -1) { %>
+                    <label class="btn btn-sm btn-light  <% if (ctx.url === '/list/manageOrg') { %>active<% } %>" onclick="window.location.href='/list/manageOrg'">
+                        <input type="radio" name="options" id="option2" autocomplete="off"> 管理标段
+                    </label>
+                    <% } %>
                     <% } %>
                     <% } %>
                 </div>
                 </div>
             </div>
             </div>