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

app/view/change/index.ejs

@@ -84,12 +84,12 @@
             <div class="sjs-height-0">
                 <table class="table table-bordered" id="change-table">
                     <thead>
-                    <tr>
+                    <tr><th width="3%">序号</th>
                         <th width="18%" id="sort_change">申请编号/变更令号</th><th width="24%">变更工程名称</th>
-                        <th width="8%">变更性质</th><% if (ctx.session.sessionProject.page_show.openChangeState) { %><th width="8%">变更令状态</th><% } %>
-                        <th width="8%">变更金额</th><th width="8%">正变更金额</th>
-                        <th width="8%">负变更金额</th><th width="10%">审批状态</th>
-                        <th width="12%">审批进度</th><th width="4%"></th>
+                        <th width="7%">变更性质</th><% if (ctx.session.sessionProject.page_show.openChangeState) { %><th width="7%">变更令状态</th><% } %>
+                        <th width="7%">变更金额</th><th width="7%">正变更金额</th>
+                        <th width="7%">负变更金额</th><th width="7%">审批状态</th>
+                        <th width="14%">审批进度</th><th width="4%"></th>
                     </tr>
                     </thead>
                     <tbody id="changeList">
@@ -98,8 +98,10 @@
                     <% const cQuality = changeConst.quality[t] %>
                     <% qualityArray[cQuality.value] = cQuality.name %>
                     <% } %>
-                    <% for (const c of changes) { %>
+                    <% if (changes.length > 0) { %>
+                    <% for (const [index, c] of changes.entries()) { %>
                     <tr>
+                        <td><%- (pageInfo.page-1)*pageInfo.pageSize + index+1 %></td>
                         <td><a href="/tender/<%- tender.id %>/change/<%- c.cid %>/information"><% if (c.status !== auditConst.status.checked) { %><%- c.code %><% } else { %><%- c.p_code %><% } %></a></td>
                         <td><%- c.name %></td>
                         <td><%- qualityArray[c.quality] %><% c.quality %></td>
@@ -145,6 +147,7 @@
                         <td><% if ((c.status === auditConst.status.uncheck || (((c.status === auditConst.status.back || c.status === auditConst.status.revise) && c.stageChangeNum === 0) && c.uid === uid)) && !ctx.tender.isTourist) { %><a href="#del-bg" cid="<%= c.cid %>" data-toggle="modal" data-target="#del-bg" class="btn btn-outline-danger btn-sm delete-cid-modal">删除</a><% } %></td>
                     </tr>
                     <% } %>
+                    <% } %>
                     </tbody>
                 </table>
                 <!--翻页-->