|
|
@@ -83,6 +83,7 @@ module.exports = app => {
|
|
|
// 是否已验证手机短信
|
|
|
const pa = await ctx.service.projectAccount.getDataById(ctx.session.sessionUser.accountId);
|
|
|
data.authMobile = pa.auth_mobile;
|
|
|
+ data.spGroupList = await ctx.service.shenpiGroup.getGroupListByStage(ctx.tender.id, shenpiConst.sp_type.stage);
|
|
|
return data;
|
|
|
}
|
|
|
|
|
|
@@ -189,7 +190,6 @@ module.exports = app => {
|
|
|
renderData.categoryData = await ctx.service.category.getAllCategory(ctx.subProject);
|
|
|
renderData.settleStatus = ctx.service.settle.settleStatus;
|
|
|
renderData.deleteFilePermission = PermissionCheck.delFile(this.ctx.session.sessionUser.permission);
|
|
|
- renderData.spGroupList = await ctx.service.shenpiGroup.getGroupListByStage(ctx.tender.id, shenpiConst.sp_type.stage);
|
|
|
await this.layout('stage/index.ejs', renderData, 'stage/modal.ejs');
|
|
|
} catch (err) {
|
|
|
this.log(err);
|
|
|
@@ -555,7 +555,7 @@ module.exports = app => {
|
|
|
const change = await this.ctx.service.change.getAllChangeHasMinus(ctx.tender.id);
|
|
|
if (change.length > 0) {
|
|
|
const cid = change.map(x => { return x.cid; });
|
|
|
- const changeBills = await this.ctx.service.changeAuditList.getAllDataByCondition({ where: { cid } });
|
|
|
+ const changeBills = await this.ctx.service.changeAuditList.getAllDataByCondition({ where: { cid, is_valuation: 1 } });
|
|
|
const endStageChange = await this.ctx.service.stageChange.getFinalUsedData(ctx.tender.id, cid);
|
|
|
checkData.checkMinusChangeBills(change, changeBills, endStageChange);
|
|
|
}
|
|
|
@@ -577,7 +577,7 @@ module.exports = app => {
|
|
|
const change = await this.ctx.service.change.getAllChangeHasMinus(ctx.tender.id);
|
|
|
if (change.length > 0) {
|
|
|
const cid = change.map(x => { return x.cid; });
|
|
|
- const changeBills = await this.ctx.service.changeAuditList.getAllDataByCondition({ where: { cid } });
|
|
|
+ const changeBills = await this.ctx.service.changeAuditList.getAllDataByCondition({ where: { cid, is_valuation: 1 } });
|
|
|
const endStageChange = await this.ctx.service.stageChange.getFinalUsedData(ctx.tender.id, cid);
|
|
|
checkData.checkMinusChangeBills(change, changeBills, endStageChange);
|
|
|
}
|