zhanglinxin пре 1 година
родитељ
комит
df1efe6653

+ 19 - 8
application/user/controller/Department.php

@@ -17,7 +17,7 @@ namespace app\user\controller;
 
 use app\common\constant\CommonConstant;
 use library\Controller;
-use app\extend\fast\Tree;
+use library\tools\Data;
 
 /**
  * 部门
@@ -42,13 +42,24 @@ class Department extends Controller
     public function index()
     {
         $this->title = '部门列表';
-        $query = $this->_query($this->table)->where('is_deleted',CommonConstant::IS_DELETED_0)->field('dept_id as id,name,parent_id');
-        $result = $query->dateBetween('create_at')->order('id asc')->page(false,false);
-
-        $tree = Tree::instance();
-        $tree->init($result['list'], 'parent_id');
-        $list = $tree->getTreeList($tree->getTreeArray(0), 'name');
-//        p($list);exit;
+        $query = $this->_query($this->table)
+            ->where('is_deleted',CommonConstant::IS_DELETED_0)
+            ->field('dept_id as id,name,parent_id as pid');
+        $result = $query->page(false,false);
+        $list = $result['list'];
         return $this->fetch('', compact("list"));
     }
+
+    /**
+     * 列表数据处理
+     * @param array $data
+     * @throws \Exception
+     */
+    protected function _index_page_filter(&$data)
+    {
+        foreach ($data as &$vo) {
+            $vo['ids'] = join(',', Data::getArrSubIds($data, $vo['id']));
+        }
+        $data = Data::arr2table($data);
+    }
 }

+ 5 - 6
application/user/controller/Member.php

@@ -17,7 +17,6 @@ namespace app\user\controller;
 
 use app\common\constant\CommonConstant;
 use library\Controller;
-use think\Db;
 
 /**
  * 用户
@@ -46,12 +45,11 @@ class Member extends Controller
         $this->title = '用户列表';
         $query = $this->_query($this->table)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
-            ->when(array_key_exists($status,$this->get_status_list), function ($query) use ($status) {
+            ->when(array_key_exists($status, $this->get_status_list), function ($query) use ($status) {
                 $query->where('status', $status);
             })
             ->like('name,mobile');
-        $query->dateBetween('create_at')->order('id asc')->page();
-
+        $query->page();
     }
 
     /**
@@ -93,7 +91,8 @@ class Member extends Controller
      */
     public function resume()
     {
-        $this->_save($this->table);
+        $this->applyCsrfToken();
+        $this->_save($this->table, ['status' => CommonConstant::STATUS_NORMAL]);
     }
 
     /**
@@ -104,7 +103,7 @@ class Member extends Controller
      */
     public function forbid()
     {
-        $this->_save($this->table);
+        $this->_save($this->table, ['status' => CommonConstant::STATUS_FROZEN]);
     }
 
 }

+ 1 - 1
application/user/view/department/index.html

@@ -16,7 +16,7 @@
         {foreach $list as $key=>$vo}
         <tr>
             <td class='text-left'>{$vo.id|default='--'}</td>
-            <td class='text-left'>{$vo.name|default='--'}</td>
+            <td class="text-left"><span class="color-desc">{$vo.spl|raw}</span>{$vo.name|default='--'}</td>
         </tr>
         {/foreach}
         </tbody>

+ 27 - 8
application/user/view/member/index.html

@@ -1,5 +1,17 @@
 {extend name='admin@main'}
 
+{block name="button"}
+
+{if auth("resume")}
+<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要批量启用吗?" data-action='{:url("resume")}' data-csrf="{:systoken('resume')}" data-rule="id#{key}">批量启用</button>
+{/if}
+
+{if auth("forbid")}
+<button class="layui-btn layui-btn-xs layui-btn-primary" data-confirm="确定要批量禁用吗?" data-action="{:url('forbid')}" data-csrf="{:systoken('forbid')}" data-rule="id#{key}">批量禁用</button>
+{/if}
+
+{/block}
+
 {block name="content"}
 <div class="think-box-shadow">
     {include file='member/index_search'}
@@ -7,6 +19,12 @@
         {notempty name='list'}
         <thead>
         <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
+            </th>
+            <th class='list-table-sort-td'>
+                <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
+            </th>
             <th class='text-left nowrap'>头像地址</th>
             <th class='text-left nowrap'>用户姓名</th>
             <th class='text-left nowrap'>昵称</th>
@@ -21,10 +39,13 @@
         <tbody>
         {foreach $list as $key=>$vo}
         <tr>
+            <td class='list-table-check-td think-checkbox'>
+                <input class="list-check-box" value='{$vo.id}' type='checkbox'>
+            </td>
+            <td class='text-left nowrap'></td>
             <td class='text-left nowrap'>
                 {notempty name='vo.avatar'}
-                <img data-tips-image style="width:25px;height:25px;vertical-align:top" src="{$vo.avatar|default=''}"
-                     class="margin-right-5">
+                <img data-tips-image style="width:25px;height:25px;vertical-align:top" src="{$vo.avatar|default=''}" class="margin-right-5">
                 {/notempty}
             </td>
             <td class='text-left nowrap'>
@@ -34,22 +55,20 @@
             <td class='text-left'>{$vo.mobile|default='--'}</td>
             <td class='text-left'>{$vo.title|default='--'}</td>
             <td class='text-left'>
-                {eq name='vo.status' value='0'}<strong class="color-red">已禁用</strong>{else}<strong class="color-green">正常
-            </strong>{/eq}
-<!--                {$get_status_list[$vo.status]|default='&#45;&#45;'}-->
+                {eq name='vo.status' value='0'}<strong class="color-red">已禁用</strong>{else}<strong class="color-green">正常</strong>{/eq}
             </td>
 <!--            <td class='text-left'>{$vo.department|default='&#45;&#45;'}</td>-->
             <td class='text-center nowrap'>
                 {if $vo.status eq 1 and auth("forbid")}
-                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0">禁 用</a>
+                <a class="layui-btn layui-btn-xs layui-btn-warm" data-confirm="确定要禁用该账号吗?" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('forbid')}">禁 用</a>
                 {elseif auth("resume")}
-                <a class="layui-btn layui-btn-sm layui-bg-blue" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1">启 用</a>
+                <a class="layui-btn layui-btn-xs layui-bg-blue" data-confirm="确定要启用该账号吗?" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('resume')}">启 用</a>
                 {/if}
             </td>
         </tr>
         {/foreach}
         </tbody>
     </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+    {empty name='list'}<span class="notdata">没    </span>{else}{$pagehtml|raw|default=''}{/empty}
 </div>
 {/block}