1

application/admin/controller/Users.php

@@ -17,7 +17,11 @@ class Users extends Base
             $offset = (($param['pageNumber'] - 1) * $limit);
             $where = [];
             if (empty($param['searchText']) === false) {
-                $where['user_name'] = $param['searchText'];
+                $where['user_account|user_name|user_job_number|fullname'] = ['like', '%' . $param['searchText'] . '%'];
+            }
+            //客服组
+            if ($param['group_id'] != '' && $param['group_id'] != 0) {
+                $where['group_id'] = $param['group_id'];
             }
             $result = db('users')->where($where)->limit($offset, $limit)->order('id', 'desc')->select();
             foreach($result as $key=>$vo){
@@ -56,6 +60,19 @@ class Users extends Base
 
         }
 
+        //所有客服组
+        $users = db('groups')->select();
+        if(!empty($users)){
+            $option = '<option value="0">所有客服组</option>';
+            for($i=0;$i<count($users);$i++){
+                $option = $option.'<option value="'.$users[$i]['id'].'">'.$users[$i]['name'].'</option>';
+            }
+            $groupsoption = '<select lay-verify="required" lay-filter="group">'.$option.'</select>';
+        }
+        $this->assign([
+            'groupsoption' => $groupsoption
+        ]);
+
         return $this->fetch();
     }
 
@@ -98,7 +115,7 @@ class Users extends Base
                 return json(['code' => -5, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
-            return json(['code' => 1, 'data' => '', 'msg' => '添加客服成功']);
+            return json(['code' => 1, 'data' => 'users/index', 'msg' => '添加客服成功']);
         }
 
         $this->assign([
@@ -131,7 +148,7 @@ class Users extends Base
             }catch(\Exception $e){
                 return json(['code' => -6, 'data' => '', 'msg' => $e->getMessage()]);
             }
-            return json(['code' => 1, 'data' => '', 'msg' => '编辑客服成功']);
+            return json(['code' => 1, 'data' => 'accounts/index', 'msg' => '编辑客服成功']);
         }
         $id = input('param.id/d');
         $info = db('users')->where('id', $id)->find();

application/admin/view/messages/index.html

@@ -27,13 +27,13 @@
                         <label>留言日期：</label>
                         <input type="text" class="form-control" id="start" value="<?php echo date('Y-m-d',time()-604800);?>" style="width: 100px;"> --
                         <input type="text" class="form-control" id="end" value="<?php echo date('Y-m-d',time());?>" style="width: 100px;">
-                    </div>&nbsp;
+                    </div>
                     <div class="form-group">
                         <div class="input-group col-sm-4 layui-form" style="width: 100px;">
                             <input type="hidden" id="user_id"/>
                         {$useroption}
                         </div>
-                    </div>&nbsp;
+                    </div>
                     <div class="form-group">
                         <!--<label>留言状态：</label>-->
                         <div class="input-group col-sm-4 layui-form" style="width: 100px;">
@@ -62,7 +62,6 @@
                         {$optiontype}
                         </div>
                     </div>
-                    &nbsp;
                     <div class="form-group">
                         <label>用户名称：</label>
                         <input type="text" class="form-control" id="username" name="user_name" style="width: 100px;">

application/admin/view/users/adduser.html

@@ -23,19 +23,19 @@
                     <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('users/adduser')}">
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">客服账号：</label>
+                            <label class="col-sm-3 control-label">客服账号 <span style="color: red;">*</span>：</label>
                             <div class="input-group col-sm-4">
                                 <input id="useraccount" type="text" class="form-control" name="user_account" required="" aria-required="true">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">客服名称：</label>
+                            <label class="col-sm-3 control-label">客服名称 <span style="color: red;">*</span>：</label>
                             <div class="input-group col-sm-4">
                                 <input id="username" type="text" class="form-control" name="user_name" required="" aria-required="true">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">客服工号：</label>
+                            <label class="col-sm-3 control-label">客服工号 <span style="color: red;">*</span>：</label>
                             <div class="input-group col-sm-4">
                                 <input id="userjobnumber" type="text" class="form-control" name="user_job_number" required="" aria-required="true">
                             </div>
@@ -43,13 +43,19 @@
                         <div class="form-group">
                             <label class="col-sm-3 control-label">客服邮箱：</label>
                             <div class="input-group col-sm-4">
-                                <input id="useremail" type="text" class="form-control" name="user_email" required="" aria-required="true">
+                                <input id="useremail" type="text" class="form-control" name="user_email" aria-required="true">
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">客服电话：</label>
                             <div class="input-group col-sm-4">
-                                <input id="phone" type="text" class="form-control" name="phone" required="" aria-required="true">
+                                <input id="phone" type="text" class="form-control" name="phone" aria-required="true">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">真实姓名：</label>
+                            <div class="input-group col-sm-4">
+                                <input id="fullname" type="text" class="form-control" name="fullname" aria-required="true">
                             </div>
                         </div>
                         <div class="form-group">
@@ -59,7 +65,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">选择分组：</label>
+                            <label class="col-sm-3 control-label">选择分组 <span style="color: red;">*</span>：</label>
                             <input type="hidden" id="group_id" name="group_id"/>
                             <div class="input-group col-sm-4 layui-form">
                                 <select lay-verify="required" lay-filter="group">
