|
@@ -125,7 +125,7 @@ module.exports = app => {
|
|
if (!financialPermission.transfer_show) {
|
|
if (!financialPermission.transfer_show) {
|
|
throw '没有查看权限';
|
|
throw '没有查看权限';
|
|
}
|
|
}
|
|
- const transferList = await ctx.service.financialTransfer.getList(ctx.subProject.id);
|
|
|
|
|
|
+ const transferList = await ctx.service.financialTransfer.getList(ctx.subProject.id, true);
|
|
const total = await ctx.service.financialTransfer.count({ spid: ctx.subProject.id });
|
|
const total = await ctx.service.financialTransfer.count({ spid: ctx.subProject.id });
|
|
// 分页相关
|
|
// 分页相关
|
|
const page = ctx.page;
|
|
const page = ctx.page;
|
|
@@ -1329,7 +1329,7 @@ module.exports = app => {
|
|
from,
|
|
from,
|
|
fileList,
|
|
fileList,
|
|
authMobile: auth_mobile,
|
|
authMobile: auth_mobile,
|
|
- returnUrl: `/sp/${ctx.subProject.id}/financial/pay/${from !== undefined ? from : 'stage/' + ctx.financialPay.fpsid}`,
|
|
|
|
|
|
+ returnUrl: `/sp/${ctx.subProject.id}/financial/pay/${from !== null ? from : 'stage/' + ctx.financialPay.fpsid}`,
|
|
preUrl: `/sp/${ctx.subProject.id}/financial/pay`,
|
|
preUrl: `/sp/${ctx.subProject.id}/financial/pay`,
|
|
preUrl2: `/sp/${ctx.subProject.id}/financial/pay/` + ctx.financialPay.id,
|
|
preUrl2: `/sp/${ctx.subProject.id}/financial/pay/` + ctx.financialPay.id,
|
|
jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.financial.payDetail),
|
|
jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.financial.payDetail),
|