Browse Source

调差和用户管理页样式更改

laiguoran 5 years ago
parent
commit
e37349fb9b
3 changed files with 52 additions and 45 deletions
  1. 1 0
      app/public/js/setting.js
  2. 47 45
      app/view/material/index.ejs
  3. 4 0
      app/view/setting/user_modal.ejs

+ 1 - 0
app/public/js/setting.js

@@ -32,6 +32,7 @@ $(document).ready(() => {
         $('#edit-user input[name="id"]').val(account.id);
         $('#edit-user input[name="id"]').val(account.id);
         $('#edit-user select[name="account_group"]').val(account.account_group);
         $('#edit-user select[name="account_group"]').val(account.account_group);
         $('#edit-user input[class="account-check"]').val(account.account);
         $('#edit-user input[class="account-check"]').val(account.account);
+        $('#edit-user input[class="auth-mobile"]').val(account.auth_mobile);
     });
     });
 
 
     // 分配随机密码
     // 分配随机密码

+ 47 - 45
app/view/material/index.ejs

@@ -16,52 +16,54 @@
     </div>
     </div>
     <div class="content-wrap">
     <div class="content-wrap">
         <div class="c-body">
         <div class="c-body">
-            <table class="table table-bordered">
-                <thead>
-                <tr>
-                    <th>期数</th>
-                    <th class="text-center">添加时间</th>
-                    <th class="text-center">计量期</th>
-                    <th class="text-center">价差费用(含税)</th>
-                    <th class="text-center">价差费用</th>
-                    <th class="text-center">审批进度</th>
-                    <th class="text-center">操作</th>
-                </tr>
-                </thead>
-                <tbody>
-                <% for (const m of materials) { %>
-                <tr>
-                    <td>
-                        <a href="<%- '/tender/' + ctx.tender.id + '/measure/material/' + m.order %>">第 <%- m.order %> 期</a>
-                    </td>
-                    <td class="text-center"><%= moment(m.in_time).format('YYYY-MM-DD') %></td>
-                    <td class="text-center">第 <%= m.s_order %> 期</td>
-                    <td class="text-right"><%= m.m_tp !== null ? ctx.helper.round(ctx.helper.mul(m.m_tp, 1+m.rate/100), 2) : null %></td>
-                    <td class="text-right"><%= m.m_tp %></td>
-                    <td class="<%- auditConst.auditProgressClass[m.status] %>">
-                        <% if (m.curAuditor) { %>
-                            <a href="#sp-list" data-toggle="modal" data-target="#sp-list" m-order="<%- m.order %>"><%- m.curAuditor.name %><%if (m.curAuditor.role !== '' && m.curAuditor.role !== null) { %>-<%- m.curAuditor.role %><% } %></a>
-                        <% } %>
-                        <%- auditConst.auditProgress[m.status] %>
-                    </td>
-                    <td class="text-center">
-                    <% if (m.status === auditConst.status.uncheck && m.user_id === ctx.session.sessionUser.accountId) { %>
-                        <a href="<%- '/tender/' + ctx.tender.id + '/measure/material/' + m.order %>" class="btn <%- auditConst.statusButtonClass[m.status] %> btn-sm"><%- auditConst.statusButton[m.status] %></a>
-                    <% } else if (m.status === auditConst.status.checkNo && m.curAuditor && m.user_id === ctx.session.sessionUser.accountId) { %>
-                        <a href="<%- '/tender/' + ctx.tender.id + '/measure/material/' + m.order %>" class="btn <%- auditConst.statusButtonClass[m.status] %> btn-sm"><%- auditConst.statusButton[m.status] %></a>
-                    <% } else if (m.status === auditConst.status.checking && m.curAuditor && m.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
-                        <a href="<%- '/tender/' + ctx.tender.id + '/measure/material/' + m.order %>" class="btn <%- auditConst.statusButtonClass[m.status] %> btn-sm"><%- auditConst.statusButton[m.status] %></a>
-                    <% } else { %>
-                        <span class="<%- auditConst.auditProgressClass[m.status] %>"><%- auditConst.auditProgress[m.status] %></span>
+            <div class="sjs-height-0">
+                <table class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th>期数</th>
+                        <th class="text-center">添加时间</th>
+                        <th class="text-center">计量期</th>
+                        <th class="text-center">价差费用(含税)</th>
+                        <th class="text-center">价差费用</th>
+                        <th class="text-center">审批进度</th>
+                        <th class="text-center">操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <% for (const m of materials) { %>
+                        <tr>
+                            <td>
+                                <a href="<%- '/tender/' + ctx.tender.id + '/measure/material/' + m.order %>">第 <%- m.order %> 期</a>
+                            </td>
+                            <td class="text-center"><%= moment(m.in_time).format('YYYY-MM-DD') %></td>
+                            <td class="text-center">第 <%= m.s_order %> 期</td>
+                            <td class="text-right"><%= m.m_tp !== null ? ctx.helper.round(ctx.helper.mul(m.m_tp, 1+m.rate/100), 2) : null %></td>
+                            <td class="text-right"><%= m.m_tp %></td>
+                            <td class="<%- auditConst.auditProgressClass[m.status] %>">
+                                <% if (m.curAuditor) { %>
+                                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" m-order="<%- m.order %>"><%- m.curAuditor.name %><%if (m.curAuditor.role !== '' && m.curAuditor.role !== null) { %>-<%- m.curAuditor.role %><% } %></a>
+                                <% } %>
+                                <%- auditConst.auditProgress[m.status] %>
+                            </td>
+                            <td class="text-center">
+                                <% if (m.status === auditConst.status.uncheck && m.user_id === ctx.session.sessionUser.accountId) { %>
+                                    <a href="<%- '/tender/' + ctx.tender.id + '/measure/material/' + m.order %>" class="btn <%- auditConst.statusButtonClass[m.status] %> btn-sm"><%- auditConst.statusButton[m.status] %></a>
+                                <% } else if (m.status === auditConst.status.checkNo && m.curAuditor && m.user_id === ctx.session.sessionUser.accountId) { %>
+                                    <a href="<%- '/tender/' + ctx.tender.id + '/measure/material/' + m.order %>" class="btn <%- auditConst.statusButtonClass[m.status] %> btn-sm"><%- auditConst.statusButton[m.status] %></a>
+                                <% } else if (m.status === auditConst.status.checking && m.curAuditor && m.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
+                                    <a href="<%- '/tender/' + ctx.tender.id + '/measure/material/' + m.order %>" class="btn <%- auditConst.statusButtonClass[m.status] %> btn-sm"><%- auditConst.statusButton[m.status] %></a>
+                                <% } else { %>
+                                    <span class="<%- auditConst.auditProgressClass[m.status] %>"><%- auditConst.auditProgress[m.status] %></span>
+                                <% } %>
+                                <% if (m.user_id === ctx.session.sessionUser.accountId && m.order === materials.length) { %>
+                                    <a href="#del-qi" class="btn btn-outline-danger btn-sm ml-1" data-toggle="modal" data-target="#del-qi">删除</a>
+                                <% } %>
+                            </td>
+                        </tr>
                     <% } %>
                     <% } %>
-                    <% if (m.user_id === ctx.session.sessionUser.accountId && m.order === materials.length) { %>
-                        <a href="#del-qi" class="btn btn-outline-danger btn-sm ml-1" data-toggle="modal" data-target="#del-qi">删除</a>
-                    <% } %>
-                    </td>
-                </tr>
-                <% } %>
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 4 - 0
app/view/setting/user_modal.ejs

@@ -104,6 +104,10 @@
                     <small class="form-text text-muted">修改姓名,将影响所有该账号参与数据</small>
                     <small class="form-text text-muted">修改姓名,将影响所有该账号参与数据</small>
                 </div>
                 </div>
                 <div class="form-group">
                 <div class="form-group">
+                    <label>认证手机</label>
+                    <input class="form-control" value="" class="auth-mobile" type="text" readonly>
+                </div>
+                <div class="form-group">
                     <label>单位名称<b class="text-danger">*</b></label>
                     <label>单位名称<b class="text-danger">*</b></label>
                     <input class="form-control" value="" name="company" type="text">
                     <input class="form-control" value="" name="company" type="text">
                 </div>
                 </div>