1. 删除原中间计量页面

2. 删除完成中间计量相关提示
3. 上报、审批他中国，不检查是否完成中间计量

app/controller/stage_controller.js

@@ -348,7 +348,6 @@ module.exports = app => {
                         responseData.data.curStageData = await ctx.service.stageBills.updateStageData(data.bills.stage);
                     }
                 }
-                await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, true);
                 await ctx.service.stage.updateCheckCalcFlag(ctx.stage.id, true);
                 ctx.body = responseData;
             } catch (err) {
@@ -396,7 +395,6 @@ module.exports = app => {
                 } else {
                     result = await ctx.service.stageChange.billsChange(data.target.bills, data.change);
                 }
-                await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, true);
                 await ctx.service.stage.updateCheckCalcFlag(ctx.stage.id, true);
                 ctx.body = {err: 0, msg: '', data: result};
             } catch(err) {
@@ -452,7 +450,6 @@ module.exports = app => {
 
                 const data = JSON.parse(ctx.request.body.data);
                 await ctx.service.stage.buildDetailData(ctx.tender.id, ctx.stage.order, data);
-                await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, true);
 
                 ctx.body = {err: 0, msg: '', data: null};
             } catch (err) {
@@ -517,7 +514,6 @@ module.exports = app => {
 
                 const data = JSON.parse(ctx.request.body.data);
                 await ctx.service.stage.update(data, { id: ctx.stage.id });
-                await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, true);
 
                 ctx.body = {err: 0, msg: '', data: this.ctx.stage};
             } catch (err) {
@@ -542,7 +538,6 @@ module.exports = app => {
                 } else {
                     responseData.data = await ctx.service.stageDetail.saveDetailData(data);
                 }
-                await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, true);
                 ctx.body = responseData;
             } catch (err) {
                 this.log(err);
@@ -564,7 +559,6 @@ module.exports = app => {
                 const fileInfo = path.parse(stream.filename);
                 const fileName = path.join('public/upload', this.ctx.tender.id.toString(), 'im', 'calcImg_' + create_time + fileInfo.ext);
                 await ctx.helper.saveStreamFile(stream, path.join(this.app.baseDir, 'app', fileName));
-                await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, true);
                 ctx.body = {err: 0, msg: '', data: fileName};
             } catch(err) {
                 this.log(err);
@@ -602,7 +596,6 @@ module.exports = app => {
                 await this.ctx.service.stageDetail.saveDetailData(data);
                 const imData = await ctx.service.stageDetail.getLastestImStageData(this.ctx.tender.id, this.ctx.stage.id, data.lid, data.uuid);
                 const responseData = {err: 0, msg: '', data: imData};
-                await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, true);
                 ctx.body = responseData;
             } catch (err) {
                 this.log(err);
@@ -610,23 +603,6 @@ module.exports = app => {
             }
         }
 
