调整变更令头部样式

app/public/js/change_information.js

@@ -486,6 +486,7 @@ $(document).ready(() => {
             xmjSpread.refresh();
             const width = (($('#right-view').width()/$('#right-view').parent('div').width())*100).toFixed();
             setLocalCache('change_information_width', width);
+            $('#left-header').css('min-width', (100 - parseFloat(getLocalCache('change_information_width'))) + '%');
         }
     });
 
@@ -493,6 +494,7 @@ $(document).ready(() => {
     if (getLocalCache('change_information_width')) {
         $('#left-view').css('width', (100 - parseFloat(getLocalCache('change_information_width'))) + '%');
         $('#right-view').css('width', getLocalCache('change_information_width') + '%');
+        $('#left-header').css('min-width', (100 - parseFloat(getLocalCache('change_information_width'))) + '%');
         changeSpread.refresh();
         xmjSpread.refresh();
     }

app/service/stage.js

@@ -144,7 +144,7 @@ module.exports = app => {
                     }
                     stage.filePermission = false;
                 } else if (!!isTenderTourist || force) {
-                    stage.filePermission = this.tender.touristPermission.file;
+                    stage.filePermission = this.tender && this.tender.touristPermission ? this.tender.touristPermission.file : false;
                 } else {
                     throw '您无权查看该数据';
                 }

app/service/stage_audit.js

@@ -1243,7 +1243,7 @@ module.exports = app => {
                     // 计算并合同支付最终数据
                     const [yfPay, sfPay] = await this.ctx.service.stagePay.calcAllStagePays(this.ctx.stage, transaction);
                     this.ctx.stage.tp_history.push({
-                        times,
+                        times: times - 1,
                         order: curAudit.order,
                         contract_tp: tpData.contract_tp,
                         qc_tp: tpData.qc_tp,

app/view/change/information.ejs

@@ -1,16 +1,32 @@
 <% include ../tender/tender_sub_menu.ejs %>
 <div class="panel-content">
-    <div class="panel-title"><!--收起详解目录添加类名 fluid -->
+    <div class="panel-title" style="padding-right: 0px"><!--收起详解目录添加类名 fluid -->
         <div class="title-main d-flex"><!--工具-->
             <% include ../tender/tender_sub_mini_menu.ejs %>
-            <div>
-                <% if(auditStatus === auditConst.status.uncheck || auditStatus === auditConst.status.back || auditStatus === auditConst.status.revise) { %>
-                    <div class="d-inline-block">
+            <div style="width: 100%">
+                <div id="left-header" class="d-inline-block" style="min-width: 203px;">
+                <% if(auditStatus === 1 || auditStatus === 2 || auditStatus === 9) { %>
+                    <div class="d-inline-block mr-3">
                         <a class="btn btn-sm btn-primary" href="#add-bj" data-toggle="modal" data-target="#add-bj">拷贝其他变更令数据</a>
                     </div>
                 <% } %>
+                <div class="d-inline-block">
+                    <div class="custom-control custom-checkbox" style="line-height: normal;">
+                        <input type="checkbox" class="custom-control-input change-detail-checkbox" id="customCheck1">
+                        <label class="custom-control-label" for="customCheck1">变更详情</label>
+                    </div>
+                </div>
+                <% if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7 || auditStatus === 8) { %>
+                    <div class="d-inline-block ml-3">
+                        <div class="custom-control custom-checkbox" style="line-height: normal;">
+                            <input type="checkbox" class="custom-control-input" id="show-table-detail">
+                            <label class="custom-control-label" for="show-table-detail">审批过程</label>
+                        </div>
+                    </div>
+                <% } %>
+                </div>
                 <% if (auditStatus === 1 || auditStatus === 2 || auditStatus === 9) { %>
-                    <div class="d-inline-block">
+                    <div class="d-inline-block ml-3">
                         <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>台账清单</a>
                     </div>
                     <div class="d-inline-block mr-1">
@@ -35,75 +51,61 @@
                             </ul>
                         </div>
                     </div>
-                    <div class="d-inline-block mr-3" id="upAndMoveBtn" <% if (change.order_by === 0) { %>style="display: none!important;" <% } %>>
+                    <div class="d-inline-block mr-2" id="upAndMoveBtn" <% if (change.order_by === 0) { %>style="display: none!important;" <% } %>>
                         <a href="javascript:void(0)" id="up-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                         <a href="javascript:void(0)" id="down-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                     </div>
                 <% } %>
-                <div class="d-inline-block">
-                    <div class="custom-control custom-checkbox" style="line-height: normal;">
-                        <input type="checkbox" class="custom-control-input change-detail-checkbox" id="customCheck1">
-                        <label class="custom-control-label" for="customCheck1">变更详情</label>
-                    </div>
-                </div>
-                <% if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7 || auditStatus === 8) { %>
-                    <div class="d-inline-block ml-3">
-                        <div class="custom-control custom-checkbox" style="line-height: normal;">
-                            <input type="checkbox" class="custom-control-input" id="show-table-detail">
-                            <label class="custom-control-label" for="show-table-detail">审批过程</label>
-                        </div>
-                    </div>
-                <% } %>
                 <% if (showPlanBtn) { %>
                 <div class="d-inline-block ml-3">
                     <a class="btn btn-sm btn-primary" href="#bgfadb" data-toggle="modal" data-target="#bgfadb">差值对比</a>
                 </div>
                 <% } %>
-            </div>
-            <div class="ml-auto" id="sp-btn">
-                <!--info状态区分-->
-                <% if (auditStatus === 1) { %>
-                    <a href="#sub-ap" data-category="up_change" data-toggle="modal" data-target="#sub-ap" class="btn btn-primary btn-sm">上报审批</a>
-                <% } else if (auditStatus === 2 || auditStatus === 9) { %>
-                    <a href="#sub-sp2" data-category="up_change" data-toggle="modal" data-target="#sub-sp2" class="btn btn-primary btn-sm">重新上报</a>
-                <% } else if (auditStatus === 3) { %>
-                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-muted">审批退回</a>
-                <% } else if (auditStatus === 4) { %>
-                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-success btn-sm">审批完成</a>
-                <% } else if (auditStatus === 5) { %>
-                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-danger btn-sm">审批终止</a>
-                <% } else if (auditStatus === 6) { %>
-                    <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm">审批通过</a>
-                    <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm">审批退回</a>
-                <% } else if (auditStatus === 7) { %>
-                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm">审批中</a>
-                <% } else if (auditStatus === 8) { %>
-                    <% if (change.status === auditConst.status.uncheck) { %>
-                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm">上报中</a>
-                    <% } else if (change.status === auditConst.status.checking) { %>
-                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm">审批中</a>
+                <div class="pull-right mr-3" id="sp-btn">
+                    <!--info状态区分-->
+                    <% if (auditStatus === 1) { %>
+                        <a href="#sub-ap" data-category="up_change" data-toggle="modal" data-target="#sub-ap" class="btn btn-primary btn-sm">上报审批</a>
+                    <% } else if (auditStatus === 2 || auditStatus === 9) { %>
+                        <a href="#sub-sp2" data-category="up_change" data-toggle="modal" data-target="#sub-sp2" class="btn btn-primary btn-sm">重新上报</a>
+                    <% } else if (auditStatus === 3) { %>
+                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-muted">审批退回</a>
+                    <% } else if (auditStatus === 4) { %>
+                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-success btn-sm">审批完成</a>
+                    <% } else if (auditStatus === 5) { %>
+                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-danger btn-sm">审批终止</a>
+                    <% } else if (auditStatus === 6) { %>
+                        <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm">审批通过</a>
+                        <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm">审批退回</a>
+                    <% } else if (auditStatus === 7) { %>
+                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm">审批中</a>
+                    <% } else if (auditStatus === 8) { %>
+                        <% if (change.status === auditConst.status.uncheck) { %>
+                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm">上报中</a>
+                        <% } else if (change.status === auditConst.status.checking) { %>
+                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm">审批中</a>
+                        <% } %>
                     <% } %>
-                <% } %>
-                <% if (auditStatus === 4 && ctx.session.sessionUser.accountId === auditList[auditList.length-1].uid) { %>
-                    <% if (stageChangeNum === 0) { %>
-                        <!--重新审批-->
-                        <!--<a href="javascript: void(0);" data-toggle="modal" data-target="#sp-down-back" class="btn btn-warning btn-sm">重新审批</a>-->
-                    <% } else { %>
-                        <!--<button class="btn btn-outline-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="已被调用">重新审批</button>-->
+                    <% if (auditStatus === 4 && ctx.session.sessionUser.accountId === auditList[auditList.length-1].uid) { %>
+                        <% if (stageChangeNum === 0) { %>
+                            <!--重新审批-->
+                            <!--<a href="javascript: void(0);" data-toggle="modal" data-target="#sp-down-back" class="btn btn-warning btn-sm">重新审批</a>-->
+                        <% } else { %>
+                            <!--<button class="btn btn-outline-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="已被调用">重新审批</button>-->
+                        <% } %>
                     <% } %>
-                <% } %>
-                <% if (auditStatus === 4 && ctx.session.sessionUser.accountId === change.uid) { %>
-                    <a href="javascript: void(0);" data-toggle="modal" data-target="#sp-down-revise" class="btn btn-warning btn-sm">修订变更</a>
+                    <% if (auditStatus === 4 && ctx.session.sessionUser.accountId === change.uid) { %>
+                        <a href="javascript: void(0);" data-toggle="modal" data-target="#sp-down-revise" class="btn btn-warning btn-sm">修订变更</a>
+                    <% } %>
+                </div>
+                <!--info状态区分-->
+                <% if (auditStatus === 1 || auditStatus === 2 || auditStatus === 9) { %>
+                    <div class="pull-right px-3" id="show-save-btn" style="display: none">
+                        <span>您修改了变更信息，记得保存修改。</span>
+                        <button class="btn btn-sm btn-primary save_change_btn" id="save_change"><i class="fa fa-save"></i> 保存修改</button>
+                        <button class="btn btn-sm btn-light" id="cancel_change">取消</button>
+                    </div>
                 <% } %>
             </div>
-            <!--info状态区分-->
-            <% if (auditStatus === 1 || auditStatus === 2 || auditStatus === 9) { %>
-                <div class="ml-auto px-4" id="show-save-btn" style="display: none">
-                    <span>您修改了变更信息，记得保存修改。</span>
-                    <button class="btn btn-sm btn-primary save_change_btn" id="save_change"><i class="fa fa-save"></i> 保存修改</button>
-                    <button class="btn btn-sm btn-light" id="cancel_change">取消</button>
-                </div>
-            <% } %>
         </div>
     </div>
     <div class="content-wrap">