Browse Source

修改bug和预付款审批调整

laiguoran 4 years ago
parent
commit
e8507f4d6d

+ 7 - 4
app/controller/advance_controller.js

@@ -1,6 +1,7 @@
 'use strict';
 const accountGroup = require('../const/account_group').group;
 const auditConst = require('../const/audit').advance;
+const shenpiConst = require('../const/shenpi');
 const sendToWormhole = require('stream-wormhole');
 const path = require('path');
 const fs = require('fs');
@@ -73,6 +74,7 @@ module.exports = app => {
         async _getDefaultRenderData(ctx) {
             const data = {
                 auditConst,
+                shenpiConst,
                 jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.advance.info),
                 preUrl: `/tender/${ctx.tender.id}/advance/${ctx.advance.id}`,
                 whiteList: ctx.app.config.multipart.whitelist,
@@ -90,6 +92,7 @@ module.exports = app => {
                     const groupList = accountList.filter(item => item.account_group === idx);
                     return { groupName: item, groupList };
                 });
+                data.auditorList = await ctx.service.advanceAudit.getAuditors(ctx.advance.id, ctx.advance.times);
             }
             // 获取审核人左边列表
             data.auditors = await ctx.service.advanceAudit.getAuditorsWithOwner(ctx.advance.id, ctx.advance.times);
