1

application/admin/controller/Report.php

@@ -389,7 +389,12 @@ class Report extends Base
             $where = [];
             //用户名称
             if (strlen($param['searchText'])) {
-                $where['user_account|user_name|user_job_number'] = array('like', '%' . $param['searchText'] . '%');
+                if($param['user'] == 'user_account'){
+                    $where['user_account'] = array('like', '%' . $param['searchText'] . '%');
+                }
+                if($param['user'] == 'user_name'){
+                    $where['user_name'] = array('like', '%' . $param['searchText'] . '%');
+                }
             }
             if (strlen($param['start']) && strlen($param['end']) && $param['start'] <= $param['end']) {
                 $start = strtotime($param['start']);

application/admin/controller/System.php

@@ -372,11 +372,11 @@ class System extends Base
                 var_dump($res);*/
                 $this->matching("#[哈哈]/","#\[","\]\/");
                 //$this->getFacesIcon();
-                $html = $html . '<div style="margin-top:15px;width: 30%;"><div>'.$chat[$i]['from_name'].'&nbsp&nbsp&nbsp'.$chat[$i]['time_line'].'</div>';
-                $html = $html . '<p style="margin-top:5px;" class="form-content">'.$content['content'].'</p></div>';
+                $html = $html . '<div style="margin-top:15px;width:75%"><div>'.$chat[$i]['from_name'].'&nbsp&nbsp&nbsp'.$chat[$i]['time_line'].'</div>';
+                $html = $html . '<div style="margin-top:5px;display:inline-block;*display:inline;*zoom:1;" class="form-content">'.$content['content'].'</div></div>';
             }else{
-                $html = $html . '<div style="margin-top:15px;width: 30%;margin-left:70%;text-align:right;"><div>'.$chat[$i]['from_name'].'&nbsp&nbsp&nbsp'.$chat[$i]['time_line'].'</div>';
-                $html = $html . '<p style="margin-top:5px;" class="form-content">'.$content['content'].'</p></div>';
+                $html = $html . '<div style="margin-top:15px;width:75%;margin-left:25%;text-align:right;"><div>'.$chat[$i]['from_name'].'&nbsp&nbsp&nbsp'.$chat[$i]['time_line'].'</div>';
+                $html = $html . '<div style="margin-top:5px;display:inline-block;*display:inline;*zoom:1;" class="form-content">'.$content['content'].'</div></div>';
             }
 
         }

application/admin/view/report/workreport.html

@@ -29,7 +29,16 @@
                         <input type="text" class="form-control" id="end" value="<?php echo date('Y-m-d',time()-86400);?>" style="width: 100px;">
                     </div>
                     <div class="form-group">
-                        <label>客服：</label>
+                        <div class="input-group col-sm-4 layui-form" style="width: 70px;">
+                            <input type="hidden" id="user" value="user_account"/>
+                            <select lay-verify="required" lay-filter="user">
+                                <option value="user_account">账号</option>
+                                <option value="user_name">名称</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <!--<label>客服：</label>-->
                         <input type="text" class="form-control" id="username" name="user_name">
                     </div>
                     <div class="form-group">
@@ -89,6 +98,11 @@
             $("#message_status").val(value.value);
             onSearch()
         });
+
+        form.on('select(user)', function(value){
+            $("#user").val(value.value);
+            onSearch()
+        });
     });
 
 </script>
@@ -118,7 +132,8 @@
                     pageSize: params.pageSize,
                     searchText:$('#username').val(),
                     start:$('#start').val(),
-                    end:$('#end').val()
+                    end:$('#end').val(),
+                    user:$('#user').val()
                 };
                 return param;
             },