@@ -73,7 +79,7 @@
                             </div>
                         </div>
                         <div class="form-group layui-form-item">
-                            <label class="col-sm-3 control-label">是否启用：</label>
+                            <label class="col-sm-3 control-label">账号状态 <span style="color: red;">*</span>：</label>
                             <div class="input-group col-sm-6">
                                 {if !empty($status)}
                                 {foreach name="status" item="vo" key="key"}
@@ -155,7 +161,7 @@
             layer.close(index);
             if(1 == res.code){
                layer.alert(res.msg, {title: '友情提示', icon: 1, closeBtn: 0}, function(){
-                   window.location.href = '/admin/index/index.html';
+                   window.location.href = '/admin/users/index.html';
                });
             }else if(111 == res.code){
                 window.location.reload();

application/admin/view/users/edituser.html

@@ -60,7 +60,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名：</label>
+                            <label class="col-sm-3 control-label">真实姓名：</label>
                             <div class="input-group col-sm-4">
                                 <input id="fullname" type="text" class="form-control" name="fullname" required="" aria-required="true" value="{$info['fullname']}" disabled="disabled">
                             </div>
@@ -86,7 +86,7 @@
                             </div>
                         </div>
                         <div class="form-group layui-form-item">
-                            <label class="col-sm-3 control-label">是否启用：</label>
+                            <label class="col-sm-3 control-label">账号状态：</label>
                             <div class="input-group col-sm-6">
                                 {if !empty($status)}
                                 {foreach name="status" item="vo" key="key"}
@@ -160,7 +160,7 @@
             layer.close(index);
             if(1 == res.code){
                layer.alert(res.msg, {title: '友情提示', icon: 1, closeBtn: 0}, function(){
-                   '/admin/index/index.html';
+                   window.location.href = '/admin/users/index.html';
                });
             }else if(111 == res.code){
                 window.location.reload();

application/admin/view/users/index.html

@@ -10,6 +10,7 @@
     <link href="__CSS__/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
     <link href="__CSS__/animate.min.css" rel="stylesheet">
     <link href="__CSS__/style.min.css?v=4.1.0" rel="stylesheet">
+    <link href="__JS__/layui/css/myLayui.css" rel="stylesheet">
 </head>
 <body class="gray-bg">
 <div class="wrapper wrapper-content animated fadeInRight">
@@ -20,14 +21,20 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/users/adduser.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新 增</strong>
+                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增客服</strong>
                 </button>
             </a>
             <!--搜索框开始-->
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
                 <div class="content clearfix m-b">
                     <div class="form-group">
-                        <label>客服名称：</label>
+                        <div class="input-group col-sm-4 layui-form" style="width: 120px;">
+                            <input type="hidden" id="group_id" value="0"/>
+                            {$groupsoption}
+                        </div>
+                    </div>&nbsp&nbsp&nbsp&nbsp&nbsp
+                    <div class="form-group">
+                        <label>客服名：</label>
                         <input type="text" class="form-control" id="username" name="user_name">
                     </div>
                     <div class="form-group">
@@ -41,14 +48,15 @@
                 <div class="example">
                     <table id="cusTable">
                         <thead>
-                        <!--<th data-field="id">客服ID</th>-->
+                        <th data-field="user_account">客服账号</th>
                         <th data-field="user_name">客服名称</th>
                         <th data-field="user_job_number">客服工号</th>
                         <th data-field="user_email">客服邮箱</th>
                         <th data-field="user_avatar">客服头像</th>
                         <th data-field="phone">客服电话</th>
+                        <th data-field="fullname">真实姓名</th>
                         <th data-field="group">所属组别</th>
-                        <th data-field="status">客服状态</th>
+                        <th data-field="status">账号状态</th>
                         <!--<th data-field="online">是否在线</th>-->
                         <th data-field="operate">操作</th>
                         </thead>
@@ -67,6 +75,20 @@
 <script src="__JS__/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
 <script src="__JS__/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
 <script src="__JS__/plugins/layer/layer.min.js"></script>
+<script src="__JS__/layui/layui.js"></script>
+<script type="text/javascript">
+
+    layui.use(['form', 'upload'], function(){
+        var form = layui.form;
+
+        form.on('select(group)', function(value){
+            $("#group_id").val(value.value);
+            onSearch()
+        });
+
+    });
+
+</script>
 <script type="text/javascript">
     function initTable() {
         //先销毁表格
@@ -90,6 +112,7 @@
                 var param = {
                     pageNumber: params.pageNumber,
                     pageSize: params.pageSize,
+                    group_id:$('#group_id').val(),
                     searchText:$('#username').val()
                 };
                 return param;

application/service/controller/Login.php

@@ -23,6 +23,10 @@ class Login extends Controller
         $user = db('users')->where('user_account', $userAccount)->find();
         if(empty($user)){
             return json(['code' => -1, 'data' => '', 'msg' => '客服不存在']);
+        }else{
+            if($user['status'] == 0){
+                return json(['code' => -3, 'data' => '', 'msg' => '此账号已禁用']);
+            }
         }
 
         if(md5($password . config('salt')) != $user['user_pwd']){