@@ -236,14 +239,14 @@ module.exports = app => {
                 if (exist) {
                     throw '该审核人已存在,请勿重复添加';
                 }
-
-                const result = await ctx.service.advanceAudit.addAuditor(ctx.tender.id, ctx.advance.id, audit_id, ctx.advance.times);
+                const is_gdzs = ctx.tender.info.shenpi.advance === shenpiConst.sp_status.gdzs ? 1 : 0;
+                const result = await ctx.service.advanceAudit.addAuditor(ctx.tender.id, ctx.advance.id, audit_id, ctx.advance.times, is_gdzs);
                 if (!result) {
                     throw '添加审核人失败';
                 }
 
-                const audit = await ctx.service.advanceAudit.getAuditor(ctx.advance.id, audit_id, ctx.advance.times);
-                ctx.body = { err: 0, msg: '', data: audit };
+                const auditors = await ctx.service.advanceAudit.getAuditorsWithOwner(ctx.advance.id, ctx.advance.times);
+                ctx.body = { err: 0, msg: '', data: auditors };
             } catch (err) {
                 this.log(err);
                 ctx.body = { err: 1, msg: err.toString(), data: null };

+ 26 - 0
app/middleware/advance_check.js

@@ -8,6 +8,8 @@
  */
 
 const status = require('../const/audit').advance.status;
+const shenpiConst = require('../const/shenpi');
+const _ = require('lodash');
 // const _ = require('lodash')
 
 module.exports = () => {
@@ -50,6 +52,30 @@ module.exports = () => {
             // advance.highOrder = yield this.service.advance.getLastestAdvance(this.tender.id, type, true)
 
             this.advance = advance;
+            // 根据状态判断是否需要更新审批人列表
+            if ((advance.status === status.uncheck || advance.status === status.checkNo) && this.tender.info.shenpi.advance !== shenpiConst.sp_status.sqspr) {
+                const shenpi_status = this.tender.info.shenpi.advance;
+                // 进一步比较审批流是否与审批流程设置的相同,不同则替换为固定审批流或固定的终审
+                const auditList = yield this.service.advanceAudit.getAllDataByCondition({ where: { vid: advance.id, times: advance.times } });
+                const auditIdList = _.map(auditList, 'audit_id');
+                if (shenpi_status === shenpiConst.sp_status.gdspl) {
+                    const shenpiList = yield this.service.shenpiAudit.getAllDataByCondition({ where: { tid: advance.tid, sp_type: shenpiConst.sp_type.advance, sp_status: shenpi_status } });
+                    const shenpiIdList = _.map(shenpiList, 'audit_id');
+                    // 判断2个id数组是否相同,不同则删除原审批流,切换成固定的审批流
+                    if (!_.isEqual(auditIdList, shenpiIdList)) {
+                        yield this.service.advanceAudit.updateNewAuditList(advance, shenpiIdList);
+                    }
+                } else if (shenpi_status === shenpiConst.sp_status.gdzs) {
+                    const shenpiInfo = yield this.service.shenpiAudit.getDataByCondition({ tid: advance.tid, sp_type: shenpiConst.sp_type.advance, sp_status: shenpi_status });
+                    // 判断最后一个id是否与固定终审id相同,不同则删除原审批流中如果存在的id和添加终审
+                    if (shenpiInfo && shenpiInfo.audit_id !== _.last(auditIdList)) {
+                        yield this.service.advanceAudit.updateLastAudit(advance, auditList, shenpiInfo.audit_id);
+                    } else if (!shenpiInfo) {
+                        // 不存在终审人的状态下这里恢复为授权审批人
+                        this.tender.info.shenpi.advance = shenpiConst.sp_status.sqspr;
+                    }
+                }
+            }
             yield next;
         } catch (err) {
             this.helper.log(err);

+ 50 - 19
app/public/js/advance_audit.js

@@ -93,25 +93,47 @@ $(document).ready(function () {
     $('dl').on('click', 'dd', function () {
         const id = parseInt($(this).data('id'))
         if (id !== 0) {
-            postData(preUrl + '/audit/add', { auditorId: id }, (data) => {
+            postData(preUrl + '/audit/add', { auditorId: id }, (datas) => {
                 // <p class="m-0 ml-2"><small class="text-muted">中交第一公路工程局有限公司国道311线满别公路施工一分部</small></p>
-                const html = []
-                html.push('<li class="list-group-item" auditorId="'+ data.audit_id +'"><a href="javascript: void(0)" class="text-danger pull-right">移除</a>')
-                html.push('<span>')
-                html.push(data.order + ' ')
-                html.push(data.name + ' ')
-                html.push('</span>')
-                html.push('<small class="text-muted">')
-                html.push(data.role)
-                html.push('</small>')
-                html.push(`<p class="m-0 ml-2"><small class="text-muted">${data.company}</small></p></li>`)
-                $('#auditors').append(html.join(''))
-
-                if ($('.fa-stop-circle').length) {
-                    $('.fa-stop-circle').removeClass('fa-stop-circle').addClass('fa-chevron-circle-down')
+                const html = [];
+                // 如果是重新上报,添加到重新上报列表中
+                const auditorshtml = [];
+                for (const [index,data] of datas.entries()) {
+                    if (index !== 0) {
+                        html.push('<li class="list-group-item" auditorId="'+ data.audit_id +'">');
+                        if (shenpi_status === shenpiConst.sp_status.sqspr || (shenpi_status === shenpiConst.sp_status.gdzs && index+1 !== datas.length)) {
+                            html.push('<a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
+                        }
+                        html.push('<span>');
+                        html.push(data.order + ' ');
+                        html.push(data.name + ' ');
+                        html.push('</span>');
+                        html.push('<small class="text-muted">');
+                        html.push(data.role);
+                        html.push('</small>');
+                        html.push(`<p class="m-0 ml-2"><small class="text-muted">${data.company}</small></p></li>`);
+                    }
+                    // 添加新审批人流程修改
+                    auditorshtml.push('<li class="list-group-item" data-auditorid="' + data.audit_id + '">');
+                    auditorshtml.push('<i class="fa ' + (index+1 === datas.length ? 'fa-stop-circle' : 'fa-chevron-circle-down') + '"></i> ');
+                    auditorshtml.push(data.name + ' <small class="text-muted">' + data.role + '</small>');
+                    if (index === 0) {
+                        auditorshtml.push('<span class="pull-right">原报</span>');
+                    } else if (index+1 === datas.length) {
+                        auditorshtml.push('<span class="pull-right">终审</span>');
+                    } else {
+                        auditorshtml.push('<span class="pull-right">'+ transFormToChinese(index) +'审</span>');
+                    }
+                    auditorshtml.push('</li>');
                 }
-                const auditorsHTML = `<li class="list-group-item" data-auditorId='${data.audit_id}'><i class="fa fa fa-stop-circle" ></i> ${data.name} <small class="text-muted">${data.role}</small></li>`
-                $('#auditors2').append(auditorsHTML)
+                $('#auditors').html(html.join(''));
+                $('#auditors2').html(auditorshtml.join(''));
+
+                // if ($('.fa-stop-circle').length) {
+                //     $('.fa-stop-circle').removeClass('fa-stop-circle').addClass('fa-chevron-circle-down')
+                // }
+                // const auditorsHTML = `<li class="list-group-item" data-auditorId='${data.audit_id}'><i class="fa fa fa-stop-circle" ></i> ${data.name} <small class="text-muted">${data.role}</small></li>`
+                // $('#auditors2').append(auditorsHTML)
 
                 if ($('#auditors')[0].children.length > 0) {
                     checkModal(false)
@@ -133,9 +155,18 @@ $(document).ready(function () {
                 $('span', aLi).text(rst.order + ' ' + rst.name + ' ')
             }
             // 删除左边审核人
-            $(`#auditors2 li[data-auditorId='${data.auditorId}']`).remove()
+            $(`#auditors2 li[data-auditorid='${data.auditorId}']`).remove();
+            if ($('#auditors2 li').length !== 0 && !$('#auditors2 li i').hasClass('fa-stop-circle')) {
+                $('#auditors2 li').eq($('#auditors2 li').length-1).children('i')
+                    .removeClass('fa-chevron-circle-down').addClass('fa-stop-circle');
+            }
+            console.log($('#auditors2 li').length);
+            for (let i = 0; i < $('#auditors2 li').length; i++) {
+                $('#auditors2 li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors2 li').length ? '终' : transFormToChinese(i)) + '审');
+                console.log(i, $('#auditors2 li').eq(i).find('.pull-right').text());
+            }
         })
-    })
+    });
 
     $('#au-btn').on('click','a', function() {
         const content = $(this).data('target')

+ 3 - 3
app/public/js/ledger.js

@@ -3008,8 +3008,8 @@ $(document).ready(function() {
                         html.push(data.role);
                         html.push('</small></li>');
                     }
-                    auditorshtml.push('<li class="list-group-item" data-auditid="' + data.audit_id + '">');
-                    auditorshtml.push('<i class="fa fa-stop-circle"></i> ');
+                    auditorshtml.push('<li class="list-group-item" data-auditorid="' + data.audit_id + '">');
+                    auditorshtml.push('<i class="fa ' + (index+1 === datas.length ? 'fa-stop-circle' : 'fa-chevron-circle-down') + '"></i> ');
                     auditorshtml.push(data.name + ' <small class="text-muted">' + data.role + '</small>');
                     if (index === 0) {
                         auditorshtml.push('<span class="pull-right">原报</span>');
@@ -3050,7 +3050,7 @@ $(document).ready(function() {
             //         .removeClass('fa-chevron-circle-down').addClass('fa-stop-circle');
             // }
             for (let i = 0; i < $('#auditors-list li').length; i++) {
-                $('#auditors-list li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors-list li').length ? '终' : transFormToChinese(i+1)) + '审')
+                $('#auditors-list li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors-list li').length ? '终' : transFormToChinese(i)) + '审')
                 // $('#auditors-list2 li').eq(i).find('.pull-right').text((i+1 === $('#auditors-list2 li').length ? '终' : transFormToChinese(i+1)) + '审')
             }
         });

+ 3 - 3
app/public/js/material_audit.js

@@ -100,8 +100,8 @@ $(document).ready(function () {
                         html.push('</small></li>');
                     }
                     // 添加新审批人流程修改
-                    auditorshtml.push('<li class="list-group-item" data-auditid="' + data.aid + '">');
-                    auditorshtml.push('<i class="fa fa-stop-circle"></i> ');
+                    auditorshtml.push('<li class="list-group-item" data-auditorid="' + data.aid + '">');
+                    auditorshtml.push('<i class="fa ' + (index+1 === datas.length ? 'fa-stop-circle' : 'fa-chevron-circle-down') + '"></i> ');
                     auditorshtml.push(data.name + ' <small class="text-muted">' + data.role + '</small>');
                     if (index === 0) {
                         auditorshtml.push('<span class="pull-right">原报</span>');
@@ -163,7 +163,7 @@ $(document).ready(function () {
             //         .removeClass('fa-chevron-circle-down').addClass('fa-stop-circle');
             // }
             for (let i = 0; i < $('#auditors-list li').length; i++) {
-                $('#auditors-list li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors-list li').length ? '终' : transFormToChinese(i+1)) + '审');
+                $('#auditors-list li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors-list li').length ? '终' : transFormToChinese(i)) + '审');
                 // $('#auditors-list2').eq(i).find('.pull-right').text((i+1 === $('#auditors-list2').length ? '终' : transFormToChinese(i+1)) + '审');
             }
         });

+ 3 - 3
app/public/js/stage_audit.js

@@ -147,8 +147,8 @@ $(document).ready(function () {
                         html.push(data.role);
                         html.push('</small></li>');
                     }
-                    auditorshtml.push('<li class="list-group-item" data-auditid="' + data.aid + '">');
-                    auditorshtml.push('<i class="fa fa-stop-circle"></i> ');
+                    auditorshtml.push('<li class="list-group-item" data-auditorid="' + data.aid + '">');
+                    auditorshtml.push('<i class="fa ' + (index+1 === datas.length ? 'fa-stop-circle' : 'fa-chevron-circle-down') + '"></i> ');
                     auditorshtml.push(data.name + ' <small class="text-muted">' + data.role + '</small>');
                     if (index === 0) {
                         auditorshtml.push('<span class="pull-right">原报</span>');
@@ -190,7 +190,7 @@ $(document).ready(function () {
                 //     .removeClass('fa-chevron-circle-down').addClass('fa-stop-circle');
             // }
             for (let i = 0; i < $('#auditors-list li').length; i++) {
-                $('#auditors-list li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors-list li').length ? '终' : transFormToChinese(i+1)) + '审');
+                $('#auditors-list li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors-list li').length ? '终' : transFormToChinese(i)) + '审');
                 // $('#auditors-list2 li').eq(i).find('.pull-right').text((i+1 === $('#auditors-list2 li').length ? '终' : transFormToChinese(i+1)) + '审');
             }
         });

+ 80 - 15
app/service/advance_audit.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const auditConst = require('../const/audit').advance;
+const shenpiConst = require('../const/shenpi');
 const pushType = require('../const/audit').pushType;
 module.exports = app => {
     class AdvanceAudit extends app.BaseService {
@@ -69,18 +70,29 @@ module.exports = app => {
          * @param {Number} times - 第几次审批
          * @return {Boolean} 是否插入成功
          */
-        async addAuditor(tid, vid, audit_id, times = 1) {
-            const newOrder = await this.getNewOrder(vid, times);
-            const record = {
-                tid,
-                vid,
-                audit_id,
-                times,
-                order: newOrder,
-                status: auditConst.status.uncheck,
-            };
-            const result = await this.db.insert(this.tableName, record);
-            return result && result.affectedRows === 1;
+        async addAuditor(tid, vid, audit_id, times = 1, is_gdzs = 0) {
+            const transaction = await this.db.beginTransaction();
+            try {
+                let newOrder = await this.getNewOrder(vid, times);
+                // 判断是否存在固定终审,存在则newOrder - 1并使终审order+1
+                newOrder = is_gdzs === 1 ? newOrder - 1 : newOrder;
+                if (is_gdzs) await this._syncOrderByDelete(transaction, vid, newOrder, times, '+');
+                const record = {
+                    tid,
+                    vid,
+                    audit_id,
+                    times,
+                    order: newOrder,
+                    status: auditConst.status.uncheck,
+                };
+                const result = await transaction.insert(this.tableName, record);
+                await transaction.commit();
+                return result && result.affectedRows === 1;
+            } catch (err) {
+                await transaction.rollback();
+                throw err;
+            }
+            return false;
         }
 
         /**
@@ -117,7 +129,7 @@ module.exports = app => {
          * @return {Promise<*>} 查询结果集
          * @private
          */
-        async _syncOrderByDelete(transaction, vid, order, times) {
+        async _syncOrderByDelete(transaction, vid, order, times, selfOperate = '-') {
             this.initSqlBuilder();
             this.sqlBuilder.setAndWhere('vid', {
                 value: this.db.escape(vid),
@@ -133,7 +145,7 @@ module.exports = app => {
             });
             this.sqlBuilder.setUpdateData('order', {
                 value: 1,
-                selfOperate: '-',
+                selfOperate: selfOperate,
             });
             const [sql, sqlParam] = this.sqlBuilder.build(this.tableName, 'update');
             const data = await transaction.query(sql, sqlParam);
@@ -204,7 +216,11 @@ module.exports = app => {
         async start(vid, times = 1, data) {
             const audit = await this.getDataByCondition({ vid, times, order: 1 });
             if (!audit) {
-                throw '请先选择审批人,再上报数据';
+                if(this.ctx.tender.info.shenpi.advance === shenpiConst.sp_status.gdspl) {
+                    throw '请联系管理员添加审批人';
+                } else {
+                    throw '请先选择审批人,再上报数据';
+                }
             }
             const transaction = await this.db.beginTransaction();
             try {
@@ -494,6 +510,55 @@ module.exports = app => {
             const sqlParam = [this.tableName, this.ctx.service.advance.tableName, this.ctx.service.tender.tableName, auditorId, auditConst.status.checking, auditorId, auditConst.status.checkNo, auditConst.status.checkNo];
             return await this.db.query(sql, sqlParam);
         }
+
+        async updateNewAuditList(advance, newIdList) {
+            const transaction = await this.db.beginTransaction();
+            try {
+                // 先删除旧的审批流,再添加新的
+                transaction.delete(this.tableName, { vid: advance.id, times: advance.times });
+                const newAuditors = [];
+                let order = 1;
+                for (const aid of newIdList) {
+                    newAuditors.push({
+                        tid: advance.tid, vid: advance.id, audit_id: aid,
+                        times: advance.times, order, status: auditConst.status.uncheck,
+                    });
+                    order++;
+                }
+                if(newAuditors.length > 0) await transaction.insert(this.tableName, newAuditors);
+                await transaction.commit();
+            } catch (err) {
+                await transaction.rollback();
+                throw err;
+            }
+        }
+
+        async updateLastAudit(advance, auditList, lastId) {
+            const transaction = await this.db.beginTransaction();
+            try {
+                // 先判断auditList里的aid是否与lastId相同,相同则删除并重新更新order
+                const idList = this._.map(auditList, 'audit_id');
+                let order = idList.length + 1;
+                if (idList.indexOf(lastId) !== -1) {
+                    transaction.delete(this.tableName, { vid: advance.id, times: advance.times, audit_id: lastId });
+                    const audit = this._.find(auditList, { 'audit_id': lastId });
+                    // 顺移之后审核人流程顺序
+                    await this._syncOrderByDelete(transaction, advance.id, audit.order, advance.times);
+                    order = order - 1;
+                }
+
+                // 添加终审
+                const newAuditor = {
+                    tid: advance.tid, vid: advance.id, audit_id: lastId,
+                    times: advance.times, order, status: auditConst.status.uncheck,
+                };
+                await transaction.insert(this.tableName, newAuditor);
+                await transaction.commit();
+            } catch (err) {
+                await transaction.rollback();
+                throw err;
+            }
+        }
     }
     return AdvanceAudit;
 };

+ 13 - 6
app/view/advance/detail.ejs

@@ -111,6 +111,7 @@
                                 </td>
                                 <td width="70%">
                                     <div class="dropdown text-right">
+                                        <% if (ctx.tender.info.shenpi.advance !== shenpiConst.sp_status.gdspl) { %>
                                         <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button"
                                             id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true"
                                             aria-expanded="false">
@@ -138,6 +139,7 @@
                                                 <% }) %>
                                             </dl>
                                         </div>
+                                        <% } %>
                                     </div>
 
                                     <div class="card mt-3">
@@ -145,10 +147,13 @@
                                             审批流程
                                         </div>
                                         <ul class="list-group list-group-flush" id="auditors">
-                                            <% ctx.advance.auditors && ctx.advance.auditors.forEach((item, idx) => { %>
+                                            <% auditorList.forEach((item, idx) => { %>
                                             <li class="list-group-item" auditorId="<%- item.audit_id %>">
-                                                <a href="" class="text-danger pull-right">移除</a><%- idx+1 %>
-                                                <%- item.name %>
+                                                <% if (ctx.tender.info.shenpi.advance === shenpiConst.sp_status.sqspr ||
+                                                        (ctx.tender.info.shenpi.advance === shenpiConst.sp_status.gdzs && idx+1 !== auditorList.length)) { %>
+                                                <a href="javascript: void(0)" class="text-danger pull-right">移除</a>
+                                                <% } %>
+                                                <span><%- idx+1 %> <%- item.name %></span>
                                                 <small class="text-muted"><%- item.role %> </small>
                                                 <p class="m-0 ml-2">
                                                     <small class="text-muted"><%- item.company %></small>
@@ -175,19 +180,19 @@
                                         <ul class="list-group list-group-flush">
                                             <% auditors.forEach((item, idx) => { %>
                                             <% if (idx === 0) { %>
-                                            <li class="list-group-item" data-auditorId="<%- item.audit_id %>">
+                                            <li class="list-group-item" data-auditorid="<%- item.audit_id %>">
                                                 <i class="fa fa fa-play-circle fa-rotate-90"></i> <%- item.name %>
                                                 <small class="text-muted"><%- item.role %></small>
                                                 <span class="pull-right">原报</span>
                                             </li>
                                             <% } else if(idx === auditors.length -1 && idx !== 0) { %>
-                                            <li class="list-group-item" data-auditorId="<%- item.audit_id %>">
+                                            <li class="list-group-item" data-auditorid="<%- item.audit_id %>">
                                                 <i class="fa fa fa-stop-circle"></i> <%- item.name %>
                                                 <small class="text-muted"><%- item.role %></small>
                                                 <span class="pull-right">终审</span>
                                             </li>
                                             <% } else {%>
-                                            <li class="list-group-item" data-auditorId="<%- item.audit_id %>">
+                                            <li class="list-group-item" data-auditorid="<%- item.audit_id %>">
                                                 <i class="fa fa-chevron-circle-down"></i> <%- item.name %>
                                                 <small class="text-muted"><%- item.role %></small>
                                                 <span
@@ -377,6 +382,8 @@
 <script>
     const accountList = JSON.parse('<%- JSON.stringify(accountList) %>');
     const accountGroup = JSON.parse('<%- JSON.stringify(accountGroup) %>');
+    const shenpi_status = <%- ctx.tender.info.shenpi.advance %>;
+    const shenpiConst =  JSON.parse('<%- JSON.stringify(shenpiConst) %>');
 </script>
 <% } %>
 

+ 10 - 4
app/view/revise/info_modal.ejs

@@ -793,10 +793,16 @@
                             html.push(data.role);
                             html.push('</small></li>');
                         }
-                        auditorshtml.push('<li class="list-group-item" data-auditid="' + data.audit_id + '">');
-                        auditorshtml.push('<i class="fa fa-stop-circle"></i> ');
+                        auditorshtml.push('<li class="list-group-item" data-auditorid="' + data.audit_id + '">');
+                        auditorshtml.push('<i class="fa ' + (index+1 === datas.length ? 'fa-stop-circle' : 'fa-chevron-circle-down') + '"></i> ');
                         auditorshtml.push(data.name + ' <small class="text-muted">' + data.role + '</small>');
-                        auditorshtml.push('<span class="pull-right">终审</span>');
+                        if (index === 0) {
+                            auditorshtml.push('<span class="pull-right">原报</span>');
+                        } else if (index+1 === datas.length) {
+                            auditorshtml.push('<span class="pull-right">终审</span>');
+                        } else {
+                            auditorshtml.push('<span class="pull-right">'+ transFormToChinese(index) +'审</span>');
+                        }
                         auditorshtml.push('</li>');
                     }
                     $('#auditors').html(html.join(''));
@@ -830,7 +836,7 @@
                 //         .removeClass('fa-chevron-circle-down').addClass('fa-stop-circle');
                 // }
                 for (let i = 0; i < $('#auditors-list li').length; i++) {
-                    $('#auditors-list li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors-list li').length ? '终' : transFormToChinese(i+1)) + '审');
+                    $('#auditors-list li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors-list li').length ? '终' : transFormToChinese(i)) + '审');
                     // $('#auditors-list2 li').eq(i).find('.pull-right').text((i + 1 === $('#auditors-list2 li').length ? '终' : transFormToChinese(i + 1)) + '审');
                 }
             });