合同设置地址更新

app/controller/contract_controller.js

@@ -672,7 +672,8 @@ module.exports = app => {
                 if (!ctx.session.sessionUser.is_admin) {
                     throw '您没有权限查看该页面';
                 }
-                const types_from = ctx.query.from || 'subProject';
+                // url是否包含tender
+                const types_from = ctx.url.indexOf('tender') > -1 ? 'tender' : 'subProject';
                 const commonJson = ctx.subProject.common_json ? JSON.parse(ctx.subProject.common_json) : null;
                 const types = commonJson && commonJson.contract_type ? commonJson.contract_type : [];
                 const tender_types = commonJson && commonJson.tender_contract_type ? commonJson.tender_contract_type : [];
@@ -681,7 +682,7 @@ module.exports = app => {
                     types,
                     tender_types,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.contract.setting),
-                    thisUrl: `/sp/${ctx.subProject.id}/contract/setting`,
+                    thisUrl: `/sp/${ctx.subProject.id}/contract${types_from === 'tender' ? '/tender' : ''}/setting`,
                     is_setting: true,
                 };
                 await this.layout('contract/setting.ejs', renderData);

app/router.js

@@ -352,6 +352,8 @@ module.exports = app => {
     app.get('/sp/:id/contract/detail/:type/:cid/pay/:cpid/file/:fid/download', sessionAuth, subProjectCheck, contractCheck, 'contractController.downloadFile');
     app.post('/sp/:id/contract/col-set', sessionAuth, subProjectCheck, contractCheck, 'contractController.colSet');
     app.get('/sp/:id/contract/setting', sessionAuth, subProjectCheck, 'contractController.setting');
+    app.get('/sp/:id/contract/tender/setting', sessionAuth, subProjectCheck, 'contractController.setting');
+    // app.get('/sp/:id/contract/setting/shenpi', sessionAuth, subProjectCheck, 'contractController.shenpi');
 
 
     // 资料归集-列表

app/view/contract/panel.ejs

@@ -6,7 +6,7 @@
             <h2>合同概况</h2>
             <div class="ml-auto">
                 <% if (ctx.session.sessionUser.is_admin) { %>
-                    <a class="btn btn-sm btn-primary pull-right" href="#bd-set-1" data-toggle="modal" data-target="#bd-set-1">合同设置</a>
+                    <a class="btn btn-sm btn-primary pull-right" href="/sp/<%- ctx.subProject.id %>/contract<% if (ctx.contract_tender) { %>/tender<% } %>/setting">合同设置</a>
                 <% } %>
             </div>
         </div>

app/view/contract/sub_menu_setting_list.ejs

@@ -1,6 +1,6 @@
 <div class="nav-box">
     <ul class="nav-list list-unstyled">
-        <li class="<% if (ctx.url === thisUrl || ctx.url === thisUrl +  '?from=tender') { %>active<% } %>">
+        <li class="<% if (ctx.url === thisUrl) { %>active<% } %>">
             <a href="<%- thisUrl %>"><span class="ml-3">功能设置</span></a>
         </li>
     </ul>
@@ -8,7 +8,7 @@
 <div class="nav-box">
     <ul class="nav-list list-unstyled">
         <li class="<% if (ctx.url === thisUrl + '/shenpi') { %>active<% } %>">
-            <a href="<%- thisUrl %>/shenpi"><span class="ml-3">审批流程</span></a>
+            <a href="<%- types_from === 'tender' ? `/sp/${ctx.subProject.id}/setting/manage` : thisUrl + '/shenpi' %>"><span class="ml-3">审批流程</span></a>
         </li>
     </ul>
 </div>

app/view/contract/tender.ejs

@@ -4,7 +4,7 @@
             <div id="show-level"></div>
             <div class="ml-auto">
                 <% if (ctx.session.sessionUser.is_admin) { %>
-                <a class="btn btn-sm btn-primary pull-right" href="#bd-set-1" data-toggle="modal" data-target="#bd-set-1">合同设置</a>
+                <a class="btn btn-sm btn-primary pull-right" href="/sp/<%- ctx.subProject.id %>/contract/tender/setting">合同设置</a>
                 <% } %>
             </div>
         </div>