1. 清单汇总，根据该期状态，显示数据

2. 完成中间计量按钮，调整

app/controller/stage_controller.js

@@ -137,6 +137,7 @@ module.exports = app => {
          */
         async index(ctx) {
             try {
+                console.log(ctx.stage);
                 await this._getStageAuditViewData(ctx);
                 const renderData = await this._getDefaultRenderData(ctx);
                 [renderData.ledgerSpread, renderData.posSpread] = this._getSpreadSetting();
@@ -337,6 +338,7 @@ module.exports = app => {
          */
         async detail(ctx) {
             try {
+                console.log(ctx.stage);
                 await this._getStageAuditViewData(ctx);
                 const renderData = await this._getDefaultRenderData(ctx);
                 renderData.jsFiles = this.app.jsFiles.common.concat(this.app.jsFiles.stage.detail);
@@ -538,9 +540,10 @@ module.exports = app => {
             try {
                 await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, false);
                 ctx.stage.check_detail = false;
-                ctx.redirect(ctx.request.header.referer);
+                ctx.body = {err: 0, msg: '', data: false}
             } catch (err) {
-                ctx.redirect(ctx.request.header.referer);
+                this.log(err);
+                ctx.body = this.ajaxErrorBody(err, '数据错误，刷新页面再试');
             }
         }
 
@@ -972,12 +975,12 @@ module.exports = app => {
                 const renderData = await this._getDefaultRenderData(ctx);
                 [renderData.gclSpread, renderData.leafXmjSpread] = this._getGatherSpreadSetting();
                 renderData.ledger = await ctx.service.ledger.getData(ctx.tender.id);
-                renderData.curLedgerData = await ctx.service.stageBills.getAuditorStageData(ctx.tender.id, ctx.stage.id, ctx.stage.times, 0);
+                renderData.curLedgerData = await ctx.service.stageBills.getAuditorStageData(ctx.tender.id, ctx.stage.id, ctx.stage.curTimes, ctx.stage.curOrder);
 
                 renderData.pos = await ctx.service.pos.getPosData({tid: ctx.tender.id});
                 // todo 根据当前人，或指定对象查询数据
                 renderData.curPosData = await ctx.service.stagePos.getAuditorStageData(ctx.tender.id,
-                    ctx.stage.id, ctx.stage.times, ctx.stage.curAuditor ? ctx.stage.curAuditor.order : 0);
+                    ctx.stage.id, ctx.stage.curTimes, ctx.stage.curOrder);
                 //renderData.gcl = await this.ctx.service.ledger.getAllLeafGclBills(this.ctx.tender.id);
                 renderData.dealBills = await ctx.service.dealBills.getAllDataByCondition({ where: {tender_id: this.ctx.tender.id} });
 

app/public/js/stage_detail.js

@@ -8,7 +8,7 @@
  * @version
  */
 
-function needCheckDetail(check = false) {
+function needCheckDetail(check = true) {
     if (check) {
         stage.check_detail = true;
         $('#check_point').show();
@@ -758,4 +758,10 @@ $(document).ready(() => {
             });
         }
     });
+    $('#done-detail').click(function () {
+        postData(window.location.pathname + '/done', {}, function () {
+            needCheckDetail(false);
+            $('#done').modal('hide');
+        })
+    })
 });

app/router.js

@@ -149,7 +149,7 @@ module.exports = app => {
     app.post('/tender/:id/measure/stage/:order/detail/save', sessionAuth, tenderCheck, stageCheck, 'stageController.saveDetailData');
     app.post('/tender/:id/measure/stage/:order/detail/add-img', sessionAuth, tenderCheck, stageCheck, 'stageController.addCalcImage');
     app.post('/tender/:id/measure/stage/:order/detail/merge-img', sessionAuth, tenderCheck, stageCheck, 'stageController.mergeCalcImage');
-    app.get('/tender/:id/measure/stage/:order/detail/done', sessionAuth, tenderCheck, stageCheck, 'stageController.doneDetail');
+    app.post('/tender/:id/measure/stage/:order/detail/done', sessionAuth, tenderCheck, stageCheck, 'stageController.doneDetail');
     // 合同支付
     app.get('/tender/:id/measure/stage/:order/pay', sessionAuth, tenderCheck, stageCheck, 'stageController.pay');
     app.post('/tender/:id/measure/stage/:order/pay/detail', sessionAuth, tenderCheck, stageCheck, 'stageController.chapterDetail');

app/service/stage.js

@@ -160,6 +160,7 @@ module.exports = app => {
                 times: 1,
                 status: auditConst.status.uncheck,
                 user_id: this.ctx.session.sessionUser.accountId,
+                check_detail: true,
             };
             if (preStage) {
                 newStage.im_type = preStage.im_type;

app/view/stage/detail.ejs

@@ -13,7 +13,7 @@
             <div class="ml-auto">
                 <!--完成中间计量-->
                 <% if (!ctx.stage.readOnly) { %>
-                <a id="check-detail" href="javascirpt: void(0);" data-toggle="modal" data-target="#done" class="btn btn-success btn-sm pull-right" <% if (!ctx.stage.readOnly) { %>style="display: none"<% } %>>完成本期中间计量</a>
+                <a id="check-detail" href="javascirpt: void(0);" data-toggle="modal" data-target="#done" class="btn btn-success btn-sm pull-right" <% if (!ctx.stage.check_detail) { %>style="display: none"<% } %>>完成本期中间计量</a>
                 <% } %>
             </div>
         </div>

app/view/stage/detail_modal.ejs

@@ -139,7 +139,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a id="done-detail" href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail/done" class="btn btn-success" >确认完成</a>
+                <a id="done-detail" href="javascript: void(0);" class="btn btn-success" >确认完成</a>
             </div>
         </div>
     </div>