Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/construction_index.js

@@ -44,7 +44,7 @@ const tenderListSpec = (function(){
         const html = [];
         const left = $('#sub-menu').css('display') === 'none' ? 56 : 176;
         html.push('<table class="table table-hover table-bordered">')
-        html.push('<thead style="position: fixed;left:'+ left +'px;top: 34px;" class="text-center">', '<tr>');
+        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0;" class="text-center">', '<tr>');
         html.push('<th class="text-center" style="min-width: 300px;">', '标段名称', tenderListOrder.getOrderButton('name'), '</th>');
         html.push('<th class="text-center" style="width: 300px;">', '创建时间', tenderListOrder.getOrderButton('create_time'), '</th>');
         if (is_admin) {

app/public/js/contract_tender.js

@@ -68,7 +68,7 @@ const tenderListSpec = (function(){
         const html = [];
         const left = $('#sub-menu').css('display') === 'none' ? 56 : 176;
         html.push('<table class="table table-hover table-bordered" id="progress-table">')
-        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0px;" class="text-center">', '<tr>');
+        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0;" class="text-center">', '<tr>');
         // html.push('<table class="table table-hover table-bordered">');
         // html.push('<thead style="position: fixed;left:56px;top: 34px;" class="text-center">', '<tr>');
         html.push('<th style="min-width: 200px" rowspan="2">', '标段名称', '</th>');

app/public/js/file_detail.js

@@ -38,20 +38,18 @@ $(document).ready(function() {
             }
         }
         refreshFileCountHint() {
-            const sum = _.sum(this.dragTree.children.map(x => { return x.file_count}));
+            const sum = _.sum(this.dragTree.children.map(x => { return x.total_file_count}));
             $('#file-count').html(`文件总数：${sum}`);
         }
         calcTotalFileCount() {
             this.dragTree.recursiveFun(this.dragTree.children, x => {
                 if (x.children && x.children.length > 0) {
                     x.total_file_count = x.children.reduce((pre, c) => {
-                        if (x.filing_type === 1) console.log('reduce', c.name, c.total_file_count);
                         return pre + c.total_file_count
                     }, 0);
                 } else {
                     x.total_file_count = x.file_count || 0;
                 }
-                if (x.filing_type === 1) console.log(x.name, x.total_file_count);
             });
         }
         _loadFilingSourceNode() {
@@ -197,6 +195,7 @@ $(document).ready(function() {
                 self.dragTree.loadPostData(result);
                 self.filingTree.removeNode(node);
                 self.calcTotalFileCount();
+                self.refreshFileCountHint();
                 if (parent) {
                     const path = parent.getPath();
                     for (const p of path) {

app/public/js/payment_detail.js

@@ -290,7 +290,7 @@ $(function () {
 
     $('#attList').on('click', '.file-atn', function() {
         const id = $(this).attr('f-id');
-        postData(`'/sp/${spid}/payment/${tenderId}/detail/${detailId}/file/${id}/download`, {}, (data) => {
+        postData(`/sp/${spid}/payment/${tenderId}/detail/${detailId}/file/${id}/download`, {}, (data) => {
             const { filepath } = data;
             $('#file-upload').attr('href', filepath);
             $('#file-upload')[0].click();
@@ -372,7 +372,7 @@ function getAllList(currPageNum = 1) {
         <td><a href="${att.filepath}" target="_blank" class="pl-0 col-11 att-file-name" file-id=${att.id}>${att.filename}${att.fileext}</a></td>
         <td>${moment(att.upload_time).format("YYYY-MM-DD HH:mm:ss")}<br>${bytesToSize(att.filesize)}</td>
         <td>
-            <a href="'/sp/${spid}/payment/${tenderId}/detail/${detailId}/file/${att.id}/download" class="mr-2" title="下载"><span class="fa fa-download text-primary"></span></a>`
+            <a href="/sp/${spid}/payment/${tenderId}/detail/${detailId}/file/${att.id}/download" class="mr-2" title="下载"><span class="fa fa-download text-primary"></span></a>`
         html += (att.uid === accountId && (detailStatus === auditConst.status.checked ? Boolean(att.extra_upload) : true)) ?
             `<a href="javascript:void(0)" class="mr-2 delete-file" data-attid="${att.id}" title="删除附件"><span class="fa fa-trash text-danger"></span></a>` : '';
         html += `</td>`;

app/public/js/payment_index.js

@@ -111,7 +111,7 @@ $(function () {
         if (tenderTree.length > 0) {
             const html = [];
             html.push('<table class="table table-hover table-bordered">');
-            html.push('<thead style="position: fixed;left:56px;top: 34px;">', '<tr>');
+            html.push('<thead style="position: sticky;left:56px;top: 0;">', '<tr>');
             html.push('<th class="text-center" style="width: 40%">', '名称', '</th>');
             html.push('<th class="text-center" style="width: 15%">', '创建人', '</th>');
             html.push('<th class="text-center" style="width: 15%">', '创建时间', '</th>');
@@ -302,7 +302,7 @@ $(function () {
         for(let item = 0; item < $(".c-body table>thead>tr>th").length; item ++) {
             $(".c-body table>thead>tr>th").eq(item).outerWidth($(".c-body table>tbody>tr:first").children('td').eq(item).outerWidth());
         }
-        $('.c-body table').css('margin-top', $(".c-body table>thead").height() - 4);
+        // $('.c-body table').css('margin-top', $(".c-body table>thead").height() - 4);
         // $('.c-body table').css('margin-top', -2);
     }
 });

app/public/js/setting_manage.js

@@ -780,7 +780,7 @@ const tenderListSpec = (function(){
     function getTenderTreeHeaderHtml() {
         const html = [];
         html.push('<table class="table table-hover table-bordered">');
-        html.push('<thead style="position: fixed;left:176px;top: 34px;">', '<tr>');
+        html.push('<thead style="position: sticky;left:176px;top: 0;">', '<tr>');
         html.push('<th class="text-center" style="width: 80%">', '标段名称', '</th>');
         html.push('<th class="text-center" style="width: 20%">', '创建人', '</th>');
         html.push('</tr>', '</thead>');

app/public/js/stage.js

@@ -2028,8 +2028,16 @@ $(document).ready(() => {
                 spSpread.getActiveSheet().zh_setting.readOnly = posReadOnly;
                 const posData = stagePos.ledgerPos[itemsPre + node.id] || [];
                 const posMeasure = $('#pos-measure')[0].checked;
+                const posUnMeasure = $('#pos-un-measure')[0].checked;
                 posData.forEach(x => {
-                    x.visible = !posMeasure || (!!x.contract_qty || !!x.qc_qty || !!x.qc_minus_qty);
+                    x.visible = true;
+                    if (posMeasure && x.visible) {
+                        x.visible = !!x.contract_qty || !!x.qc_qty || !!x.qc_minus_qty;
+                    }
+                    if (posUnMeasure && x.visible) {
+                        // 不考虑不计价
+                        x.visible = !x.end_contract_qty && !x.end_qc_qty && !x.end_gather_qty; // && !x.qc_minus_qty;
+                    }
                 });
                 SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', posData, posReadOnly);
                 getNodeList(node.id);
@@ -2482,6 +2490,7 @@ $(document).ready(() => {
         }
     };
     $('#pos-measure').click(stagePosSpreadObj.loadCurPosData);
+    $('#pos-un-measure').click(stagePosSpreadObj.loadCurPosData);
     // 加载上下窗口resizer
     $.divResizer({
         select: '#main-resize',

app/public/js/sub_menu.js

@@ -23,8 +23,8 @@
             miniMenu.addClass('d-flex').show();
             setting.callback({mini: true});
         };
-        const menuType = setting.key ? getLocalCache(setting.key) : null;
-        if (menuType && menuType === 'miniMenu' && setting.forceMini) {
+        const menuType = setting.defaultMenu || (setting.key ? getLocalCache(setting.key) : null);
+        if ((menuType && menuType === 'miniMenu') || setting.forceMini) {
             showMiniMenu();
         } else {
             showMenu();

app/public/js/tender_list.js

@@ -3,7 +3,7 @@ const tenderListSpec = (function(){
         const html = [];
         const left = $('#sub-menu').css('display') === 'none' ? 56 : 176;
         html.push('<table class="table table-hover table-bordered">');
-        html.push('<thead style="position: fixed;left:'+ left +'px;top: 34px;">', '<tr>');
+        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0;">', '<tr>');
         html.push('<th class="text-center" style="width: 40%">', '标段名称', tenderListOrder.getOrderButton('name'), '</th>');
         html.push('<th class="text-center" style="width: 9%">', '计量模式', '</th>');
         html.push('<th class="text-center" style="width: 9%">', '创建人', '</th>');

app/public/js/tender_list_info.js

@@ -177,7 +177,7 @@ const tenderListSpec = (function(){
         const html = [];
         const left = $('#sub-menu').css('display') === 'none' ? 56 : 176;
         html.push('<table class="table table-hover table-bordered">');
-        html.push('<thead style="position: fixed;left:'+ left +'px;top: 34px;">', '<tr>');
+        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0;">', '<tr>');
         if (colSetCache.name.show) html.push('<th class="text-center" style="min-width: 300px;">', colSetCache.name.alias, '</th>');
         if (colSetCache.measure_type.show) html.push('<th class="text-center" style="width: 85px">', colSetCache.measure_type.alias, '</th>');
         if (colSetCache.calc_flow.show) html.push('<th class="text-center" style="width: 125px">', colSetCache.calc_flow.alias, '</th>');

app/public/js/tender_list_manage.js

@@ -63,7 +63,7 @@ const tenderListSpec = (function(){
         const html = [];
         const left = $('#sub-menu').css('display') === 'none' ? 56 : 176;
         html.push('<table class="table table-hover table-bordered">');
-        html.push('<thead style="position: fixed;left:'+ left +'px;top: 34px;">', '<tr>');
+        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0;">', '<tr>');
         html.push('<th class="text-center" style="width: 45%">', '标段名称', tenderListOrder.getOrderButton('name'), '</th>');
         html.push('<th class="text-center" style="width: 10%">', '创建人', '</th>');
         html.push('<th class="text-center" style="width: 15%">', '创建时间', tenderListOrder.getOrderButton('create_time'), '</th>');

app/public/js/tender_list_progress.js

@@ -115,7 +115,7 @@ const tenderListSpec = (function(){
         const html = [];
         const left = $('#sub-menu').css('display') === 'none' ? 56 : 176;
         html.push('<table class="table table-hover table-bordered" id="progress-table">')
-        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0px;">', '<tr>');
+        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0;">', '<tr>');
         // html.push('<thead style="left:56px;top: 34px;">', '<tr>');
         html.push('<th style="width: 30%;min-width: 300px" class="text-center">', '标段名称', '</th>');
         html.push('<th class="text-center" style="width: 120px">', '计量进度', '</th>');

app/public/js/tender_showhide.js

@@ -142,9 +142,9 @@ function setTopTr() {
             }
         }
     }
-    if ($("#progress-table").length === 0) {
-        $('.c-body table').css('margin-top', $(".c-body table>thead").height() - 4);
-    }
+    // if ($("#progress-table").length === 0) {
+    //     $('.c-body table').css('margin-top', $(".c-body table>thead").height() - 4);
+    // }
 }
 
 function doTrStatus(node, status, all = '') {

app/service/payment_detail_att.js

@@ -56,7 +56,7 @@ module.exports = app => {
             return result.map(item => {
                 item.orginpath = this.ctx.app.config.fujianOssPath + item.filepath;
                 if (!this.ctx.helper.canPreview(item.fileext)) {
-                    item.filepath = `'/sp/${this.ctx.subProject.id}/payment/${item.tender_id}/detail/${item.td_id}/file/${item.id}/download`;
+                    item.filepath = `/sp/${this.ctx.subProject.id}/payment/${item.tender_id}/detail/${item.td_id}/file/${item.id}/download`;
                 } else {
                     item.filepath = this.ctx.app.config.fujianOssPath + item.filepath;
                     item.viewpath = item.filepath;

app/service/payment_folder.js

@@ -32,7 +32,7 @@ module.exports = app => {
                     if (parentFolderInfo.is_leaf) {
                         await transaction.update(this.tableName, { id: parentFolderInfo.id, is_leaf: 0 });
                     }
-                    parent_path = parentFolderInfo.parent_path ? parentFolderInfo.parent_path + '-' + parentFolderInfo.id : parentFolderInfo.id;
+                    parent_path = parentFolderInfo.parent_path ? parentFolderInfo.parent_path + '-' + parentFolderInfo.folder_id : parentFolderInfo.folder_id;
                 }
                 const childrenCount = await transaction.select(this.tableName, { where: { spid: this.ctx.subProject.id, parent_id: parentId }, orders: [['order', 'desc']] });
                 const order = childrenCount && childrenCount.length > 0 ? childrenCount[0].order + 1 : 1;
@@ -67,23 +67,23 @@ module.exports = app => {
                 if (info.uid !== this.ctx.session.sessionUser.accountId && !this.ctx.session.sessionUser.is_admin) {
                     throw '您没有权限删除此文件夹';
                 }
-                let ids = [info.id];
+                let ids = [info.folder_id];
                 if (info.parent_id === 0) {
-                    const childList = await this.getAllDataByCondition({ where: { spid: this.ctx.subProject.id, parent_id: info.id } });
+                    const childList = await this.getAllDataByCondition({ where: { spid: this.ctx.subProject.id, parent_id: info.folder_id } });
                     if (childList.length > 0) {
-                        ids = [...ids, ...this._.map(childList, 'id')];
+                        ids = [...ids, ...this._.map(childList, 'folder_id')];
                         for (const c of childList) {
-                            const deleteData = await this.getDataByParentPath(this.tableName, c.parent_path + '-' + c.id + '%', transaction);
+                            const deleteData = await this.getDataByParentPath(this.tableName, c.parent_path + '-' + c.folder_id + '%', transaction);
                             if (deleteData.length > 0) {
-                                const delids = this._.map(deleteData, 'id');
+                                const delids = this._.map(deleteData, 'folder_id');
                                 ids = [...ids, ...delids];
                             }
                         }
                     }
                 } else if (info.parent_path) {
-                    const deleteData = await this.getDataByParentPath(this.tableName, info.parent_path + '-' + info.id + '%', transaction);
+                    const deleteData = await this.getDataByParentPath(this.tableName, info.parent_path + '-' + info.folder_id + '%', transaction);
                     if (deleteData.length > 0) {
-                        const delids = this._.map(deleteData, 'id');
+                        const delids = this._.map(deleteData, 'folder_id');
                         ids = [...ids, ...delids];
                     }
                 }
@@ -92,7 +92,7 @@ module.exports = app => {
                 if (tenderCount > 0) {
                     throw '文件夹下存在标段，无法删除';
                 }
-                await transaction.delete(this.tableName, { id: ids });
+                await transaction.delete(this.tableName, { spid: this.ctx.subProject.id, folder_id: ids });
                 await transaction.commit();
             } catch (err) {
                 await transaction.rollback();
@@ -103,7 +103,7 @@ module.exports = app => {
         async getDataByParentPath(tableName, parent_path, transaction = null) {
             this.initSqlBuilder();
             this.sqlBuilder.setAndWhere('spid', {
-                value: this.ctx.subProject.id,
+                value: this.db.escape(this.ctx.subProject.id),
                 operate: '=',
             });
             this.sqlBuilder.setAndWhere('parent_path', {

app/view/dashboard/index.ejs

@@ -264,32 +264,32 @@
                                                 <tr data-type="10">
                                                     <td><span class="bg-new-payment text-new-payment badge text-width">支付审批</span></td>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills"><%- audit.scode %></a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills"><%- audit.scode %></a></td>
                                                     <% } else { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>"><%- audit.scode %></a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>"><%- audit.scode %></a></td>
                                                     <% } %>
                                                     <td>第<%- audit.sorder %>期</td>
                                                     <td><%- ctx.moment(audit.begin_time).format('YYYY/MM/DD HH:mm') %></td>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
                                                     <% } else { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
                                                     <% } %>
                                                 </tr>
                                             <% } else { %>
                                                 <tr data-type="10">
                                                     <td><span class="bg-new-payment text-new-payment badge text-width">支付审批</span></td>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/list"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills"><%- audit.scode %></a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/list"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills"><%- audit.scode %></a></td>
                                                     <% } else {%>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/list"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>"><%- audit.scode %></a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/list"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>"><%- audit.scode %></a></td>
                                                     <% } %>
                                                     <td>第<%- audit.sorder %>期</td>
                                                     <td><%- ctx.moment(audit.end_time).format('YYYY/MM/DD HH:mm') %></td>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-warning btn-sm btn-table text-warning" role="button">重新上报</a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-warning btn-sm btn-table text-warning" role="button">重新上报</a></td>
                                                     <% } else {%>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-warning btn-sm btn-table text-warning" role="button">重新上报</a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-warning btn-sm btn-table text-warning" role="button">重新上报</a></td>
                                                     <% } %>
                                                 </tr>
                                             <% } %>

app/view/stage/index.ejs

@@ -90,6 +90,20 @@
                                     </div>
                                 </div>
                             </li>
+                            <li class="nav-item">
+                                <div class="ml-2">
+                                    <div class="input-group input-group-sm">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">
+                                                <div class="form-group form-check mb-0">
+                                                    <input type="checkbox" class="form-check-input group-checkbox" id="pos-un-measure">
+                                                    <label class="form-check-label" for="pos-measure">未计量</label><!--勾选状态增加颜色text-danger-->
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
                             <!--工程量清单模式操作-->
                             <li class="nav-item">
                                 <div class="ml-2">

app/view/tender/detail.ejs

@@ -1174,7 +1174,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', forceMini: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');

app/view/tender/index.ejs

@@ -28,7 +28,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'list.menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', defaultMenu: '<%- ((!ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction) ? 'miniMenu' : '') %>',
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');

app/view/tender/info.ejs

@@ -27,7 +27,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'list.menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', forceMini: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', defaultMenu: '<%- ((!ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction) ? 'miniMenu' : '') %>',
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');

app/view/tender/manage.ejs

@@ -27,7 +27,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'list.menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', forceMini: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', defaultMenu: '<%- ((!ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction) ? 'miniMenu' : '') %>',
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');

app/view/tender/progress.ejs

@@ -26,7 +26,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'list.menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', forceMini: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', defaultMenu: '<%- ((!ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction) ? 'miniMenu' : '') %>',
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');