فهرست منبع

支付审批bug修复

ellisran 2 ماه پیش
والد
کامیت
ac472648e4
3فایلهای تغییر یافته به همراه11 افزوده شده و 11 حذف شده
  1. 2 2
      app/public/js/payment_detail.js
  2. 1 1
      app/service/payment_detail_att.js
  3. 8 8
      app/view/dashboard/index.ejs

+ 2 - 2
app/public/js/payment_detail.js

@@ -290,7 +290,7 @@ $(function () {
 
     $('#attList').on('click', '.file-atn', function() {
         const id = $(this).attr('f-id');
-        postData(`'/sp/${spid}/payment/${tenderId}/detail/${detailId}/file/${id}/download`, {}, (data) => {
+        postData(`/sp/${spid}/payment/${tenderId}/detail/${detailId}/file/${id}/download`, {}, (data) => {
             const { filepath } = data;
             $('#file-upload').attr('href', filepath);
             $('#file-upload')[0].click();
@@ -372,7 +372,7 @@ function getAllList(currPageNum = 1) {
         <td><a href="${att.filepath}" target="_blank" class="pl-0 col-11 att-file-name" file-id=${att.id}>${att.filename}${att.fileext}</a></td>
         <td>${moment(att.upload_time).format("YYYY-MM-DD HH:mm:ss")}<br>${bytesToSize(att.filesize)}</td>
         <td>
-            <a href="'/sp/${spid}/payment/${tenderId}/detail/${detailId}/file/${att.id}/download" class="mr-2" title="下载"><span class="fa fa-download text-primary"></span></a>`
+            <a href="/sp/${spid}/payment/${tenderId}/detail/${detailId}/file/${att.id}/download" class="mr-2" title="下载"><span class="fa fa-download text-primary"></span></a>`
         html += (att.uid === accountId && (detailStatus === auditConst.status.checked ? Boolean(att.extra_upload) : true)) ?
             `<a href="javascript:void(0)" class="mr-2 delete-file" data-attid="${att.id}" title="删除附件"><span class="fa fa-trash text-danger"></span></a>` : '';
         html += `</td>`;

+ 1 - 1
app/service/payment_detail_att.js

@@ -56,7 +56,7 @@ module.exports = app => {
             return result.map(item => {
                 item.orginpath = this.ctx.app.config.fujianOssPath + item.filepath;
                 if (!this.ctx.helper.canPreview(item.fileext)) {
-                    item.filepath = `'/sp/${this.ctx.subProject.id}/payment/${item.tender_id}/detail/${item.td_id}/file/${item.id}/download`;
+                    item.filepath = `/sp/${this.ctx.subProject.id}/payment/${item.tender_id}/detail/${item.td_id}/file/${item.id}/download`;
                 } else {
                     item.filepath = this.ctx.app.config.fujianOssPath + item.filepath;
                     item.viewpath = item.filepath;

+ 8 - 8
app/view/dashboard/index.ejs

@@ -264,32 +264,32 @@
                                                 <tr data-type="10">
                                                     <td><span class="bg-new-payment text-new-payment badge text-width">支付审批</span></td>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills"><%- audit.scode %></a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills"><%- audit.scode %></a></td>
                                                     <% } else { %>
-                                                    <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><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/list/<%- audit.tr_id %>"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/sp/<%- ctx.subProject.id %>/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>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
                                                     <% } else { %>
-                                                    <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>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/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="10">
                                                     <td><span class="bg-new-payment text-new-payment badge text-width">支付审批</span></td>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/list"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills"><%- audit.scode %></a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/list"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills"><%- audit.scode %></a></td>
                                                     <% } else {%>
-                                                    <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><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/list"><%- audit.name %> <%- audit.rpt_name %></a> <a href="/sp/<%- ctx.subProject.id %>/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>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-warning btn-sm btn-table text-warning" role="button">重新上报</a></td>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-warning btn-sm btn-table text-warning" role="button">重新上报</a></td>
                                                     <% } else {%>
-                                                    <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>
+                                                    <td><a href="/sp/<%- ctx.subProject.id %>/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-warning btn-sm btn-table text-warning" role="button">重新上报</a></td>
                                                     <% } %>
                                                 </tr>
                                             <% } %>