|
@@ -786,7 +786,9 @@ module.exports = app => {
|
|
|
cl['audit_amount_' + au.uid] = audit_amount[index - 1] ? audit_amount[index - 1] : null;
|
|
|
}
|
|
|
}
|
|
|
- cl.changed_amount = (change.status === audit.flow.status.backnew || change.status === audit.flow.status.checking || change.status === audit.flow.status.checked) ? (audit_amount !== '' ? audit_amount[audit_amount.length - 1] : 0) : cl.camount;
|
|
|
+ cl.changed_amount = ctx.helper._.findIndex([audit.flow.status.backnew, audit.flow.status.checking, audit.flow.status.checked], change.status) !== -1 ?
|
|
|
+ (audit_amount !== '' ? audit_amount[audit_amount.length - 1] :
|
|
|
+ (ctx.helper._.findIndex([audit.flow.status.backnew, audit.flow.status.checking], change.status) !== -1 ? cl.camount : 0)) : cl.camount;
|
|
|
// cl.changed_amount = ctx.helper.add(cl.oamount ? parseFloat(cl.oamount) : 0, changed_amount ? parseFloat(changed_amount) : 0);
|
|
|
}
|
|
|
renderData.changeList = changeList;
|
|
@@ -837,7 +839,9 @@ module.exports = app => {
|
|
|
cl['audit_amount_' + au.uid] = au.uid === ctx.session.sessionUser.accountId ? cl.spamount : (audit_amount[index - 1] ? audit_amount[index - 1] : null);
|
|
|
}
|
|
|
}
|
|
|
- cl.changed_amount = (change.status === audit.flow.status.backnew || change.status === audit.flow.status.checking || change.status === audit.flow.status.checked) ? (audit_amount !== '' ? audit_amount[audit_amount.length - 1] : 0) : cl.camount;
|
|
|
+ cl.changed_amount = ctx.helper._.findIndex([audit.flow.status.backnew, audit.flow.status.checking, audit.flow.status.checked], change.status) !== -1 ?
|
|
|
+ (audit_amount !== '' ? audit_amount[audit_amount.length - 1] :
|
|
|
+ (ctx.helper._.findIndex([audit.flow.status.backnew, audit.flow.status.checking], change.status) !== -1 ? cl.camount : 0)) : cl.camount;
|
|
|
// cl.changed_amount = ctx.helper.add(cl.oamount ? parseFloat(cl.oamount) : 0, changed_amount ? parseFloat(changed_amount) : 0);
|
|
|
}
|
|
|
renderData.changeList = changeList;
|