|
|
@@ -45,10 +45,11 @@ module.exports = app => {
|
|
|
async _getAddReviseValid(ctx) {
|
|
|
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) &&
|
|
|
+ const addVisible = (ctx.tender.data.user_id === ctx.session.sessionUser.accountId) &&
|
|
|
(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);
|
|
|
+ (!revise || !revise.valid || revise.status === audit.revise.status.checked);
|
|
|
+ const addValid = addVisible && (!lastStage || lastStage.status === audit.stage.status.uncheck || lastStage.status === audit.stage.status.checkNo);
|
|
|
+ return [addVisible, addValid];
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -80,7 +81,8 @@ module.exports = app => {
|
|
|
lr.curAuditor = await ctx.service.reviseAudit.getAuditorByStatus(lr.id, lr.status, lr.times);
|
|
|
}
|
|
|
}
|
|
|
- const addValid = await this._getAddReviseValid(ctx);
|
|
|
+ const [addVisible, addValid] = await this._getAddReviseValid(ctx);
|
|
|
+ console.log(addVisible, addValid);
|
|
|
const [stdBills, stdChapters] = await this.ctx.service.valuation.getValuationStdList(
|
|
|
ctx.tender.data.valuation, ctx.tender.data.measure_type);
|
|
|
const renderData = {
|
|
|
@@ -93,6 +95,7 @@ module.exports = app => {
|
|
|
queryData: JSON.stringify(ctx.urlInfo.query),
|
|
|
},
|
|
|
ledgerRevise,
|
|
|
+ addVisible,
|
|
|
addValid,
|
|
|
auditConst: audit.revise,
|
|
|
auditConst2: JSON.stringify(audit.revise),
|
