最新一起，未上报，审批人查看的情况

app/controller/stage_controller.js

@@ -1032,12 +1032,10 @@ module.exports = app => {
                 //     opinion: ctx.request.body.opinion,
                 // };
                 if (!data.checkType || isNaN(data.checkType)) {
-                    console.log('error1');
                     throw '提交数据错误';
                 }
                 if (data.checkType === auditConst.status.checkNo) {
                     if (!data.checkType || isNaN(data.checkType)) {
-                        console.log('error2');
                         throw '提交数据错误';
                     }
                 }
@@ -1066,13 +1064,11 @@ module.exports = app => {
 
                 if (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) {
                     await ctx.service.stageAudit.checkAgain(ctx.stage.id, ctx.stage.times);
-                    console.log('success');
                     ctx.redirect(ctx.request.header.referer);
                 } else {
                     throw '您无权进行该操作';
                 }
             } catch (err) {
-                console.log(err);
                 this.log(err);
                 ctx.session.postError = err.toString();
                 ctx.redirect(ctx.request.header.referer);

app/lib/rpt_data_analysis.js

@@ -371,7 +371,6 @@ const gatherChapter = {
         return [gclChapter, otherChapter, customChapter];
     },
     _getGclChapter: function (chapter, data, field) {
-        console.log(chapter, data, field);
         for (const c of chapter) {
             if (c.filter) {
                 const reg = new RegExp(c.filter);
@@ -395,7 +394,6 @@ const gatherChapter = {
         const gatherRelaFields = function (chapter, source, field) {
             const fields = field instanceof Array ? field : [field];
             for (const f of fields) {
-                console.log(chapter, source);
                 chapter[f.target] = ctx.helper.add(chapter[f.target], source[f.target]);
             }
         };
@@ -1261,8 +1259,6 @@ const splitXmjCode = {
             } else if (helper.check18SubCode(d[options.code]) && isSplitSub) {
                 const parent = helper._.find(data, {ledger_id: d.ledger_pid});
                 const splitParent = !parent || parent.level < 5 ? parent : this._getParentByLevel(data, d, 4);
-                if (d.ledger_id === 11) console.log(parent);
-                if (d.ledger_id === 11) console.log(splitParent);
                 d[target] = !splitParent || helper.check18MainCode(splitParent.code)
                     ? d[options.code]
                     : d[options.code].replace(splitParent[options.code], '');

app/public/js/stage.js

@@ -2716,7 +2716,6 @@ $(document).ready(() => {
         analyzeChange(change) {
             change.bills = change.detail.bills;
             for (const b of change.bills) {
-                console.log(b);
                 const aub = change.detail.addUsedBills.find(function (x) {
                     return x.id === b.id;
                 });

app/service/revise_bills.js

@@ -132,7 +132,7 @@ module.exports = app => {
                 this._cacheMaxLid(tid, maxId + data.length);
                 await this.transaction.commit();
             } catch (err) {
-                await this.transaction.rollback();console.log(lastChild);
+                await this.transaction.rollback();
                 throw err;
             }
 

app/service/stage.js

@@ -242,9 +242,9 @@ module.exports = app => {
                 s.tp_history = s.tp_history ? JSON.parse(s.tp_history) : [];
             }
             if (stages.length !== 0) {
-                const lastStage = stages[stages.length - 1];
+                const lastStage = stages[0];
                 if (lastStage.status === auditConst.status.uncheck && lastStage.user_id !== this.ctx.session.sessionUser.accountId) {
-                    stages.splice(stages.length - 1, 1);
+                    stages.splice(0, 1);
                 }
             }
             // 最新一期计量（未审批完成），当前操作人的期详细数据，应实时计算