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

app/public/js/setting_unit_list_order.js

@@ -56,10 +56,10 @@ const unitListOrder = (function () {
 
     function resetHeaderHtml() {
         $('#unit_header').html(`<tr>
-                                        <th>序号</th>
-                                        <th>单位名称 ${unitListOrder.getOrderButton('name')}</th>
-                                        <th>账号数</th>
-                                        <th>类型 ${unitListOrder.getOrderButton('type')}</th>
+                                        <th class="text-center">序号</th>
+                                        <th class="text-center">单位名称 ${unitListOrder.getOrderButton('name')}</th>
+                                        <th class="text-center">账号数</th>
+                                        <th class="text-center">类型 ${unitListOrder.getOrderButton('type')}</th>
                                         <th class="text-center">备注</th></tr>`);
     }
 

app/view/setting/user.ejs

@@ -43,12 +43,12 @@
                                 <table class="table table-hover table-bordered table-sm">
                                     <thead>
                                     <tr>
-                                        <th>账号</th>
-                                        <th>姓名</th>
-                                        <th>单位</th>
-                                        <th>职位</th>
-                                        <th>手机</th>
-                                        <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>
                                         <th class="text-center">操作</th></tr>
                                     </thead>
                                     <tbody>

app/view/setting/user_modal.ejs

@@ -42,7 +42,9 @@
                     <!--<input class="form-control form-control-sm" name="company" value="" type="text">-->
                     <input value="7" name="account_group" type="hidden">
                     <select class="form-control form-control-sm" name="company">
+                        <% if (unitList.length === 0) { %>
                         <option>请选择</option>
+                        <% } %>
                         <% for (const u of unitList) { %>
                             <option><%- u.name %></option>
                         <% } %>
@@ -119,7 +121,9 @@
                     <!--<input class="form-control form-control-sm" value="" name="company" type="text">-->
                     <input value="" name="account_group" type="hidden">
                     <select class="form-control form-control-sm" name="company">
-                        <option>请选择</option>
+                        <% if (unitList.length === 0) { %>
+                            <option>请选择</option>
+                        <% } %>
                         <% for (const u of unitList) { %>
                             <option><%- u.name %></option>
                         <% } %>

app/view/setting/user_permission.ejs

@@ -44,12 +44,12 @@
                                 <table class="table table-hover table-bordered table-sm">
                                     <thead>
                                     <tr>
-                                        <th>账号</th>
-                                        <th>姓名</th>
-                                        <th>单位</th>
-                                        <th>职位</th>
-                                        <th>协作办公</th>
-                                        <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>
                                     </thead>
                                     <tbody>
                                     <% for (const account of accountData) { %>
@@ -59,7 +59,7 @@
                                             <td><%= account.company %></td>
                                             <td><%= account.role %></td>
                                             <td><% if (account.cooperation === 1) { %>启用<% } %></td>
-                                            <td>
+                                            <td class="text-center">
                                                 <% if (account.permission !== '' && account.permission !== null) { %>
                                                     <% const accountPermission = JSON.parse(account.permission); %>
                                                     <% for(const ap in accountPermission) { %>

app/view/setting/user_permission_modal.ejs

@@ -41,7 +41,9 @@
                     <label>单位名称<b class="text-danger">*</b></label>
                     <input value="7" name="account_group" type="hidden">
                     <select class="form-control form-control-sm" name="company">
-                        <option>请选择</option>
+                        <% if (unitList.length === 0) { %>
+                            <option>请选择</option>
+                        <% } %>
                         <% for (const u of unitList) { %>
                             <option><%- u.name %></option>
                         <% } %>

app/view/setting/user_unit.ejs

@@ -27,10 +27,10 @@
                                 <table class="table table-hover table-bordered table-sm">
                                     <thead id="unit_header">
                                     <tr>
-                                        <th>序号</th>
-                                        <th>单位名称</th>
-                                        <th>账号数</th>
-                                        <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></tr>
                                     </thead>
                                     <tbody id="unit_list" style="cursor: pointer">

app/view/setting/user_unit_modal.ejs

@@ -41,7 +41,9 @@
                     <label>单位名称<b class="text-danger">*</b></label>
                     <input value="7" name="account_group" type="hidden">
                     <select class="form-control form-control-sm" name="company">
-                        <option value="0">请选择</option>
+                        <% if (unitList.length === 0) { %>
+                            <option>请选择</option>
+                        <% } %>
                         <% for (const u of unitList) { %>
                             <option><%- u.name %></option>
                         <% } %>