Quellcode durchsuchen

fix: 修复工作台审批跳转链接

caipin vor 1 Tag
Ursprung
Commit
d36d5dc22a
1 geänderte Dateien mit 12 neuen und 9 gelöschten Zeilen
  1. 12 9
      app/view/dashboard/workspace.ejs

+ 12 - 9
app/view/dashboard/workspace.ejs

@@ -533,54 +533,57 @@
                                                         </tr>
                                                         </tr>
                                                     <% } else if (db.shenpi_type === 'contract') { %>
                                                     <% } else if (db.shenpi_type === 'contract') { %>
                                                         <% const ct = db; %>
                                                         <% const ct = db; %>
+                                                        <% const ctDetailUrl = '/sp/' + ct.spid + '/contract/detail' + (ct.contract_type === 2 ? '/income' : ''); %>
                                                         <tr data-type="contract">
                                                         <tr data-type="contract">
                                                             <% if (ct.start_audit === 2) { %><td class="text-center text-danger"><i class="fa fa-exclamation-triangle"></i></td><% } else if (ct.start_audit === 1) { %><td class="text-center text-warning"><i class="fa fa-bell"></i></td><% } else { %><td></td><% } %>
                                                             <% if (ct.start_audit === 2) { %><td class="text-center text-danger"><i class="fa fa-exclamation-triangle"></i></td><% } else if (ct.start_audit === 1) { %><td class="text-center text-warning"><i class="fa fa-bell"></i></td><% } else { %><td></td><% } %>
                                                             <td><span class="badge text-width" style="background-color: #e3f2fd; color: #1976d2;">合同审批</span></td>
                                                             <td><span class="badge text-width" style="background-color: #e3f2fd; color: #1976d2;">合同审批</span></td>
                                                             <td><a href="/sp/<%- ct.spid %>/dashboard"><%- ct.sp_name || '项目合同' %></a></td>
                                                             <td><a href="/sp/<%- ct.spid %>/dashboard"><%- ct.sp_name || '项目合同' %></a></td>
                                                             <td>
                                                             <td>
                                                                 <% if (ct.is_project_contract) { %>
                                                                 <% if (ct.is_project_contract) { %>
-                                                                    <a href="/contract/<%- ct.id %>"><%- ct.name %></a>
+                                                                    <a href="<%= ctDetailUrl %>"><%- ct.name %></a>
                                                                 <% } else { %>
                                                                 <% } else { %>
-                                                                    <a href="/tender/<%- ct.tid %>"><%- ct.tender_name %></a> - <a href="/contract/<%- ct.id %>"><%- ct.name %></a>
+                                                                    <a href="/tender/<%- ct.tid %>"><%- ct.tender_name %></a> - <a href="<%= ctDetailUrl %>"><%- ct.name %></a>
                                                                 <% } %>
                                                                 <% } %>
                                                             </td>
                                                             </td>
                                                             <td><%- ct.status_text %></td>
                                                             <td><%- ct.status_text %></td>
                                                             <td><%- (ct.begin_time ? ctx.moment(ct.begin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
                                                             <td><%- (ct.begin_time ? ctx.moment(ct.begin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
-                                                            <td><a href="/contract/<%- ct.id %>/audit" class="btn btn-outline-primary btn-sm btn-table" role="button">审批</a></td>
+                                                            <td><a href="<%= ctDetailUrl %>" class="btn btn-outline-primary btn-sm btn-table" role="button">审批</a></td>
                                                         </tr>
                                                         </tr>
                                                     <% } else if (db.shenpi_type === 'contractPay') { %>
                                                     <% } else if (db.shenpi_type === 'contractPay') { %>
                                                         <% const cp = db; %>
                                                         <% const cp = db; %>
+                                                        <% const cpDetailUrl = '/sp/' + cp.spid + '/contract/detail' + (cp.contract_type === 2 ? '/income' : '') + '?tab=pay'; %>
                                                         <tr data-type="contract">
                                                         <tr data-type="contract">
                                                             <% if (cp.start_audit === 2) { %><td class="text-center text-danger"><i class="fa fa-exclamation-triangle"></i></td><% } else if (cp.start_audit === 1) { %><td class="text-center text-warning"><i class="fa fa-bell"></i></td><% } else { %><td></td><% } %>
                                                             <% if (cp.start_audit === 2) { %><td class="text-center text-danger"><i class="fa fa-exclamation-triangle"></i></td><% } else if (cp.start_audit === 1) { %><td class="text-center text-warning"><i class="fa fa-bell"></i></td><% } else { %><td></td><% } %>
                                                             <td><span class="badge text-width" style="background-color: #fff3e0; color: #f57c00;">合同支付</span></td>
                                                             <td><span class="badge text-width" style="background-color: #fff3e0; color: #f57c00;">合同支付</span></td>
                                                             <td><a href="/sp/<%- cp.spid %>/dashboard"><%- cp.sp_name %></a></td>
                                                             <td><a href="/sp/<%- cp.spid %>/dashboard"><%- cp.sp_name %></a></td>
                                                             <td>
                                                             <td>
                                                                 <% if (cp.is_project_contract) { %>
                                                                 <% if (cp.is_project_contract) { %>
-                                                                    <a href="/contract/<%- cp.cid %>"><%- cp.contract_name %></a> - 第<%- cp.times %>期
+                                                                    <a href="<%= cpDetailUrl %>"><%- cp.contract_name %></a> - 第<%- cp.times %>期
                                                                 <% } else { %>
                                                                 <% } else { %>
-                                                                    <a href="/tender/<%- cp.tid %>"><%- cp.tender_name %></a> - <a href="/contract/<%- cp.cid %>"><%- cp.contract_name %></a> - 第<%- cp.times %>期
+                                                                    <a href="/tender/<%- cp.tid %>"><%- cp.tender_name %></a> - <a href="<%= cpDetailUrl %>"><%- cp.contract_name %></a> - 第<%- cp.times %>期
                                                                 <% } %>
                                                                 <% } %>
                                                             </td>
                                                             </td>
                                                             <td>支付</td>
                                                             <td>支付</td>
                                                             <td><%- (cp.begin_time ? ctx.moment(cp.begin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
                                                             <td><%- (cp.begin_time ? ctx.moment(cp.begin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
-                                                            <td><a href="/contract/<%- cp.cid %>/pay/<%- cp.id %>/audit" class="btn btn-outline-primary btn-sm btn-table" role="button">审批</a></td>
+                                                            <td><a href="<%= cpDetailUrl %>" class="btn btn-outline-primary btn-sm btn-table" role="button">审批</a></td>
                                                         </tr>
                                                         </tr>
                                                     <% } else if (db.shenpi_type === 'contractReceipt') { %>
                                                     <% } else if (db.shenpi_type === 'contractReceipt') { %>
                                                         <% const cr = db; %>
                                                         <% const cr = db; %>
+                                                        <% const crDetailUrl = '/sp/' + cr.spid + '/contract/detail' + (cr.contract_type === 2 ? '/income' : '') + '?tab=pay'; %>
                                                         <tr data-type="contract">
                                                         <tr data-type="contract">
                                                             <% if (cr.start_audit === 2) { %><td class="text-center text-danger"><i class="fa fa-exclamation-triangle"></i></td><% } else if (cr.start_audit === 1) { %><td class="text-center text-warning"><i class="fa fa-bell"></i></td><% } else { %><td></td><% } %>
                                                             <% if (cr.start_audit === 2) { %><td class="text-center text-danger"><i class="fa fa-exclamation-triangle"></i></td><% } else if (cr.start_audit === 1) { %><td class="text-center text-warning"><i class="fa fa-bell"></i></td><% } else { %><td></td><% } %>
                                                             <td><span class="badge text-width" style="background-color: #e8f5e9; color: #388e3c;">合同回款</span></td>
                                                             <td><span class="badge text-width" style="background-color: #e8f5e9; color: #388e3c;">合同回款</span></td>
                                                             <td><a href="/sp/<%- cr.spid %>/dashboard"><%- cr.sp_name %></a></td>
                                                             <td><a href="/sp/<%- cr.spid %>/dashboard"><%- cr.sp_name %></a></td>
                                                             <td>
                                                             <td>
                                                                 <% if (cr.is_project_contract) { %>
                                                                 <% if (cr.is_project_contract) { %>
-                                                                    <a href="/contract/<%- cr.cid %>"><%- cr.contract_name %></a> - 第<%- cr.times %>期
+                                                                    <a href="<%= crDetailUrl %>"><%- cr.contract_name %></a> - 第<%- cr.times %>期
                                                                 <% } else { %>
                                                                 <% } else { %>
-                                                                    <a href="/tender/<%- cr.tid %>"><%- cr.tender_name %></a> - <a href="/contract/<%- cr.cid %>"><%- cr.contract_name %></a> - 第<%- cr.times %>期
+                                                                    <a href="/tender/<%- cr.tid %>"><%- cr.tender_name %></a> - <a href="<%= crDetailUrl %>"><%- cr.contract_name %></a> - 第<%- cr.times %>期
                                                                 <% } %>
                                                                 <% } %>
                                                             </td>
                                                             </td>
                                                             <td>回款</td>
                                                             <td>回款</td>
                                                             <td><%- (cr.begin_time ? ctx.moment(cr.begin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
                                                             <td><%- (cr.begin_time ? ctx.moment(cr.begin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
-                                                            <td><a href="/contract/<%- cr.cid %>/pay/<%- cr.id %>/audit" class="btn btn-outline-primary btn-sm btn-table" role="button">审批</a></td>
+                                                            <td><a href="<%= crDetailUrl %>" class="btn btn-outline-primary btn-sm btn-table" role="button">审批</a></td>
                                                         </tr>
                                                         </tr>
                                                     <% } %>
                                                     <% } %>
                                                 <% } %>
                                                 <% } %>