Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/const/audit.js

@@ -493,7 +493,7 @@ const changeProject = (function() {
 
     // 按钮
     const statusButton = [];
-    statusButton[status.uncheck] = '待上报';
+    statusButton[status.uncheck] = '上报';
     statusButton[status.checking] = '审批';
     statusButton[status.checked] = '';
     statusButton[status.checkNo] = '';
@@ -573,7 +573,7 @@ const changeApply = (function() {
 
     // 按钮
     const statusButton = [];
-    statusButton[status.uncheck] = '待上报';
+    statusButton[status.uncheck] = '上报';
     statusButton[status.checking] = '审批';
     statusButton[status.checked] = '';
     statusButton[status.checkNo] = '重新上报';

app/service/change_project_audit.js

@@ -95,6 +95,7 @@ module.exports = app => {
             switch (status) {
                 case auditConst.status.checking :
                 case auditConst.status.checked :
+                case auditConst.status.checkNo :
                     sql = 'SELECT la.`aid`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`cpid`, la.`aid`, la.`order` ' +
                         '  FROM ?? AS la Left Join ?? AS pa On la.`aid` = pa.`id` ' +
                         '  WHERE la.`cpid` = ? and la.`status` = ? ' +
@@ -102,17 +103,16 @@ module.exports = app => {
                     sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, cpId, status];
                     auditor = await this.db.queryOne(sql, sqlParam);
                     break;
-                case auditConst.status.checkNo :
+                case auditConst.status.back :
                     sql = 'SELECT la.`aid`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`cpid`, la.`aid`, la.`order` ' +
                         '  FROM ?? AS la Left Join ?? AS pa On la.`aid` = pa.`id`' +
                         '  WHERE la.`cpid` = ? and la.`status` = ? and la.`times` = ?' +
                         '  ORDER BY la.`times` desc, la.`order` desc';
-                    sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, cpId, auditConst.status.checkNo, parseInt(times) - 1];
+                    sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, cpId, auditConst.status.back, parseInt(times) - 1];
                     auditor = await this.db.queryOne(sql, sqlParam);
                     break;
                 case auditConst.status.uncheck :
                     break;
-                case auditConst.status.back :
                 default:break;
             }
             return auditor;

app/view/change/apply.ejs

@@ -66,9 +66,9 @@
                 <table class="table table-bordered">
                     <thead>
                     <tr>
-                        <th width="15%" id="sort_change">变更申请编号</th><th width="20%">变更工程名称</th>
-                        <th width="10%">创建时间</th><th width="15%">变更立项书</th><th width="15%">变更通知书</th>
-                        <th width="10%">通知书发出人</th><th width="5%">审批状态</th><th width="10%">操作</th>
+                        <th width="13%" id="sort_change">变更申请编号</th><th width="16%">变更工程名称</th>
+                        <th width="10%">创建时间</th><th width="15%">变更立项书</th><th width="13%">变更通知书</th>
+                        <th width="10%">通知书发出人</th><th width="6%">审批状态</th><th width="10%">审批进度</th><th width="5%">操作</th>
                     </tr>
                     </thead>
                     <tbody id="changeList">
@@ -78,15 +78,26 @@
                             <td><%- c.project_code %></td>
                             <td><% if (c.notice_code) { %><a href="/tender/<%- tender.id %>/change/apply/<%- c.id %>/information/notice"><%- c.notice_code %></a><% } %></td>
                             <td><%- c.account_name %></td>
-                            <td><span class="<%- auditConst.statusClass[c.status] %>"><%- auditConst.statusString[c.status] %></span></td>
                             <td>
                                 <% if ((c.status === auditConst.status.uncheck || c.status === auditConst.status.checkNo) && c.uid === ctx.session.sessionUser.accountId) { %>
                                     <a href="/tender/<%- tender.id %>/change/apply/<%- c.id %>/information" class="btn <%- auditConst.statusButtonClass[c.status] %> btn-sm"><%- auditConst.statusButton[c.status] %></a>
                                 <% } else if (c.status === auditConst.status.checking && c.curAuditor && c.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
                                     <a href="/tender/<%- tender.id %>/change/apply/<%- c.id %>/information" class="btn <%- auditConst.statusButtonClass[c.status] %> btn-sm"><%- auditConst.statusButton[c.status] %></a>
+                                <% } else { %>
+                                    <span class="<%- auditConst.auditProgressClass[c.status] %>"><%- auditConst.auditProgress[c.status] %></span>
                                 <% } %>
+                            </td>
+                            <% if (c.status === auditConst.status.uncheck) { %>
+                            <td>
+                                待上报
+                            </td>
+                            <% } else { %>
+                            <td><%- c.curAuditor.name %>-<%- c.curAuditor.role %> <span class="<%- auditConst.statusClass[c.status] %>"><%- auditConst.statusString[c.status] %></span></td>
+                            <% } %>
+                            <td>
                                 <% if (c.uid === uid && (c.status === auditConst.status.uncheck || c.status === auditConst.status.checkNo)) { %><a href="#del-bg" caid="<%= c.id %>" data-toggle="modal" data-target="#del-bg" class="btn btn-outline-danger btn-sm delete-caid-modal">删除</a><% } %>
-                            </td></tr>
+                            </td>
+                        </tr>
                     <% } %>
                     </tbody>
                 </table>

app/view/change/apply_modal.ejs

@@ -71,7 +71,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">编号设置</h5>
+                <h5 class="modal-title">变更申请编号设置</h5>
             </div>
             <div class="modal-body">
                 <ul class="nav nav-tabs mb-3" role="tablist">

app/view/change/project.ejs

@@ -66,24 +66,34 @@
                 <table class="table table-bordered">
                     <thead>
                     <tr>
-                        <th width="20%" id="sort_change">变更立项书编号</th><th width="30%">变更工程名称</th>
+                        <th width="15%" id="sort_change">变更立项书编号</th><th width="25%">变更工程名称</th>
                         <th width="10%">发起人</th><th width="10%">发起类型</th><th width="10%">发起时间</th>
-                        <th width="10%">审批状态</th><th width="10%">操作</th>
+                        <th width="10%">审批状态</th><th width="15%">审批进度</th><th width="5%">操作</th>
                     </tr>
                     </thead>
                     <tbody id="changeList">
                     <% for (const c of changes) { %>
                         <tr><td><a href="/tender/<%- tender.id %>/change/project/<%- c.id %>/information"><%- c.code %></a></td>
                             <td><%- c.name %></td><td><%- c.account_name %></td><td><%- changeConst.project_type[c.type] %></td><td><%- ctx.helper.formatFullDate(c.in_time) %></td>
-                            <td><span class="<%- auditConst.statusClass[c.status] %>"><%- auditConst.statusString[c.status] %></span></td>
                             <td>
                                 <% if ((c.status === auditConst.status.uncheck || c.status === auditConst.status.back) && c.uid === ctx.session.sessionUser.accountId) { %>
                                     <a href="/tender/<%- tender.id %>/change/project/<%- c.id %>/information" class="btn <%- auditConst.statusButtonClass[c.status] %> btn-sm"><%- auditConst.statusButton[c.status] %></a>
                                 <% } else if (c.status === auditConst.status.checking && c.curAuditor && c.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
                                     <a href="/tender/<%- tender.id %>/change/project/<%- c.id %>/information" class="btn <%- auditConst.statusButtonClass[c.status] %> btn-sm"><%- auditConst.statusButton[c.status] %></a>
+                                <% } else { %>
+                                    <span class="<%- auditConst.auditProgressClass[c.status] %>"><%- auditConst.auditProgress[c.status] %></span>
                                 <% } %>
+                            </td>
+                            <td>
+                            <% if (c.status !== auditConst.status.uncheck) { %>
+                                <%- c.curAuditor.name %>-<%- c.curAuditor.role %>
+                            <% } %>
+                            <span class="<%- auditConst.statusClass[c.status] %>"><%- auditConst.statusString[c.status] %></span>
+                            </td>
+                            <td>
                                 <% if (c.uid === uid && (c.status === auditConst.status.uncheck || c.status === auditConst.status.back)) { %><a href="#del-bg" cpid="<%= c.id %>" data-toggle="modal" data-target="#del-bg" class="btn btn-outline-danger btn-sm delete-cpid-modal">删除</a><% } %>
-                            </td></tr>
+                            </td>
+                        </tr>
                     <% } %>
                     </tbody>
                 </table>