重建用户

application/admin/command/Crud.php

@@ -100,7 +100,7 @@ class Crud extends Command
         'category',
         'ems',
         'sms',
-        'user',
+//        'user',
         'user_group',
         'user_rule',
         'user_score_log',

application/admin/controller/Dashboard.php

@@ -57,7 +57,7 @@ class Dashboard extends Backend
             'totaluser'         => User::count(),
             'totaladdon'        => $totaladdon,
             'totaladmin'        => Admin::count(),
-            'totalcategory'     => \app\common\model\Category::count(),
+            'totalcategory'     => 4,
             'todayusersignup'   => User::whereTime('jointime', 'today')->count(),
             'todayuserlogin'    => User::whereTime('logintime', 'today')->count(),
             'sevendau'          => User::whereTime('jointime|logintime|prevtime', '-7 days')->count(),

application/admin/controller/user/User.php

@@ -3,9 +3,7 @@
 namespace app\admin\controller\user;
 
 use app\common\controller\Backend;
-use app\common\model\Usergangwei;
-use app\common\model\Userjigou;
-use fast\Tree;
+
 /**
  * 用户管理
  *
@@ -26,18 +24,6 @@ class User extends Backend
         $this->model = new \app\admin\model\User;
         $this->view->assign("genderList", $this->model->getGenderList());
         $this->view->assign("statusList", $this->model->getStatusList());
-        $this->view->assign("idcardStatusList", $this->model->getIdcardStatusList());
-
-        //岗位
-        $tree = Tree::instance();
-        $tree->init(Usergangwei::getCategoryArray(), 'pid');
-        $gangweilist = $tree->getTreeList($tree->getTreeArray(0), 'name');
-        $this->view->assign("gangweilist", $gangweilist);
-        //机构
-        $tree2 = Tree::instance();
-        $tree2->init(Userjigou::getCategoryArray(), 'pid');
-        $jigoulist = $tree2->getTreeList($tree2->getTreeArray(0), 'name');
-        $this->view->assign("jigoulist", $jigoulist);
     }
 
 
@@ -49,39 +35,4 @@ class User extends Backend
      */
 
 
-    /**
-     * 查看
-     */
-    public function index()
-    {
-        //当前是否为关联查询
-        $this->relationSearch = true;
-        //设置过滤方法
-        $this->request->filter(['strip_tags', 'trim']);
-        if ($this->request->isAjax()) {
-            //如果发送的来源是Selectpage，则转发到Selectpage
-            if ($this->request->request('keyField')) {
-                return $this->selectpage();
-            }
-            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
-            $list = $this->model
-                    ->with(['gangwei','jigou'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->paginate($limit);
-
-            foreach ($list as $row) {
-                
-                $row->getRelation('gangwei')->visible(['name']);
-				$row->getRelation('jigou')->visible(['name']);
-            }
-
-            $result = array("total" => $list->total(), "rows" => $list->items());
-
-            return json($result);
-        }
-        return $this->view->fetch();
-    }
-
 }

application/admin/lang/zh-cn/user/user.php

@@ -1,37 +1,27 @@
 <?php
 
 return [
-    'Id'               => 'ID',
-    'Gangwei_id'       => '岗位ID',
-    'Jigou_id'         => '机构ID',
-    'Username'         => '用户名',
-    'Nickname'         => '昵称',
-    'Mobile'           => '手机号',
-    'Avatar'           => '头像',
-    'Gender'           => '性别',
-    'Gender 1'         => '男',
-    'Gender 0'         => '女',
-    'Prevtime'         => '上次登录时间',
-    'Logintime'        => '登录时间',
-    'Loginip'          => '登录IP',
-    'Joinip'           => '加入IP',
-    'Jointime'         => '加入时间',
-    'Createtime'       => '创建时间',
-    'Updatetime'       => '更新时间',
-    'Token'            => 'Token',
-    'Status'           => '状态',
-    'Status 1'         => '正常',
-    'Set status to 1'  => '设为正常',
-    'Status 0'         => '禁用',
-    'Set status to 0'  => '设为禁用',
-    'Status -1'        => '注销',
-    'Set status to -1' => '设为注销',
-    'Idcard_status'    => '实名认证',
-    'Idcard_status -1' => '未申请',
-    'Idcard_status 0'  => '待审核',
-    'Idcard_status 1'  => '审核通过',
-    'Idcard_status 2'  => '审核驳回',
-    'Mini_openid'      => '微信小程序openid',
-    'Gangwei.name'     => '岗位',
-    'Jigou.name'       => '机构'
+    'Id'         => 'ID',
+    'Username'   => '用户名',
+    'Nickname'   => '昵称',
+    'Mobile'     => '手机号',
+    'Avatar'     => '头像',
+    'Gender'     => '性别',
+    'Gender 1'   => '男',
+    'Gender 0'   => '女',
+    'Prevtime'   => '上次登录时间',
+    'Logintime'  => '登录时间',
+    'Loginip'    => '登录IP',
+    'Joinip'     => '加入IP',
+    'Jointime'   => '加入时间',
+    'Createtime' => '创建时间',
+    'Updatetime' => '更新时间',
+    'Token'      => 'Token',
+    'Status'     => '状态',
+    'Status 1'   => '正常',
+    'Set status to 1'=> '设为正常',
+    'Status 0'   => '禁用',
+    'Set status to 0'=> '设为禁用',
+    'Status -1'  => '注销',
+    'Set status to -1'=> '设为注销'
 ];

application/admin/model/User.php

@@ -3,8 +3,8 @@
 namespace app\admin\model;
 
 use think\Model;
-use think\Db;
-use fast\Tree;
+
+
 class User extends Model
 {
 
@@ -29,8 +29,7 @@ class User extends Model
         'prevtime_text',
         'logintime_text',
         'jointime_text',
-        'status_text',
-        'idcard_status_text'
+        'status_text'
     ];
     
 
@@ -45,11 +44,6 @@ class User extends Model
         return ['1' => __('Status 1'), '0' => __('Status 0'), '-1' => __('Status -1')];
     }
 