-        /**
-         * 中间计量 -- 完成中间计量(Post)
-         * @param ctx
-         * @returns {Promise<void>}
-         */
-        async doneDetail(ctx) {
-            try {
-                this._checkStageCanModify(ctx);
-
-                await ctx.service.stage.updateCheckDetailFlag(ctx.stage.id, false);
-                ctx.stage.check_detail = false;
-                ctx.body = {err: 0, msg: '', data: false}
-            } catch (err) {
-                this.log(err);
-                ctx.body = this.ajaxErrorBody(err, '数据错误，刷新页面再试');
-            }
-        }
 
         /**
          * 合同支付 (Get)
@@ -960,9 +936,6 @@ module.exports = app => {
                 if (ctx.stage.status === auditConst.status.checking || ctx.stage.status === auditConst.status.checked) {
                     throw '该期数据当前无法上报';
                 }
-                if (ctx.stage.check_detail) {
-                    throw '上报前，需要完成中间计量。';
-                }
 
                 await ctx.service.stageAudit.start(ctx.stage.id, ctx.stage.times);
 
@@ -995,9 +968,6 @@ module.exports = app => {
                 if (!data.checkType || isNaN(data.checkType)) {
                     throw '提交数据错误';
                 }
-                if (data.checkType === auditConst.status.checked && ctx.stage.check_detail) {
-                    throw '审批通过前，需要中间计量。';
-                }
                 if (data.checkType === auditConst.status.checkNo) {
                     if (!data.checkType || isNaN(data.checkType)) {
                         throw '提交数据错误';

app/public/js/stage.js

@@ -89,13 +89,6 @@ function initTreeColSettingEvents(setting) {
         }
     }
 }
-function needCheckDetail() {
-    stage.check_detail = true;
-    $('#check_point').show();
-    $('#sub-sp-btn').attr('data-target', '#sub-sp3');
-    $('#sp-done-btn').attr('data-target', '#sub-sp3');
-    $('#sp-list2-btn').attr('data-target', '#sub-sp3');
-}
 
 // 生成所有附件列表
 function getAllList(currPageNum = 1) {
@@ -319,7 +312,6 @@ $(document).ready(() => {
                     const nodes = stageTree.loadPostStageData(result.bills);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
                     stagePosSpreadObj.loadCurPosData();
-                    needCheckDetail();
                     detail.loadStageLedgerUpdateData(result);
                     self.obj.modal('hide');
                 });
@@ -581,7 +573,6 @@ $(document).ready(() => {
                     // tag update
                     const nodes = stageTree.loadPostStageData(data);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
-                    needCheckDetail();
                     detail.loadStageLedgerUpdateData(data);
                 }, function () {
                     SpreadJsObj.reLoadRowData(info.sheet, info.row);
@@ -654,7 +645,6 @@ $(document).ready(() => {
                     postData(window.location.href + '/update', {bills: bills}, function (result) {
                         const nodes = stageTree.loadPostStageData(result);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
-                        needCheckDetail();
                         detail.loadStageLedgerUpdateData(result);
                     });
                 }
@@ -758,7 +748,6 @@ $(document).ready(() => {
                     postData(window.location.href + '/update', {bills: updateData}, function (data) {
                         const nodes = stageTree.loadPostStageData(data);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes.concat(filterNodes));
-                        needCheckDetail();
                         detail.loadStageLedgerUpdateData(data);
                     }, function () {
                         // todo
@@ -806,7 +795,6 @@ $(document).ready(() => {
                 const nodes = stageTree.loadPostStageData(result.ledger);
                 stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
                 stagePosSpreadObj.loadCurPosData();
-                needCheckDetail();
                 detail.loadStagePosUpdateData(result);
                 toastr.success('已计量' + data.updateData.length + '条');
             }, function () {
@@ -1095,7 +1083,6 @@ $(document).ready(() => {
                     const refreshData = stageTree.loadPostStageData(result.ledger);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), refreshData);
                     stagePosSpreadObj.loadCurPosData();
-                    needCheckDetail();
                     detail.loadStagePosUpdateData(result);
                 }, function () {
                     stagePosSpreadObj.loadCurPosData();
@@ -1211,7 +1198,6 @@ $(document).ready(() => {
                     const nodes = stageTree.loadPostStageData(result.ledger);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
                     stagePosSpreadObj.loadCurPosData();
-                    needCheckDetail();
                     detail.loadStagePosUpdateData(result);
                 }, function () {
                     stagePosSpreadObj.loadCurPosData();
@@ -1257,7 +1243,6 @@ $(document).ready(() => {
                         }
                         const nodes = stageTree.loadPostStageData(result.ledger);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
-                        needCheckDetail();
                         detail.loadStagePosUpdateData(result);
                         // todo 只加载改变项
                         stagePosSpreadObj.loadCurPosData();
@@ -1282,7 +1267,6 @@ $(document).ready(() => {
                         const refreshData = stageTree.loadPostStageData(result.ledger);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), refreshData);
                         stagePosSpreadObj.loadCurPosData();
-                        needCheckDetail();
                         detail.loadStagePosUpdateData(result);
                     });
                 }
@@ -1809,7 +1793,6 @@ $(document).ready(() => {
                             postData(window.location.pathname + '/detail/save', updateData, function (result) {
                                 stageIm.loadUpdateDetailData(result);
                                 SpreadJsObj.reLoadRowData(info.sheet, info.row);
-                                needCheckDetail();
                             }, function () {
                                 SpreadJsObj.reLoadRowData(info.sheet, info.row);
                             });
@@ -1853,7 +1836,6 @@ $(document).ready(() => {
                             postData(window.location.pathname + '/detail/save', datas, function (result) {
                                 stageIm.loadUpdateDetailData(result);
                                 SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
-                                needCheckDetail();
                             }, function () {
                                 SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
                             })
@@ -1882,7 +1864,6 @@ $(document).ready(() => {
                             postData(window.location.pathname + '/detail/save', datas, function (result) {
                                 stageIm.loadUpdateDetailData(result);
                                 SpreadJsObj.reLoadRowData(sheet, sel.row, sel.rowCount);
-                                needCheckDetail();
                             }, function () {
                                 SpreadJsObj.reLoadRowData(sheet, sel.row, sel.rowCount);
                             });
@@ -1924,7 +1905,6 @@ $(document).ready(() => {
                         postData(window.location.pathname + '/detail/save', datas, function (result) {
                             stageIm.loadUpdateDetailData(result);
                             SpreadJsObj.reLoadRowData(info.sheet, info.fillRange.row, info.fillRange.rowCount);
-                            needCheckDetail();
                         }, function () {
                             SpreadJsObj.reLoadRowData(info.sheet, info.fillRange.row, info.fillRange.rowCount);
                         })
@@ -1944,12 +1924,6 @@ $(document).ready(() => {
             this._initModifyDetail();
             // 草图相关
             this._initImageRela();
-            // $('#done-detail').click(function () {
-            //     postData(window.location.pathname + '/done', {}, function () {
-            //         needCheckDetail(false);
-            //         $('#done').modal('hide');
-            //     })
-            // });
             this.reBuildImData();
         }
         _initImTypeSetRela() {
@@ -2040,7 +2014,6 @@ $(document).ready(() => {
                 postData(window.location.pathname + '/detail/build', data, function (result) {
                     stage.im_type = data.im_type;
                     stage.im_pre = data.im_pre;
-                    needCheckDetail();
                     if (stage.im_type === imType.tz.value) {
                         const jlCol = self.spreadSetting.cols.find(function (x) {return x.field === 'jl'});
                         jlCol.title = '本期计量金额';
@@ -2192,7 +2165,6 @@ $(document).ready(() => {
                 postData(window.location.pathname + '/detail/adv', data, function (result) {
                     stage.im_gather = data.im_gather;
                     stage.im_gather_node = data.im_gather_node;
-                    needCheckDetail();
                     $('#choose2').modal('hide');
                 });
             });
@@ -2240,7 +2212,6 @@ $(document).ready(() => {
                 postData(window.location.pathname + '/detail/save', updateData, function (result) {
                     _.assign(data, result);
                     self.reLoadDetailData();
-                    needCheckDetail();
                 });
             });
             // 取消
@@ -2338,7 +2309,6 @@ $(document).ready(() => {
                         $('.img-view').append(html.join(''));
                         $('.img-bar').click(removeImageItem);
                         setdraggrable();
-                        needCheckDetail();
                     });
                 }
             });
@@ -2389,14 +2359,12 @@ $(document).ready(() => {
                         _.assign(data, result);
                         self.reLoadDetailData();
                         $('#edit-img').modal('hide');
-                        needCheckDetail();
                     });
                 } else if (data.calc_img) {
                     postData(window.location.pathname + '/detail/merge-img', {updateType: 'clear', lid: data.lid, uuid: data.uuid}, function (result) {
                         _.assign(data, result);
                         self.reLoadDetailData();
                         $('#edit-img').modal('hide');
-                        needCheckDetail();
                     });
                 }
             });
@@ -2473,23 +2441,6 @@ $(document).ready(() => {
             $('#calc-img').attr('src', calcImgSrc);
             $('#view-calc-img').attr('src', calcImgSrc);
         }
-        // needCheckDetail(check = true) {
-        //     if (check) {
-        //         stage.check_detail = true;
-        //         $('#check_point').show();
-        //         $('#check-detail').show();
-        //         $('#sub-sp-btn').attr('data-target', '#sub-sp3');
-        //         $('#sp-done-btn').attr('data-target', '#sub-sp3');
-        //         $('#sp-list2-btn').attr('data-target', '#sub-sp3');
-        //     } else {
-        //         stage.check_detail = false;
-        //         $('#check_point').hide();
-        //         $('#check-detail').hide();
-        //         $('#sub-sp-btn').attr('data-target', '#sub-sp');
-        //         $('#sp-done-btn').attr('data-target', '#sp-done');
-        //         $('#sp-list2-btn').attr('data-target', '#sp-list2');
-        //     }
-        // }
     }
     // 展开收起附件
     $('a', '.right-nav').bind('click', function () {

app/public/js/stage_audit.js

@@ -135,11 +135,7 @@ $(document).ready(function () {
         $('#sp-list2').modal('hide');
     });
     $('a[f-target]').click(function () {
-        if (stage.check_detail) {
-            $('#sub-sp3').modal('show');
-        } else {
-            $($(this).attr('f-target')).modal('show');
-        }
+        $($(this).attr('f-target')).modal('show');
     })
 });
 // 检查上报情况

app/router.js

@@ -159,7 +159,6 @@ 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.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

@@ -177,7 +177,6 @@ module.exports = app => {
                 times: 1,
                 status: auditConst.status.uncheck,
                 user_id: this.ctx.session.sessionUser.accountId,
-                check_detail: true,
                 check_calc: false,
             };
             if (preStage) {
@@ -293,17 +292,6 @@ module.exports = app => {
             return calcBase;
         }
 
-        /**
-         * 更新 check_detail 标识
-         * @param {Integer}sid - 期id
-         * @param {Boolean}check - 标记
-         * @returns {Promise<void>}
-         */
-        async updateCheckDetailFlag(sid, check) {
-            const result = await this.db.update(this.tableName, {id: sid, check_detail: check});
-            return result.affectedRows === 1;
-        }
-
         async updateCheckCalcFlag(sid, check) {
             const result = await this.db.update(this.tableName, {id: sid, check_calc: check});
             return result.affectedRows === 1;

app/view/stage/audit_btn.ejs

@@ -1,13 +1,9 @@
 <div class="contarl-box">
     <% if (ctx.stage.status === auditConst.status.uncheck) { %>
-        <% if (ctx.session.sessionUser.accountId === ctx.stage.user_id && ctx.stage.check_detail === 0) { %>
-            <a id="sub-sp-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm btn-block">上报审批</a>
-        <% } else if (ctx.session.sessionUser.accountId === ctx.stage.user_id && ctx.stage.check_detail === 1) {%>
-            <a id="sub-sp-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sub-sp3" class="btn btn-primary btn-sm btn-block">上报审批</a>
-        <% } %>
+    <a id="sub-sp-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm btn-block">上报审批</a>
     <% } else if (ctx.stage.status === auditConst.status.checking) { %>
         <% if (ctx.stage.curAuditor && ctx.stage.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
-            <a id="sp-done-btn" href="javascript: void(0);" data-toggle="modal" data-target="<%- (ctx.stage.check_detail === 0 ? '#sp-done' : '#sub-sp3') %>" class="btn btn-success btn-sm btn-block">审批通过</a>
+            <a id="sp-done-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm btn-block">审批通过</a>
             <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm btn-block">审批退回</a>
         <% } else { %>
             <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm btn-block">审批中</a>
@@ -17,12 +13,12 @@
     <% } else if (ctx.stage.status === auditConst.status.checkNo) { %>
         <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm btn-block text-muted">审批退回</a>
         <% if (ctx.session.sessionUser.accountId === ctx.stage.user_id) { %>
-            <a id="sp-list2-btn" href="javascript: void(0);" data-toggle="modal" data-target="<%- (ctx.stage.check_detail === 0 ? '#sp-list2' : '#sub-sp3') %>" class="btn btn-primary btn-sm btn-block">重新上报</a>
+            <a id="sp-list2-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sp-list2" class="btn btn-primary btn-sm btn-block">重新上报</a>
         <% } %>
     <% } else if (ctx.stage.status === auditConst.status.checkNoPre) { %>
         <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm btn-block text-muted">审批退回</a>
         <% if (ctx.session.sessionUser.accountId === ctx.stage.curAuditor.aid) { %>
-            <a id="sp-done-btn" href="javascript: void(0);" data-toggle="modal" data-target="<%- (ctx.stage.check_detail === 0 ? '#sp-done' : '#sub-sp3') %>" class="btn btn-success btn-sm btn-block">审批通过</a>
+            <a id="sp-done-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm btn-block">审批通过</a>
             <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm btn-block">审批退回</a>
         <% } %>
     <% } %>

app/view/stage/audit_modal.ejs

@@ -71,25 +71,6 @@
         </div>
     </div>
 </div>
-<!--上报审批 需要完成中间计量-->
-<div class="modal fade" id="sub-sp3" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">上报审批</h5>
-            </div>
-            <div class="modal-body">
-                <h5>上报前，需要「完成本期中间计量」。</h5>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
-                <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>
-                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary btn-sm">进入中间计量</a>
-                <% } %>
-            </div>
-        </div>
-    </div>
-</div>
 <% } %>
 <% } %>
 <% if (ctx.stage.status === auditConst.status.checking) { %>
@@ -278,25 +259,6 @@
         </form>
     </div>
 </div>
-        <!--上报审批 需要完成中间计量-->
-        <div class="modal fade" id="sub-sp3" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">审批通过</h5>
-            </div>
-            <div class="modal-body">
-                <h5>审批前，需要「完成本期中间计量」。</h5>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
-                <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>
-                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary btn-sm">进入中间计量</a>
-                <% } %>
-            </div>
-        </div>
-    </div>
-</div>
     <% } else { %>
         <!--审批流程/结果-->
         <div class="modal fade" id="sp-list" data-backdrop="static">
@@ -765,25 +727,6 @@
             </div>
         </div>
     </div>
-    <!--上报审批 需要完成中间计量-->
-    <div class="modal fade" id="sub-sp3" data-backdrop="static">
-        <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">重新上报</h5>
-            </div>
-            <div class="modal-body">
-                <h5>上报前，需要「完成本期中间计量」。</h5>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
-                <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>
-                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary btn-sm">进入中间计量</a>
-                <% } %>
-            </div>
-        </div>
-    </div>
-    </div>
     <% } %>
 <% } else if (ctx.stage.status === auditConst.status.checkNoPre) { %>
     <!--审批流程/结果-->
@@ -1093,29 +1036,9 @@
         </form>
     </div>
     </div>
-    <!--上报审批 需要完成中间计量-->
-    <div class="modal fade" id="sub-sp3" data-backdrop="static">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">审批通过</h5>
-                </div>
-                <div class="modal-body">
-                    <h5>审批前，需要「完成本期中间计量」。</h5>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
-                    <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>
-                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary btn-sm">进入中间计量</a>
-                    <% } %>
-                </div>
-            </div>
-        </div>
-    </div>
     <% } %>
 <% } %>
 <% if (ctx.stage.auditors !== undefined && ctx.stage.auditors.length !== 0 && ctx.stage.auditors[ctx.stage.auditors.length-1].aid === ctx.session.sessionUser.accountId && ctx.stage.status === auditConst.status.checked && ctx.stage.order === ctx.stage.highOrder) { %>
-    <!--上报审批 需要完成中间计量-->
     <div class="modal fade" id="sp-down-back" data-backdrop="static">
         <div class="modal-dialog" role="document">
             <div class="modal-content">

app/view/stage/modal.ejs

@@ -365,24 +365,6 @@
         </div>
     </div>
 </div>
-<!--完成中间计量-->
-<div class="modal fade" id="done" data-backdrop="static">
-    <div class="modal-dialog " role="document" >
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">完成中间计量</h5>
-            </div>
-            <div class="modal-body">
-                <h5>完成中间计量后，将锁定编辑，无法修改数据。</h5>
-                <h5>确认完成后，即可上报本期计量。</h5>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
-                <a id="done-detail" href="javascript: void(0);" class="btn btn-success btn-sm" >确认完成</a>
-            </div>
-        </div>
-    </div>
-</div>
 <!--草图预览-->
 <div class="modal fade" id="imgview" data-backdrop="static">
     <div class="modal-dialog modal-lgx" role="document">

app/view/stage/stage_sub_menu.ejs

@@ -6,55 +6,45 @@
     </div>
     <div class="scrollbar-auto">
         <div class="nav-box">
-                <ul class="nav-list list-unstyled">
-                    <li class=""><a href="/tender/<%- ctx.tender.id %>/measure/stage"><i class="fa fa-chevron-left "></i> <span>返回</span></a></li>
-                </ul>
-            </div>
-        <div class="nav-box">
-                <ul class="nav-list list-unstyled">
-                    <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order) { %>active<% } %>">
-                        <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>"><span class="ml-3">计量台帐</span></a>
-                    </li>
-                </ul>
-            </div>
+            <ul class="nav-list list-unstyled">
+                <li class=""><a href="/tender/<%- ctx.tender.id %>/measure/stage"><i class="fa fa-chevron-left "></i> <span>返回</span></a></li>
+            </ul>
+        </div>
         <div class="nav-box">
