ellisran 3 hafta önce
ebeveyn
işleme
0a0869f8ec

+ 2 - 2
app/controller/financial_controller.js

@@ -125,7 +125,7 @@ module.exports = app => {
                 if (!financialPermission.transfer_show) {
                     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 page = ctx.page;
@@ -1329,7 +1329,7 @@ module.exports = app => {
                     from,
                     fileList,
                     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`,
                     preUrl2: `/sp/${ctx.subProject.id}/financial/pay/` + ctx.financialPay.id,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.financial.payDetail),

+ 1 - 1
app/view/financial/transfer.ejs

@@ -34,7 +34,7 @@
                     <% if (transferList.length > 0) { %>
                     <% for (const [i, t] of transferList.entries()) { %>
                     <tr class="text-center" data-id="<%- t.id %>">
-                        <td class=""><%- (transferList.length - i) %></td>
+                        <td class=""><%- pageInfo.total_num - ((pageInfo.page-1)*pageInfo.pageSize + i) %></td>
                         <td class=""><a href="/sp/<%- ctx.subProject.id %>/financial/transfer/<%- t.id %>/tender"><%- t.t_time %></a>
                             <% if (ctx.session.sessionUser.is_admin) { %>
                                 <a href="#edit" class="edit-time" data-ftid="<%- t.id %>" data-time="<%- t.t_time %>" data-toggle="modal" data-target="#edit"><i class="fa fa-pencil-square-o "></i></a>