待办页bug

app/service/payment_detail_audit.js

@@ -600,15 +600,18 @@ module.exports = app => {
             const sql =
                 'SELECT pda.`aid`, pda.`times`, pda.`order`, pda.`begin_time`, pda.`end_time`, pda.`tender_id`, pda.`tr_id`, pda.`td_id`,' +
                 '    pd.`code` As `scode`, pd.`order` As `sorder`, pd.`status` As `sstatus`,' +
+                '    pr.`rpt_name` As `rpt_name`,' +
                 '    t.`name`, t.`pid`, t.`uid` ' +
                 '  FROM ?? AS pda ' +
                 '    Left Join ?? AS pd On pda.`td_id` = pd.`id` ' +
+                '    Left Join ?? AS pr On pda.`tr_id` = pr.`id` ' +
                 '    Left Join ?? As t ON pda.`tender_id` = t.`id`' +
                 '  WHERE ((pda.`aid` = ? and pda.`status` = ?) OR (pd.`uid` = ? and pda.`status` = ? and pd.`status` = ? and pda.`times` = (pd.`times`-1)))' +
                 '  ORDER BY pda.`begin_time` DESC';
             const sqlParam = [
                 this.tableName,
                 this.ctx.service.paymentDetail.tableName,
+                this.ctx.service.paymentTenderRpt.tableName,
                 this.ctx.service.paymentTender.tableName,
                 auditorId,
                 auditConst.status.checking,

app/view/dashboard/index.ejs

@@ -67,7 +67,7 @@
                                     <option value="1">材料调差（<%- auditMaterial.length %>）</option>
                                     <% } %>
                                     <% if (auditPayments.length !== 0) { %>
-                                        <option value="1">支付审批（<%- auditPayments.length %>）</option>
+                                        <option value="10">支付审批（<%- auditPayments.length %>）</option>
                                     <% } %>
                                 </select>
                             </div>
@@ -231,17 +231,17 @@
                                         <% } %>
                                         <% for (const audit of auditPayments) { %>
                                             <% if (audit.sstatus !== acStage.status.checkNo) { %>
-                                                <tr data-type="2">
+                                                <tr data-type="10">
                                                     <td><span class="bg-new-payment text-new-payment badge text-width">支付审批</span></td>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %></a> <a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>"><%- audit.scode %></a></td>
+                                                    <td><a href="/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>"><%- audit.scode %></a></td>
                                                     <td>第<%- audit.sorder %>期</td>
                                                     <td><%- ctx.moment(audit.begin_time).format('YYYY/MM/DD HH:mm') %></td>
                                                     <td><a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审 批</a></td>
                                                 </tr>
                                             <% } else { %>
-                                                <tr data-type="2">
+                                                <tr data-type="10">
                                                     <td><span class="bg-new-payment text-new-payment badge text-width">支付审批</span></td>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/list"><%- audit.name %></a> <a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>"><%- audit.scode %></a></td>
+                                                    <td><a href="/payment/<%- audit.tender_id %>/list"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>"><%- audit.scode %></a></td>
                                                     <td>第<%- audit.sorder %>期</td>
                                                     <td><%- ctx.moment(audit.end_time).format('YYYY/MM/DD HH:mm') %></td>
                                                     <td><a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-warning btn-sm btn-table text-warning" role="button">重新上报</a></td>