修订历史相关

app/service/ledger_history.js

@@ -140,7 +140,7 @@ module.exports = app => {
                 pid: this.ctx.session.sessionProject.id, tid: revise.tid,
                 rid: revise.id, rorder: revise.corder,
                 in_time: now,
-                bills_file: billsHis, pos_file: posHis,
+                bills_file: billsHis, pos_file: posHis, valid: 0,
                 bills_count: bills.length, pos_count: pos.length,
             });
 

app/service/revise_audit.js

@@ -642,6 +642,8 @@ module.exports = app => {
                             status: SmsAliConst.status.success,
                         });
                     } else {
+                        // 修订历史设为有效
+                        if (revise.his_id) await transaction.update(this.ctx.service.ledgerHistory.tableName, { id: revise.his_id, valid: 1 });
                         // 同步修订信息
                         await transaction.update(this.ctx.service.ledgerRevise.tableName, {
                             id: revise.id, status: auditConst.status.checked, end_time: time,

app/view/revise/index.ejs

@@ -66,7 +66,12 @@
                         <% } else { %>
                         <td class="<%- auditConst.auditProgressClass[lr.status] %>">
                             <% if (lr.curAuditor) { %>
-                                <a href="#sp-list" data-toggle="modal" data-target="#sp-list" lr-id="<%- lr.id %>"><%- lr.curAuditor.name %><%if (lr.curAuditor.role !== '' && lr.curAuditor.role !== null) { %>-<%- lr.curAuditor.role %><% } %></a>
+                            <% const curAuditor = lr.curAuditors[0]; %>
+                            <% if (curAuditor.audit_type === auditType.key.common) { %>
+                            <a href="#sp-list" data-toggle="modal" data-target="#sp-list" lr-id="<%- lr.id %>"><%- curAuditor.name %><%if (curAuditor.role !== '' && curAuditor.role !== null) { %>-<%- curAuditor.role %><% } %></a>
+                            <% } else { %>
+                            <a href="#sp-list" data-toggle="modal" data-target="#sp-list" lr-id="<%- lr.id %>"><%- ctx.helper.transFormToChinese(curAuditor.audit_order) + '审' %></a>
+                            <% } %>
                             <% } %>
                             <%- auditConst.auditProgress[lr.status] %>
                         </td>
@@ -77,7 +82,7 @@
                             <% if (lr.status === auditConst.status.uncheck && lr.uid === ctx.session.sessionUser.accountId) { %>
                             <a href="<%- preUrl + '/revise/' + lr.id + '/info' %>" class="btn btn-primary btn-sm">修订</a>
                             <a href="#remove" data-toggle="modal" data-target="#remove" class="btn btn-secondary btn-sm">作废</a>
-                            <% } else if (lr.status === auditConst.status.checking && lr.curAuditor.audit_id === ctx.session.sessionUser.accountId) { %>
+                            <% } else if (lr.status === auditConst.status.checking && lr.curAuditorIds && lr.curAuditorIds.indexOf(ctx.session.sessionUser.accountId) >= 0) { %>
                             <a href="<%- preUrl + '/revise/' + lr.id + '/info' %>" class="btn btn-success btn-sm">审批</a>
                             <% } else if (lr.status === auditConst.status.checkNo && lr.uid === ctx.session.sessionUser.accountId) { %>
                             <a href="<%- preUrl + '/revise/'  + lr.id + '/info' %>" class="btn btn-primary btn-sm">重新上报</a>