修改设置页和调整草图删除按钮大小

app/const/setting.js

@@ -10,15 +10,15 @@
 
 const cType = {
     dropDown: 1,
-    radio: 2,
+    // radio: 2,
 };
 const cTypeStr = [];
 cTypeStr[cType.dropDown] = '下拉菜单';
-cTypeStr[cType.radio] = '单选框';
+// cTypeStr[cType.radio] = '单选框';
 
 module.exports = {
     cType: {
         key: cType,
         text: cTypeStr,
     },
-}
+}

app/controller/setting_controller.js

@@ -364,11 +364,11 @@ module.exports = app => {
                 };
 
                 const data = JSON.parse(ctx.request.body.data);
-                if (!data.name || !data.type) {
+                if (!data.name) {
                     throw '提交数据错误';
                 }
 
-                responseData.data = await ctx.service.category.addCategory(projectId, data.name, data.type);
+                responseData.data = await ctx.service.category.addCategory(projectId, data.name, settingConst.cType.key.dropDown);
                 ctx.body = responseData;
             } catch (err) {
                 this.log(err);

app/public/js/category.js

@@ -34,7 +34,7 @@ function getCategoryHtml(category) {
     for (const d of data) {
         html.push('<tr ', d.value && d.value.length > 0 ? '' : 'class="table-warning"', 'cid="' + d.id + '">');
         html.push('<td>', d.name, '</td>');
-        html.push('<td>', d.typeStr, '</td>');
+        // html.push('<td>', d.typeStr, '</td>');
         html.push('<td>');
         if (d.value && d.value.length > 0) {
             for (const v of d.value) {
@@ -182,8 +182,8 @@ function bindCategoryControl() {
         const id = parseInt($(this).attr('cid'));
         const category = findCategory(id);
         $('input[name=name]', '#edit-cate').val(category.name);
-        $('div[name=type]', '#edit-cate').html(getTypeHtml());
-        $('#inlineRadio' + category.type, '#edit-cate')[0].checked = true;
+        // $('div[name=type]', '#edit-cate').html(getTypeHtml());
+        // $('#inlineRadio' + category.type, '#edit-cate')[0].checked = true;
         $('#edit-cate-ok').attr('cid', $(this).attr('cid'));
         $('#edit-cate').modal('show');
     });
@@ -195,26 +195,26 @@ function bindCategoryControl() {
 }
 
 $(document).ready(() => {
-    InitCategoryData(cData);
+    // InitCategoryData(cData);
     $('#categoryList').html(getCategoryHtml(cData));
     bindCategoryControl();
-    $('div[name=type]', '#add-cate').html(getTypeHtml());
+    // $('div[name=type]', '#add-cate').html(getTypeHtml());
     // 新增分类
     $('#add-cate-ok').click(function () {
         const name = $('input[name=name]', '#add-cate');
-        const type = $('input[type=radio]:checked', '#add-cate');
+        // const type = $('input[type=radio]:checked', '#add-cate');
         const data = {
             name: name.val(),
-            type: parseInt(type.val()),
+            // type: parseInt(type.val()),
         };
         postData('/setting/category/add', data, function (data) {
-            InitCategoryData(data);
+            // InitCategoryData(data);
             $('#categoryList').append(getCategoryHtml(data));
             bindCategoryControl();
             cData.push(data);
             $('#add-cate').modal('hide');
             name.val('');
-            type[0].checked = false;
+            // type[0].checked = false;
         }, function (msg) {
             $('#add-cate').modal('hide');
         });
@@ -250,7 +250,7 @@ $(document).ready(() => {
             tenders = data.tenders;
             const category = findCategory(data.category.id);
             category.value = data.category.value;
-            InitCategoryData(category);
+            // InitCategoryData(category);
             $('tr[cid=' + data.category.id + ']')[0].outerHTML = getCategoryHtml(category);
             bindCategoryControl();
             $('#add').modal('hide');
@@ -261,18 +261,18 @@ $(document).ready(() => {
     // 编辑
     $('#edit-cate-ok').click(function () {
         const name = $('input[name=name]', '#edit-cate');
-        const type = $('input[type=radio]:checked', '#edit-cate');
+        // const type = $('input[type=radio]:checked', '#edit-cate');
         const data = {
             id: parseInt($(this).attr('cid')),
             name: name.val(),
-            type: parseInt(type.val()),
+            // type: parseInt(type.val()),
         }
         postData('/setting/category/update', data, function (data) {
             const category = findCategory(data.id);
             for (const c in data) {
                 category[c] = data[c];
             }
-            InitCategoryData(category);
+            // InitCategoryData(category);
             $('tr[cid=' + data.id + ']')[0].outerHTML = getCategoryHtml(category);
             bindCategoryControl();
             $('#edit-cate').modal('hide');
@@ -292,4 +292,4 @@ $(document).ready(() => {
             $('#del-cate').modal('hide');
         });
     });
-});
+});

app/public/js/stage.js

@@ -2212,7 +2212,7 @@ $(document).ready(() => {
                     const itemStyle = 'top:' + item.top + ';' + 'left:' + item.left + ';' + 'width:' + item.width + ';' + 'height:' + item.height + ';';
                     html.push('<div class="img-item" style="' + itemStyle + '">');
                     html.push('<div class="img-bar">');
-                    html.push('<a href="javascript: void(0);" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>');
+                    html.push('<a href="javascript: void(0);" class="text-danger" title="删除"><i class="fa fa-remove" style="font-size: 24px"></i></a>');
                     html.push('</div>');
                     html.push('<div class="focus" style="width:100%; height:100%"><img src="', item.src, '" id="draggable" style="width:100%; height:100%"></div>');
                     html.push('</div>');
@@ -2240,7 +2240,7 @@ $(document).ready(() => {
                         const html = [];
                         html.push('<div class="img-item">');
                         html.push('<div class="img-bar">');
-                        html.push('<a href="javascript: void(0);" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>');
+                        html.push('<a href="javascript: void(0);" class="text-danger" title="删除"><i class="fa fa-remove" style="font-size: 24px"></i></a>');
                         html.push('</div>');
                         html.push('<div class="focus" style="width:100%; height:100%"><img src="', '/' + result, '" id="draggable" style="width:100%; height:100%"></div>');
                         html.push('</div>');

app/public/js/stage_detail.js

@@ -648,7 +648,7 @@ $(document).ready(() => {
             const itemStyle = 'top:' + item.top + ';' + 'left:' + item.left + ';' + 'width:' + item.width + ';' + 'height:' + item.height + ';';
             html.push('<div class="img-item" style="' + itemStyle + '">');
             html.push('<div class="img-bar">');
-            html.push('<a href="javascript: void(0);" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>');
+            html.push('<a href="javascript: void(0);" class="text-danger" title="删除"><i class="fa fa-remove" style="font-size: 24px"></i></a>');
             html.push('</div>');
             html.push('<div class="focus" style="width:100%; height:100%"><img src="', item.src, '" id="draggable" style="width:100%; height:100%"></div>');
             html.push('</div>');
@@ -677,7 +677,7 @@ $(document).ready(() => {
                 const html = [];
                 html.push('<div class="img-item">');
                 html.push('<div class="img-bar">');
-                html.push('<a href="javascript: void(0);" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>');
+                html.push('<a href="javascript: void(0);" class="text-danger" title="删除"><i class="fa fa-remove" style="font-size: 24px"></i></a>');
                 html.push('</div>');
                 html.push('<div class="focus" style="width:100%; height:100%"><img src="', '/' + result, '" id="draggable" style="width:100%; height:100%"></div>');
                 html.push('</div>');

app/public/js/tender_list.js

@@ -77,6 +77,7 @@ function onDropNode(event, treeId, treeNodes, targetNode, moveType) {
     }
     resetFixNode(1);
     resetFixNode(2);
+    console.log(targetNode);
     if (targetNode.lid === 1 && treeNodes[0].children && treeNodes[0].children.length !== 0) {
         moveChildren(treeNodes[0].children, zTree.getNodeByParam('lid', 1));
     } else if (targetNode.lid !== 1) {
@@ -140,8 +141,9 @@ function getCategoryHtml() {
     function getSelectCategoryHtml (cate) {
         const html = [];
         html.push('<div class="form-group" cate-id="' + cate.id + '">');
-        html.push('<lable>', cate.name, '</lable>');
-        html.push('<select class="form-control">');
+        html.push('<label>', cate.name, '</label>');
+        html.push('<select class="form-control form-control-sm">');
+        html.push('<option value="0">不选</option>');
         for (const v of cate.value) {
             html.push('<option value="' + v.id + '">', v.value, '</option>');
         }
@@ -152,7 +154,7 @@ function getCategoryHtml() {
     function getRadioCategoryHtml (cate) {
         const html = [];
         html.push('<div class="form-group" cate-id="' + cate.id + '">');
-        html.push('<lable>', cate.name, '</lable>');
+        html.push('<label>', cate.name, '</label>');
         html.push('<div>');
         for (const iV in cate.value) {
             const v = cate.value[iV];
@@ -167,11 +169,11 @@ function getCategoryHtml() {
     }
     const html = [];
     for (const c of category) {
-        if (c.type === categoryType.key.dropDown) {
+        // if (c.type === categoryType.key.dropDown) {
             html.push(getSelectCategoryHtml(c));
-        } else if (c.type === categoryType.key.radio) {
-            html.push(getRadioCategoryHtml(c));
-        }
+        // } else if (c.type === categoryType.key.radio) {
+            // html.push(getRadioCategoryHtml(c));
+        // }
     }
     return html.join('');
 }

app/public/js/tender_list_manage.js

@@ -140,8 +140,9 @@ function getCategoryHtml() {
     function getSelectCategoryHtml (cate) {
         const html = [];
         html.push('<div class="form-group" cate-id="' + cate.id + '">');
-        html.push('<lable>', cate.name, '</lable>');
-        html.push('<select class="form-control">');
+        html.push('<label>', cate.name, '</label>');
+        html.push('<select class="form-control form-control-sm">');
+        html.push('<option value="0">不选</option>');
         for (const v of cate.value) {
             html.push('<option value="' + v.id + '">', v.value, '</option>');
         }
@@ -167,11 +168,11 @@ function getCategoryHtml() {
     }
     const html = [];
     for (const c of category) {
-        if (c.type === categoryType.key.dropDown) {
+        // if (c.type === categoryType.key.dropDown) {
             html.push(getSelectCategoryHtml(c));
-        } else if (c.type === categoryType.key.radio) {
-            html.push(getRadioCategoryHtml(c));
-        }
+        // } else if (c.type === categoryType.key.radio) {
+        //     html.push(getRadioCategoryHtml(c));
+        // }
     }
     return html.join('');
 }

app/view/dashboard/index.ejs

@@ -45,13 +45,7 @@
                                                         <span style="color: indianred">被退回</span>
                                                     <% } %>
                                                     需要您
-                                                    <a href="/tender/<%- revise.t_id %>/revise/info" class="btn btn-sm btn-primary">
-                                                        <% if (revise.status === acRevise.status.checking) { %>
-                                                            审批
-                                                        <% } else if (revise.status === acRevise.status.checkNo) { %>
-                                                            重新上报
-                                                        <% } %>
-                                                    </a>。
+                                                    <a href="/tender/<%- revise.t_id %>/revise/info" class="btn btn-sm btn-primary"><% if (revise.status === acRevise.status.checking) { %>审批<% } else if (revise.status === acRevise.status.checkNo) { %>重新上报<% } %></a>。
                                                 </p>
                                             </div>
                                         </li>
@@ -65,9 +59,7 @@
                                                     <h5 class="mt-0"><%- ctx.session.sessionUser.name %><small class="ml-3 text-muted"><%- role %></small></h5>
                                                     <p><a href="/tender/<%- audit.tid %>"><%- audit.name %></a>
                                                         第<%- audit.sorder %>期 <% if (audit.sstatus === acStage.status.checkNoPre) { %><span style="color: indianred">被退回</span> <% } %> 需要您
-                                                        <a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>" class="btn btn-sm btn-primary">
-                                                            <% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批
-                                                        </a>。
+                                                        <a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>" class="btn btn-sm btn-primary"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a>。
                                                     </p>
                                                 </div>
                                             </li>
@@ -79,9 +71,7 @@
                                                     <h5 class="mt-0"><%- ctx.session.sessionUser.name %><small class="ml-3 text-muted"><%- role %></small></h5>
                                                     <p><a href="/tender/<%- audit.tid %>"><%- audit.name %></a>
                                                         第<%- audit.sorder %>期 <% if (audit.sstatus === acStage.status.checkNoPre) { %><span style="color: indianred">被退回</span> <% } %> 需要您
-                                                        <a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>" class="btn btn-sm btn-primary">
-                                                            重新上报
-                                                        </a>。
+                                                        <a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>" class="btn btn-sm btn-primary">重新上报</a>。
                                                     </p>
                                                 </div>
                                             </li>
@@ -100,15 +90,7 @@
                                                         <span style="color: indianred">被退回</span>
                                                     <% } %>
                                                     需要您
-                                                    <a href="/tender/<%- change.tid %>/change/<%- change.cid %>/info" class="btn btn-sm btn-primary">
-                                                        <% if (change.cstatus === acChange.status.checking) { %>
-                                                            审批
-                                                        <% } else if (change.cstatus === acChange.status.backnew) { %>
-                                                            重新审批
-                                                        <% } else { %>
-                                                            重新上报
-                                                        <% } %>
-                                                    </a>。
+                                                    <a href="/tender/<%- change.tid %>/change/<%- change.cid %>/info" class="btn btn-sm btn-primary"><% if (change.cstatus === acChange.status.checking) { %>审批<% } else if (change.cstatus === acChange.status.backnew) { %>重新审批<% } else { %>重新上报<% } %></a>。
                                                 </p>
                                             </div>
                                         </li>

app/view/setting/category.ejs

@@ -9,18 +9,21 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
-            <table class="table table-hover table-bordered table-sm">
-                <thead>
-                <tr>
-                    <th>名称</th>
-                    <th>类型</th>
-                    <th>值</th>
-                    <th>操作</th>
-                </tr>
-                </thead>
-                <tbody id="categoryList">
-                </tbody>
-            </table>
+            <div class="sjs-height-0">
+                <div class="m-3">
+                    <table class="table table-hover table-bordered table-sm">
+                        <thead>
+                        <tr>
+                            <th>名称</th>
+                            <th>值</th>
+                            <th>操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="categoryList">
+                        </tbody>
+                    </table>
+                </div>
+            </div>
         </div>
     </div>
 </div>
@@ -29,4 +32,5 @@
     const cType = JSON.parse('<%- JSON.stringify(categoryType) %>');
     let tenders = JSON.parse('<%- JSON.stringify(tenderData) %>');
 </script>
-<script src="/public/js/category.js"></script>
+<script src="/public/js/category.js"></script>
+<script>autoFlashHeight();</script>

app/view/setting/category_modal.ejs

@@ -10,11 +10,11 @@
                     <label>类别名称</label>
                     <input class="form-control form-control-sm"  placeholder="请使用简短的名称" type="text" name="name">
                 </div>
-                <div class="form-group">
-                    <label>类型</label>
-                    <div name="type">
-                    </div>
-                </div>
+                <!--<div class="form-group">-->
+                    <!--<label>类型</label>-->
+                    <!--<div name="type">-->
+                    <!--</div>-->
+                <!--</div>-->
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
@@ -35,11 +35,11 @@
                     <label>类别名称</label>
                     <input class="form-control form-control-sm"  placeholder="请使用简短的名称" value="年份" type="text" name="name">
                 </div>
-                <div class="form-group">
-                    <label>类型</label>
-                    <div name="type">
-                    </div>
-                </div>
+                <!--<div class="form-group">-->
+                    <!--<label>类型</label>-->
+                    <!--<div name="type">-->
+                    <!--</div>-->
+                <!--</div>-->
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
@@ -120,4 +120,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

app/view/setting/info.ejs

@@ -9,40 +9,42 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
-            <div class="row">
-                <div class="col-5">
-                    <% if (projectData.user_account === ctx.session.sessionUser.account) { %><form id="info-form" action="/<%= ctx.controllerName %>/updateinfo/<%= projectData.id === undefined ? 0 : projectData.id %>?_csrf=<%= ctx.csrf %>" method="post"><% } %>
-                        <div class="form-group">
-                            <label>项目编号</label>
-                            <input class="form-control form-control-sm" value="<%= projectData.code%>" type="text" readonly>
-                        </div>
-                        <div class="form-group">
-                            <label>项目名称</label>
-                            <input class="form-control form-control-sm" value="<%= projectData.name%>" type="text" <% if (projectData.user_account !== ctx.session.sessionUser.account) { %>readonly<% } else { %>name="name" id="name" placeholder="请输入项目名称"<% } %>>
-                        </div>
-                        <div class="form-group">
-                            <label>管理员</label>
-                            <input class="form-control form-control-sm" value="<%= projectData.user_account %>" type="text" readonly>
-                        </div>
-                        <div class="form-group">
-                            <label>负责人</label>
-                            <div class="card w-50">
-                                <div class="card-body">
-                                    <h4 class="card-title"><%= salesmanData.username %></h4>
-                                    <h6 class="card-subtitle mb-2 text-muted" ><%= officeName%></h6>
+            <div class="sjs-height-0">
+                <div class="row m-0 mt-3">
+                    <div class="col-5">
+                        <% if (projectData.user_account === ctx.session.sessionUser.account) { %><form id="info-form" action="/<%= ctx.controllerName %>/updateinfo/<%= projectData.id === undefined ? 0 : projectData.id %>?_csrf=<%= ctx.csrf %>" method="post"><% } %>
+                            <div class="form-group">
+                                <label>项目编号</label>
+                                <input class="form-control form-control-sm" value="<%= projectData.code%>" type="text" readonly>
+                            </div>
+                            <div class="form-group">
+                                <label>项目名称</label>
+                                <input class="form-control form-control-sm" value="<%= projectData.name%>" type="text" <% if (projectData.user_account !== ctx.session.sessionUser.account) { %>readonly<% } else { %>name="name" id="name" placeholder="请输入项目名称"<% } %>>
+                            </div>
+                            <div class="form-group">
+                                <label>管理员</label>
+                                <input class="form-control form-control-sm" value="<%= projectData.user_account %>" type="text" readonly>
+                            </div>
+                            <div class="form-group">
+                                <label>负责人</label>
+                                <div class="card w-50">
+                                    <div class="card-body">
+                                        <h4 class="card-title"><%= salesmanData.username %></h4>
+                                        <h6 class="card-subtitle mb-2 text-muted" ><%= officeName%></h6>
+                                    </div>
+                                    <ul class="list-group list-group-flush">
+                                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="腾讯QQ"><i class="fa fa-qq"></i> <%=salesmanData.qq%></li>
+                                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="手机号码"><i class="fa fa-tablet"></i> <%=salesmanData.telephone%></li>
+                                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="固定电话"><i class="fa fa-phone"></i> <%=salesmanData.fixedphone%></li>
+                                    </ul>
                                 </div>
-                                <ul class="list-group list-group-flush">
-                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="腾讯QQ"><i class="fa fa-qq"></i> <%=salesmanData.qq%></li>
-                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="手机号码"><i class="fa fa-tablet"></i> <%=salesmanData.telephone%></li>
-                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="固定电话"><i class="fa fa-phone"></i> <%=salesmanData.fixedphone%></li>
-                                </ul>
                             </div>
-                        </div>
-                        <div class="form-group">
-                            <label>创建时间</label>
-                            <input class="form-control form-control-sm" value=<%= dateStr%> type="text" readonly>
-                        </div>
-                        <% if (projectData.user_account === ctx.session.sessionUser.account) { %></form><% } %>
+                            <div class="form-group">
+                                <label>创建时间</label>
+                                <input class="form-control form-control-sm" value=<%= dateStr%> type="text" readonly>
+                            </div>
+                            <% if (projectData.user_account === ctx.session.sessionUser.account) { %></form><% } %>
+                    </div>
                 </div>
             </div>
         </div>
@@ -50,6 +52,7 @@
 </div>
 <% if (projectData.user_account === ctx.session.sessionUser.account) { %>
 <script type="text/javascript">
+    autoFlashHeight();
     function updateinfo()
     {
         $("#info-form").submit();

app/view/setting/user.ejs

@@ -13,48 +13,51 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
-            <nav class="nav nav-tabs mb-3" role="tablist">
-                <a class="nav-item nav-link active" href="/setting/user">账号列表</a>
-                <a class="nav-item nav-link" href="/setting/user/permission/set">账号权限</a>
-            </nav>
-            <div class="tab-content">
-                <div id="user-list" class="tab-pane active">
-                    <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></tr>
-                        </thead>
-                        <tbody>
-                        <% for (const account of accountData) { %>
-                        <tr <% if (account.enable !== 1) { %> class="table-danger"<% } %>>
-                            <td><%= account.account %><% if (account.is_admin === 1) { %> <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="管理员"><i class="fa fa-user-circle-o"></i></span><% } %></td>
-                            <td><%= account.name %></td>
-                            <td><%= account.company %></td>
-                            <td><%= account.role %></td>
-                            <td><%= account.mobile %></td>
-                            <td><%= account.telephone %></td>
-                            <td class="text-center"><a href="#edit-user" data-account="<%= JSON.stringify(account) %>" data-toggle="modal" data-target="#edit-user" class="btn btn-sm btn-outline-primary">编辑</a>
-                                <% if (account.is_admin !== 1) { %>
-                                    <% if (account.enable !== 1) { %>
-                                        <a href="" class="btn btn-sm btn-outline-success account-switch-btn" data-account="<%= account.id %>">启用</a>
-                                    <% } else { %>
-                                        <a href="" class="btn btn-sm btn-outline-danger account-switch-btn" data-account="<%= account.id %>">停用</a>
-                                    <% } %>
-                                <% } %>
-                            </td>
-                        </tr>
-                        <% } %>
-                        </tbody>
-                    </table>
+            <div class="sjs-height-0">
+                <nav class="nav nav-tabs m-3" role="tablist">
+                    <a class="nav-item nav-link active" href="/setting/user">账号列表</a>
+                    <a class="nav-item nav-link" href="/setting/user/permission/set">账号权限</a>
+                </nav>
+                <div class="tab-content m-3">
+                    <div id="user-list" class="tab-pane active">
+                        <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></tr>
+                            </thead>
+                            <tbody>
+                            <% for (const account of accountData) { %>
+                                <tr <% if (account.enable !== 1) { %> class="table-danger"<% } %>>
+                                    <td><%= account.account %><% if (account.is_admin === 1) { %> <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="管理员"><i class="fa fa-user-circle-o"></i></span><% } %></td>
+                                    <td><%= account.name %></td>
+                                    <td><%= account.company %></td>
+                                    <td><%= account.role %></td>
+                                    <td><%= account.mobile %></td>
+                                    <td><%= account.telephone %></td>
+                                    <td class="text-center"><a href="#edit-user" data-account="<%= JSON.stringify(account) %>" data-toggle="modal" data-target="#edit-user" class="btn btn-sm btn-outline-primary">编辑</a>
+                                        <% if (account.is_admin !== 1) { %>
+                                            <% if (account.enable !== 1) { %>
+                                                <a href="" class="btn btn-sm btn-outline-success account-switch-btn" data-account="<%= account.id %>">启用</a>
+                                            <% } else { %>
+                                                <a href="" class="btn btn-sm btn-outline-danger account-switch-btn" data-account="<%= account.id %>">停用</a>
+                                            <% } %>
+                                        <% } %>
+                                    </td>
+                                </tr>
+                            <% } %>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <script src="/public/js/setting.js"></script>
+<script>autoFlashHeight();</script>

app/view/setting/user_permission.ejs

@@ -13,46 +13,49 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
-            <nav class="nav nav-tabs mb-3" role="tablist">
-                <a class="nav-item nav-link" href="/setting/user">账号列表</a>
-                <a class="nav-item nav-link active" href="/setting/user/permission/set">账号权限</a>
-            </nav>
-            <div class="tab-content">
-                <div id="user-purview" class="tab-pane active">
-                    <table class="table table-hover table-bordered table-sm">
-                        <thead>
-                        <tr>
-                            <th>账号</th>
-                            <th>姓名</th>
-                            <th>单位</th>
-                            <th>角色/职位</th>
-                            <th>协作办公</th>
-                            <th>权限</th>
-                        </thead>
-                        <tbody>
-                        <% for (const account of accountData) { %>
-                        <tr>
-                            <td><%= account.account %><% if (account.is_admin === 1) { %> <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="管理员"><i class="fa fa-user-circle-o"></i></span><% } %></td>
-                            <td><%= account.name %></td>
-                            <td><%= account.company %></td>
-                            <td><%= account.role %></td>
-                            <td><% if (account.cooperation === 1) { %>启用<% } %></td>
-                            <td><% if (account.permission !== '' && account.permission !== null && JSON.parse(account.permission).tender !== undefined) { %>
-                                <% const tenderPermission = JSON.parse(account.permission).tender; %>
-                                    <% for (const tc in permission.tender.children) { %>
-                                        <% if (tenderPermission.indexOf(permission.tender.children[tc].value.toString()) !== -1) { %>
-                                            <%= permission.tender.children[tc].title %>
+            <div class="sjs-height-0">
+                <nav class="nav nav-tabs m-3" role="tablist">
+                    <a class="nav-item nav-link" href="/setting/user">账号列表</a>
+                    <a class="nav-item nav-link active" href="/setting/user/permission/set">账号权限</a>
+                </nav>
+                <div class="tab-content m-3">
+                    <div id="user-purview" class="tab-pane active">
+                        <table class="table table-hover table-bordered table-sm">
+                            <thead>
+                            <tr>
+                                <th>账号</th>
+                                <th>姓名</th>
+                                <th>单位</th>
+                                <th>角色/职位</th>
+                                <th>协作办公</th>
+                                <th>权限</th>
+                            </thead>
+                            <tbody>
+                            <% for (const account of accountData) { %>
+                                <tr>
+                                    <td><%= account.account %><% if (account.is_admin === 1) { %> <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="管理员"><i class="fa fa-user-circle-o"></i></span><% } %></td>
+                                    <td><%= account.name %></td>
+                                    <td><%= account.company %></td>
+                                    <td><%= account.role %></td>
+                                    <td><% if (account.cooperation === 1) { %>启用<% } %></td>
+                                    <td><% if (account.permission !== '' && account.permission !== null && JSON.parse(account.permission).tender !== undefined) { %>
+                                            <% const tenderPermission = JSON.parse(account.permission).tender; %>
+                                            <% for (const tc in permission.tender.children) { %>
+                                                <% if (tenderPermission.indexOf(permission.tender.children[tc].value.toString()) !== -1) { %>
+                                                    <%= permission.tender.children[tc].title %>
+                                                <% } %>
+                                            <% } %>
                                         <% } %>
-                                    <% } %>
-                                <% } %>
-                                    <a href="#edit-user2" data-account="<%= JSON.stringify(account) %>" data-toggle="modal" data-target="#edit-user2" class="btn btn-sm btn-outline-primary pull-right">编辑</a></td>
-                        </tr>
-                        <% } %>
-                        </tbody>
-                    </table>
+                                        <a href="#edit-user2" data-account="<%= JSON.stringify(account) %>" data-toggle="modal" data-target="#edit-user2" class="btn btn-sm btn-outline-primary pull-right">编辑</a></td>
+                                </tr>
+                            <% } %>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <script src="/public/js/setting.js"></script>
+<script>autoFlashHeight();</script>