Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/public/js/stage.js

@@ -1372,6 +1372,7 @@ $(document).ready(() => {
             let bcontent = $(".bcontent-wrap") ? $(".bcontent-wrap").height() : 0;
             $(".sp-wrap").height(bcontent-30);
             spSpread.refresh();
+            window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
         }
     });
 
@@ -1692,6 +1693,7 @@ $(document).ready(() => {
                 detail.spread.refresh();
             }
             if (checkedChanges) checkedChanges.refresh();
+            window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
         }
     });
 
@@ -1702,12 +1704,17 @@ $(document).ready(() => {
             if (detail) {
                 detail.spread.refresh();
             }
+            $('.zhongjian-msg').height($('#zhongjian .sjs-bottom').height());
+            window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
         }
     });
 
     // 附件加载上下窗口resizer
     $.divResizer({
         select: '#file-spr',
+        callback: function () {
+            window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
+        }
     });
 
     // 变更令加载上下窗口resizer
@@ -1715,6 +1722,7 @@ $(document).ready(() => {
         select: '#change-spr',
         callback: function () {
             if (checkedChanges) checkedChanges.refresh();
+            window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
         }
     });
 
@@ -2647,8 +2655,12 @@ $(document).ready(() => {
                 if (!detail) {
                     detail = new Detail($('#detail-spread'));
                     detail.spread.refresh();
+                    $('#zhongjian .sjs-bottom').height('400px');
+                    $('.zhongjian-msg').height($('#zhongjian .sjs-bottom').height());
                 } else {
                     detail.spread.refresh();
+                    $('#zhongjian .sjs-bottom').height('400px');
+                    $('.zhongjian-msg').height($('#zhongjian .sjs-bottom').height());
                 }
             }
             if (tab.attr('content') === '#checked-change') {

app/public/js/tender_list.js

@@ -343,7 +343,8 @@ function bindTenderUrl() {
         });
         if (!tender) return;
         if (tender.measure_type) {
-            window.location.href = '/tender/' + tenderId;
+            // window.location.href = '/tender/' + tenderId;
+            window.open('/tender/' + tenderId, '_blank');
         } else {
             for (const a of $('a', '#jlms')) {
                 a.href = '/tender/' + tenderId + '/type?type=' + $(a).attr('mst');

app/public/js/tender_list_info.js

@@ -399,7 +399,8 @@ function bindTenderUrl() {
             return t.id === tenderId;
         });
         if (tender.measure_type) {
-            window.location.href = '/tender/' + tenderId;
+            // window.location.href = '/tender/' + tenderId;
+            window.open('/tender/' + tenderId, '_blank');
         } else {
             for (const a of $('a', '#jlms')) {
                 a.href = '/tender/' + tenderId + '/type?type=' + $(a).attr('mst');

app/public/js/tender_list_manage.js

@@ -334,7 +334,8 @@ function bindTenderUrl() {
             return t.id === tenderId;
         });
         if (tender.measure_type) {
-            window.location.href = '/tender/' + tenderId;
+            // window.location.href = '/tender/' + tenderId;
+            window.open('/tender/' + tenderId, '_blank');
         } else {
             for (const a of $('a', '#jlms')) {
                 a.href = '/tender/' + tenderId + '/type?type=' + $(a).attr('mst');

app/public/js/tender_list_progress.js

@@ -374,7 +374,8 @@ function bindTenderUrl() {
             return t.id === tenderId;
         });
         if (tender.measure_type) {
-            window.location.href = '/tender/' + tenderId;
+            // window.location.href = '/tender/' + tenderId;
+            window.open('/tender/' + tenderId, '_blank');
         } else {
             for (const a of $('a', '#jlms')) {
                 a.href = '/tender/' + tenderId + '/type?type=' + $(a).attr('mst');

app/view/measure/stage.ejs

@@ -36,7 +36,7 @@
                     <% for (const s of stages) { %>
                     <tr>
                         <td>
-                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>">第 <%- s.order %> 期</a>
+                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank">第 <%- s.order %> 期</a>
                             <% if (s.status !== auditConst.status.checked && s.user_id === ctx.session.sessionUser.accountId) { %>
                             <a href="#edit" data-toggle="modal" data-target="#edit"><i class="fa fa-pencil-square-o "></i></a>
                             <% } %>
@@ -56,13 +56,13 @@
                         </td>
                         <td class="text-center">
                             <% if (s.status === auditConst.status.uncheck && s.user_id === ctx.session.sessionUser.accountId) { %>
-                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
+                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
                             <% } else if (s.status === auditConst.status.checkNo && s.curAuditor && s.user_id === ctx.session.sessionUser.accountId) { %>
-                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
+                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
                             <% } else if (s.status === auditConst.status.checking && s.curAuditor && s.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
-                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
+                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
                             <% } else if (s.status === auditConst.status.checkNoPre && s.curAuditor && s.curAuditor2.aid === ctx.session.sessionUser.accountId) { %>
-                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
+                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
                             <% } else { %>
                             <span class="<%- auditConst.auditStringClass[s.status] %>"><%- auditConst.auditString[s.status] %></span>
                             <% } %>

app/view/stage/index.ejs

@@ -111,6 +111,7 @@
                         </div>
                         <div class="sjs-bottom">
                             <div class="resize-y" id="zhongjian-spr" r-Type="height" div1=".sjs-height-5" div2=".sjs-bottom" title="调整大小"><!--调整上下高度条--></div>
+                            <div class="zhongjian-msg" style="height:400px;overflow-y: auto">
                             <% if (!stage.readOnly) { %>
                             <legend class="sticky-top bg-white">
                                 <div class="d-flex justify-content-end mb-1">
@@ -207,6 +208,7 @@
                                     <p><a href="#imgview" data-toggle="modal" data-target="#imgview"><img src="" id="calc-img" class="w-100"></a></p>
                                 </div>
                             </div>
+                            </div>
                         </div>
                     </div>
                     <!--查找定位-->