|
@@ -711,7 +711,6 @@ module.exports = app => {
|
|
|
|
|
|
// 获取是否已存在调用变更令
|
|
|
const changeUsedData = await ctx.service.stageChange.getFinalUsedData(ctx.tender.id, change.cid);
|
|
|
- console.log(changeUsedData);
|
|
|
renderData.changeUsedData = changeUsedData;
|
|
|
renderData.stageChangeNum = this.ctx.helper.sum(changeUsedData.map(x => { return Math.abs(x.used_qty); }));
|
|
|
await this.layout('change/information.ejs', renderData, 'change/information_modal.ejs');
|
|
@@ -819,7 +818,7 @@ module.exports = app => {
|
|
|
const lastUidList = ctx.helper._.map(lastUserList, 'uid');
|
|
|
// 判断上一次审批是否为非原报为审批人
|
|
|
const nowUidList = ctx.helper._.map(ctx.change.auditors, 'uid');
|
|
|
- if (lastUidList !== nowUidList && nowUidList.length === 2 && nowUidList[0] === nowUidList[1]) {
|
|
|
+ if (!ctx.helper._.isEqual(lastUidList, nowUidList) && nowUidList.length === 2 && nowUidList[0] === nowUidList[1]) {
|
|
|
throw '该变更令不能指定原报人为单独审批人';
|
|
|
}
|
|
|
}
|