-                <ul class="nav-list list-unstyled">
-                    <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>active<% } %>">
-                        <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/detail"><span class="ml-3">中间计量</span></a>
-                        <span class=" position-absolute tips-dot" data-toggle="tooltip" data-placement="bottom" data-original-title="完成中间计量" id="check_point" <% if (!ctx.stage.check_detail) { %>style="display: none;"<% } %>>
-                            <i class="fa fa-circle text-danger"></i>
-                        </span>
-                    </li>
-                </ul>
-            </div>
+            <ul class="nav-list list-unstyled">
+                <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order) { %>active<% } %>">
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>"><span class="ml-3">计量台帐</span></a>
+                </li>
+            </ul>
+        </div>
         <div class="nav-box">
-                <ul class="nav-list list-unstyled">
-                    <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/pay') { %>active<% } %>">
-                        <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/pay"><span class="ml-3">合同支付</span></a>
-                    </li>
-                </ul>
-            </div>
+            <ul class="nav-list list-unstyled">
+                <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/pay') { %>active<% } %>">
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/pay"><span class="ml-3">合同支付</span></a>
+                </li>
+            </ul>
+        </div>
         <div class="nav-box">
-                <ul class="nav-list list-unstyled">
-                    <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/change') { %>active<% } %>">
-                        <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/change"><span class="ml-3">变更概况</span></a>
-                    </li>
-                </ul>
-            </div>
+            <ul class="nav-list list-unstyled">
+                <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/change') { %>active<% } %>">
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/change"><span class="ml-3">变更概况</span></a>
+                </li>
+            </ul>
+        </div>
         <div class="nav-box">