-    public function getIdcardStatusList()
-    {
-        return ['-1' => __('Idcard_status -1'), '0' => __('Idcard_status 0'), '1' => __('Idcard_status 1'), '2' => __('Idcard_status 2')];
-    }
-
 
     public function getGenderTextAttr($value, $data)
     {
@@ -87,14 +81,6 @@ class User extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
-
-    public function getIdcardStatusTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['idcard_status']) ? $data['idcard_status'] : '');
-        $list = $this->getIdcardStatusList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-
     protected function setPrevtimeAttr($value)
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
@@ -111,60 +97,4 @@ class User extends Model
     }
 
 
-    public function gangwei()
-    {
-        return $this->belongsTo('app\admin\model\user\Gangwei', 'gangwei_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
-
-
-    public function jigou()
-    {
-        return $this->belongsTo('app\admin\model\user\Jigou', 'jigou_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
-
-    public static function getTreeList($selected = [])
-    {
-        //用户列表，重置id，防止和岗位表的id重复
-        $userlist = Db::name('user')->field('id,gangwei_id as pid,nickname as name')->select();
-        foreach($userlist as $key => $user){
-            $userlist[$key]['id'] = 'u_'.$user['id'];
-            $userlist[$key]['spacer'] = '';
-            $userlist[$key]['haschild'] = 0;
-        }
-
-        //岗位树
-        $ruleList = Db::name('user_gangwei')->field('id,pid,name')->select();
-        Tree::instance()->init($ruleList);
-        Tree::instance()->icon = ['','',''];
-        Tree::instance()->nbsp = '';
-        $ruleList = Tree::instance()->getTreeList(Tree::instance()->getTreeArray(0), 'name');
-
-        //修改haschild
-        //拿到hasChildrens
-        $hasChildrens = [];
-        foreach ($ruleList as $k => $v)
-        {
-            foreach($userlist as $key => $user){
-                if($user['pid'] == $v['id']){
-                    $v['haschild'] = 1;
-                }
-            }
-            $ruleList[$k] = $v;
-
-            if ($v['haschild']){
-                $hasChildrens[] = $v['id'];
-            }
-        }
-
-        //合并
-        $ruleList = array_merge($ruleList,$userlist);
-
-        //最终数据
-        $nodeList = [];
-        foreach ($ruleList as $k => $v) {
-            $state = array('selected' => in_array($v['id'], $selected) && !in_array($v['id'], $hasChildrens));
-            $nodeList[] = array('id' => $v['id'], 'parent' => $v['pid'] ? $v['pid'] : '#', 'text' => $v['name'], 'type' => 'menu', 'state' => $state);
-        }
-        return $nodeList;
-    }
 }

application/admin/view/user/user/add.html

@@ -1,18 +1,6 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gangwei_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gangwei_id" min="0" data-rule="required" data-source="usergangwei/selectpage" data-multiple="true" data-params='{"isTree":true}' class="form-control selectpage" name="row[gangwei_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jigou_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-jigou_id" data-rule="required" data-source="user/jigou/index" class="form-control selectpage" name="row[jigou_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-username" class="form-control" name="row[username]" type="text" value="">
@@ -104,24 +92,6 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="idcardStatusList" item="vo"}
-            <label for="row[idcard_status]-{$key}"><input id="row[idcard_status]-{$key}" name="row[idcard_status]" type="radio" value="{$key}" {in name="key" value="-1"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Mini_openid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-mini_openid" class="form-control" name="row[mini_openid]" type="text" value="">
-        </div>
-    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/user/user/edit.html

@@ -1,33 +1,9 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gangwei_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <!--<input id="c-gangwei_id" min="0" data-rule="required" data-source="usergangwei/selectpage" class="form-control selectpage" name="row[gangwei_id]" type="text" value="{$row.gangwei_id|htmlentities}">-->
-            <select id="c-gangwei_id" data-rule="required" class="form-control selectpicker" name="row[gangwei_id]">
-                <option value="0" selected>无</option>
-                {foreach name="gangweilist" item="vo"}
-                <option value="{$vo.id}" {eq name="vo.id" value="$row.gangwei_id"}selected{/eq}>{$vo.name}</option>
-                {/foreach}
-            </select>
-        </div>
-    </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jigou_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            &lt;!&ndash;<input id="c-jigou_id" data-rule="required" data-source="userjigou/selectpage" class="form-control selectpage" name="row[jigou_id]" type="text" value="{$row.jigou_id|htmlentities}">&ndash;&gt;
-            <select id="c-jigou_id" data-rule="required" class="form-control selectpicker" name="row[jigou_id]">
-                <option value="0" selected>无</option>
-                {foreach name="jigoulist" item="vo"}
-                <option value="{$vo.id}" {eq name="vo.id" value="$row.jigou_id"}selected{/eq}>{$vo.name}</option>
-                {/foreach}
-            </select>
-        </div>
-    </div>-->
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-username" disabled class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
+            <input id="c-username" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -56,7 +32,7 @@
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </div>
     </div>
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -103,7 +79,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-token" class="form-control" name="row[token]" type="text" value="{$row.token|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -116,24 +92,6 @@
 
         </div>
     </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="idcardStatusList" item="vo"}
-            <label for="row[idcard_status]-{$key}"><input id="row[idcard_status]-{$key}" name="row[idcard_status]" type="radio" value="{$key}" {in name="key" value="$row.idcard_status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Mini_openid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-mini_openid" class="form-control" name="row[mini_openid]" type="text" value="{$row.mini_openid|htmlentities}">
-        </div>
-    </div>-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/user/user/index.html

@@ -17,11 +17,11 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
--->
+
                         <div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">

public/assets/js/backend/user/user.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'user/user/index' + location.search,
                     add_url: 'user/user/add',
                     edit_url: 'user/user/edit',
-//                    del_url: 'user/user/del',
+                    del_url: 'user/user/del',
                     multi_url: 'user/user/multi',
                     import_url: 'user/user/import',
                     table: 'user',
@@ -17,16 +17,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             var table = $("#table");
 
-            //在普通搜索渲染后
-            table.on('post-common-search.bs.table', function (event, table) {
-                var form = $("form", table.$commonsearch);
-                $("input[name='gangwei_id']", form).addClass("selectpage").data("source", "usergangwei/selectpage").data('params',{"isTree":true}).data("primaryKey", "id").data("field", "name").data("orderBy", "weigh desc");
-                $("input[name='jigou_id']", form).addClass("selectpage").data("source", "userjigou/selectpage").data('params',{"isTree":true}).data("primaryKey", "id").data("field", "name").data("orderBy", "weigh desc");
-
-                Form.events.cxselect(form);
-                Form.events.selectpage(form);
-            });
-
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -34,34 +24,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
-                search:false,    //搜索id
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'gangwei_id', title: __('Gangwei_id')},
-                        {field: 'gangwei.name', title: __('Gangwei.name'), operate: false},
-//                        {field: 'jigou_id', title: __('Jigou_id')},
-//                        {field: 'jigou.name', title: __('Jigou.name'), operate: false},
                         {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
                         {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'nickname_time', title: '修改昵称时间', operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'gender', title: __('Gender'), searchList: {"1":__('Gender 1'),"0":__('Gender 0')}, formatter: Table.api.formatter.normal},
-//                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
-//                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
-//                        {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'gender', title: __('Gender'), searchList: {"1":__('Gender 1'),"0":__('Gender 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
+                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
+                        {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'token', title: __('Token'), operate: 'LIKE'},
+                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'token', title: __('Token'), operate: 'LIKE'},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
-                        {field: 'idcard_status', title: __('Idcard_status'), searchList: {"-1":__('Idcard_status -1'),"0":__('Idcard_status 0'),"1":__('Idcard_status 1'),"2":__('Idcard_status 2')}, formatter: Table.api.formatter.status},
-//                        {field: 'mini_openid', title: __('Mini_openid'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-
-
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]