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

app/controller/pay_controller.js

@@ -36,6 +36,7 @@ module.exports = app => {
                 }
                 const stages = await this.ctx.service.stage.getAllDataByCondition({ where: { tid: ctx.tender.id }, orders: [['order', 'AEC']] });
                 const validStages = stages.filter(s => {
+                    if (s.status !== audit.stage.status.checked) return false;
                     return !relaStage.find(r => { return s.id === r.stage_id; });
                 });
                 this.ctx.service.phasePay.calculatePhasePay(phasePays);

app/middleware/stage_check.js

@@ -64,6 +64,11 @@ module.exports = options => {
             stage.hadMaterial = materials.find(function(item) {
                 return item.s_order.split(',').indexOf(stage.highOrder.toString()) !== -1;
             });
+            const phasePays = yield this.service.phasePay.getAllDataByCondition({ columns: ['rela_stage'], where: { tid: this.tender.id } });
+            stage.hadPhasePay = phasePays.find(function(pp) {
+                pp.rela_stage = pp.rela_stage ? JSON.parse(pp.rela_stage) : [];
+                return pp.rela_stage.find(x => { return x.stage_id === stage.id; });
+            });
 
             // 权限相关
             // todo 校验权限 （标段参与人、分享、游客）

app/service/phase_pay_detail.js

@@ -495,7 +495,7 @@ class PhasePayDetail extends TreeService {
 
         // 查询应返回的结果
         const resultData = {};
-        resultData.create = await this.getNextsData(masterId, select.tree_id, children.length + 1);
+        resultData.create = await this.getNextsData(masterId, select.tree_id, children.length);
         if (children.length === 0) resultData.update = await this.getDataByKid(masterId, select.tree_id);
         return resultData;
     }

app/view/phase_pay/detail.ejs

@@ -19,14 +19,6 @@
                     </div>
                 </div>
             </div>
-            <div class="ml-auto">
-                <% if (!ctx.phasePay.readOnly) { %>
-                <button class="btn btn-sm btn-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="计算全部" id="calc-all"><i class="fa fa-play"></i></button>
-                <% } %>
-                <% if (ctx.phasePay.audit_status === auditConst.status.uncheck) { %>
-                <button class="btn btn-sm btn-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="刷新基数" id="reload-calc-base"><i class="fa fa-repeat"></i></button>
-                <% } %>
-            </div>
         </div>
     </div>
     <div class="content-wrap pr-46">

app/view/phase_pay/index.ejs

@@ -6,7 +6,7 @@
             <h2>
                 合同支付列表
             </h2>
-            <% if (ctx.session.sessionUser.accountId === ctx.tender.data.user_id && (phasePays.length === 0 || phasePays[0].audit_status === auditConst.status.checked)) { %>
+            <% if (ctx.session.sessionUser.accountId === ctx.tender.data.user_id && (phasePays.length === 0 || phasePays[0].audit_status === auditConst.status.checked) && validStages.length > 0) { %>
             <div class="ml-auto">
                 <a href="#add-qi" data-toggle="modal" data-target="#add-qi" class="btn btn-primary btn-sm">开始新一期</a>
             </div>

app/view/stage/audit_modal.ejs

@@ -642,7 +642,7 @@
     <% } %>
 <% } %>
 <% if (ctx.stage && ctx.stage.finalAuditorIds.indexOf(ctx.session.sessionUser.accountId) >= 0 && ctx.stage.status === auditConst.status.checked && ctx.stage.order === ctx.stage.highOrder) { %>
-<% if (ctx.stage.hadMaterial) { %>
+<% if (ctx.stage.hadMaterial || ctx.stage.hadPhasePay) { %>
 <div class="modal fade" id="sp-down-back" data-backdrop="static">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -650,7 +650,12 @@
                 <h5 class="modal-title">重新审批</h5>
             </div>
             <div class="modal-body">
+                <% if (ctx.stage.hadMaterial) { %>
                 <h5>材料调差已使用当前期，如需重新审批，请先删除材料调差相关期</h5>
+                <% } %>
+                <% if (ctx.stage.hadPhasePay) { %>
+                <h5>合同支付已使用当前期，如需重新审批，请先删除合同支付相关期</h5>
+                <% } %>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>