浏览代码

1. 合同支付,兼容原报作为终审的情况
2. 部位明细,计量报错

MaiXinRong 6 年之前
父节点
当前提交
dc0fbf5da1
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      app/middleware/stage_check.js
  2. 2 2
      app/service/stage_bills.js

+ 1 - 1
app/middleware/stage_check.js

@@ -59,7 +59,7 @@ module.exports = options => {
                 } else if (stage.status === status.checked) {
                     stage.curOrder = _.max(_.map(stage.auditors, 'order'));
                 } else {
-                    stage.curOrder = stage.curAuditor.order - 1;
+                    stage.curOrder = stage.curAuditor.aid === accountId ? stage.curAuditor.order : stage.curAuditor.order - 1;
                 }
             } else if (auditorIds.indexOf(accountId) !== -1) { // 审批人
                 if (stage.status === status.uncheck) {

+ 2 - 2
app/service/stage_bills.js

@@ -287,11 +287,11 @@ module.exports = app => {
                         posGather.id = stageBills.id;
                         await transaction.update(this.tableName, posGather);
                     } else {
-                        await this._insertStageBillsData(transaction, posGather, ledgerBills);
+                        await this._insertStageBillsData(transaction, posGather, stageBills, ledgerBills);
                     }
                 }
             } else {
-                await this._insertStageBillsData(transaction, posGather, ledgerBills);
+                await this._insertStageBillsData(transaction, posGather, stageBills, ledgerBills);
             }
         }