-                <ul class="nav-list list-unstyled">
-                    <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/gather') { %>active<% } %>">
-                        <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/gather"><span class="ml-3">清单汇总</span></a>
-                    </li>
-                </ul>
-            </div>
+            <ul class="nav-list list-unstyled">
+                <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/gather') { %>active<% } %>">
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/gather"><span class="ml-3">清单汇总</span></a>
+                </li>
+            </ul>
+        </div>
         <div class="nav-box">
-                <ul class="nav-list list-unstyled">
-                    <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/compare') { %>active<% } %>">
-                        <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/compare"><span class="ml-3">审核比较</span></a>
-                    </li>
-                </ul>
-            </div>
+            <ul class="nav-list list-unstyled">
+                <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/compare') { %>active<% } %>">
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/compare"><span class="ml-3">审核比较</span></a>
+                </li>
+            </ul>
+        </div>
         <% include ./audit_btn.ejs %>
         <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-upload fa-rotate-270"></i></a></div>
     </div>

app/view/stage/stage_sub_mini_menu.ejs

@@ -19,16 +19,6 @@
         </div>
         <div class="nav-box">
             <ul class="nav-list list-unstyled">
-                <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>active<% } %>">
-                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/detail"><span class="ml-3">中间计量</span></a>
-                    <span class=" position-absolute tips-dot" data-toggle="tooltip" data-placement="bottom" data-original-title="完成中间计量" id="check_point" <% if (!ctx.stage.check_detail) { %>style="display: none;"<% } %>>
-                            <i class="fa fa-circle text-danger"></i>
-                        </span>
-                </li>
-            </ul>
-        </div>
-        <div class="nav-box">
-            <ul class="nav-list list-unstyled">
                 <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/pay') { %>active<% } %>">
                     <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- stage.order %>/pay"><span class="ml-3">合同支付</span></a>
                 </li>