增加修订变更状态发起人状态

app/const/audit.js

@@ -290,7 +290,7 @@ auditStatusString[auditStatus.checked] = '审批通过';
 auditStatusString[auditStatus.back] = '退回';
 auditStatusString[auditStatus.backnew] = '审批退回';
 auditStatusString[auditStatus.checkAgain] = '重新审批';
-auditStatusString[auditStatus.revise] = '待修订';
+auditStatusString[auditStatus.revise] = '修订变更';
 
 const auditStatusClass = [];
 auditStatusClass[auditStatus.uncheck] = '';
@@ -300,7 +300,7 @@ auditStatusClass[auditStatus.checked] = 'text-success';
 auditStatusClass[auditStatus.back] = 'text-warning';
 auditStatusClass[auditStatus.backnew] = 'text-warning';
 auditStatusClass[auditStatus.checkAgain] = 'text-warning';
-auditStatusClass[auditStatus.revise] = '';
+auditStatusClass[auditStatus.revise] = 'text-warning';
 
 /* ------------------------------------------------------- */
 

app/service/change.js

@@ -1225,13 +1225,29 @@ module.exports = app => {
                 });
                 await this.transaction.insert('zh_notice', records);
 
-                // 新增新一次的审批人列表
                 // 获取当前次数审批人列表
                 const auditList = await this.ctx.service.changeAudit.getListGroupByTimes(changeData.cid, changeData.times);
                 const lastauditInfo = await this.ctx.service.changeAudit.getLastUser(changeData.cid, changeData.times, 1, 0);
                 let usort = lastauditInfo.usort + 1;
                 const newTimes = changeData.times + 1;
                 const insert_audit_array = [];
+                // 新增一个发起修订状态到审批流程中
+                const revise_audit = {
+                    tid: auditList[0].tid,
+                    cid: auditList[0].cid,
+                    uid: auditList[0].uid,
+                    name: auditList[0].name,
+                    jobs: auditList[0].jobs,
+                    company: auditList[0].company,
+                    times: changeData.times,
+                    usite: lastauditInfo.usite + 1,
+                    usort,
+                    status: audit.flow.auditStatus.revise,
+                    sin_time: new Date(),
+                };
+                insert_audit_array.push(revise_audit);
+                usort++;
+                // 新增新一次的审批人列表
                 for (const al of auditList) {
                     const insert_audit = {
                         tid: al.tid,
@@ -1248,6 +1264,7 @@ module.exports = app => {
                     insert_audit_array.push(insert_audit);
                     usort++;
                 }
+
                 await this.transaction.insert(this.ctx.service.changeAudit.tableName, insert_audit_array);
                 const changeList = await this.ctx.service.changeAuditList.getAllDataByCondition({
                     where: { cid: changeData.cid },

app/view/change/index.ejs

@@ -90,6 +90,10 @@
                             <td>
                                 上报中
                             </td>
+                        <% } else if (c.status === auditConst.status.revise && ctx.tender.isTourist) { %>
+                            <td>
+                                修订中
+                            </td>
                         <% } else if (c.auditStatus) { %>
                         <td>
                             <a href="/tender/<%- tender.id %>/change/<%- c.cid %>/information" class="btn <%- auditConst.statusButtonClass[c.status] %> btn-sm">

app/view/change/information_modal.ejs

@@ -234,7 +234,7 @@
                                                         <div class="timeline-item-icon bg-success text-light">
                                                             <i class="fa fa-check"></i>
                                                         </div>
-                                                    <% } else if(auditor.status === auditConst.auditStatus.back || auditor.status === auditConst.auditStatus.backnew) {%>
+                                                    <% } else if(auditor.status === auditConst.auditStatus.back || auditor.status === auditConst.auditStatus.backnew || auditor.status === auditConst.auditStatus.revise) {%>
                                                         <div class="timeline-item-icon bg-warning text-light">
                                                             <i class="fa fa-level-up"></i>
                                                         </div>