1. 甲供材料。兼容已出错的旧项目

2. 计量台账，右侧工具栏。展开收起问题

app/controller/revise_controller.js

@@ -44,7 +44,7 @@ module.exports = app => {
             const revise = await ctx.service.ledgerRevise.getLastestRevise(ctx.tender.id);
             const lastStage = await ctx.service.stage.getLastestStage(ctx.tender.id, true);
             return (ctx.tender.data.user_id === ctx.session.sessionUser.accountId) &&
-                (ctx.tender.data.ledger_status === audit.revise.status.checked) &&
+                (ctx.tender.data.ledger_status === audit.ledger.status.checked) &&
                 (!revise || !revise.valid || revise.status === audit.revise.status.checked) &&
                 (!lastStage || lastStage.status !== audit.stage.status.checking);
         }

app/public/js/stage.js

@@ -2560,29 +2560,6 @@ $(document).ready(() => {
     $('a', '.right-nav').bind('click', function () {
         //const main = $('#main-view'), tool = $('#tools-view');
         const tab = $(this), tabPanel = $(tab.attr('content'));
-        const showTools = function (show) {
-            const left = $('#main-view'), right = $('#tools-view'), parent = left.parent();
-            if (show) {
-                right.show();
-                autoFlashHeight();
-                /**
-                 * right.show()后, parent被撑开成2倍left.height, 导致parent.width减少了10px
-                 * 第一次left.width调整后，parent的缩回left.height, 此时parent.width又增加了10px
-                 * 故需要通过最终的parent.width再计算一次left.width
-                 *
-                 * Q: 为什么不通过先计算left.width的宽度，以避免计算两次left.width?
-                 * A: 右侧工具栏不一定显示，当右侧工具栏显示过一次后，就必须使用parent和right来计算left.width
-                 *
-                 */
-                    //left.css('width', parent.width() - right.outerWidth());
-                    //left.css('width', parent.width() - right.outerWidth());
-                const percent = 100 - right.outerWidth() /parent.width() * 100;
-                left.css('width', percent + '%');
-            } else {
-                right.hide();
-                left.css('width', '100%');
-            }
-        };
         if (!tab.hasClass('active')) {
             $('a', '.side-menu').removeClass('active');
             $('.tab-content .tab-select-show').removeClass('active');
@@ -2682,7 +2659,7 @@ $(document).ready(() => {
         } else {
             tab.removeClass('active');
             tabPanel.removeClass('active');
-            showTools(tab.hasClass('active'));
+            showSideTools(tab.hasClass('active'));
         }
         slSpread.refresh();
         spSpread.refresh();

app/service/stage_jgcl.js

@@ -31,7 +31,7 @@ module.exports = app => {
                         stimes: this.ctx.stage.curTimes, sorder: this.ctx.stage.curOrder
                     });
                     if (h) {
-                        d.arrive_qty = h.arrive_qty;
+                        d.arrive_qty = h.arrive_qty ? h.arrive_qty : h.arraive_qty;
                         d.arrive_tp = h.arrive_tp;
                         d.deduct_qty = h.deduct_qty;
                         d.deduct_tp = h.deduct_tp;