From e7f99f47eb9053406ec5c530d733295313909c80 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 15 Jun 2022 17:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Queue.php         |  2 +-
 app/admin/controller/User.php          |  2 +-
 app/admin/view/queue/index_search.html | 11 ++---------
 app/admin/view/user/index.html         | 10 +++++-----
 app/admin/view/user/index_search.html  | 11 ++---------
 5 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index ce69ded35..2d48b97f3 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -54,7 +54,7 @@ class Queue extends Controller
                 }
             }
         }, function (QueryHelper $query) {
-            $query->equal('status')->like('code,title,command');
+            $query->equal('status')->like('code|title#title,command');
             $query->timeBetween('enter_time,exec_time')->dateBetween('create_at');
         });
     }
diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index 4c64dc440..dc5243ec1 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -59,7 +59,7 @@ class User extends Controller
 
             // 数据列表搜索过滤
             $query->equal('status,usertype')->dateBetween('login_at,create_at');
-            $query->like('username,nickname,contact_phone#phone,contact_mail#mail');
+            $query->like('username|nickname#username,contact_phone#phone,contact_mail#mail');
         });
     }
 
diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html
index 6762a175a..b13f2cf2e 100644
--- a/app/admin/view/queue/index_search.html
+++ b/app/admin/view/queue/index_search.html
@@ -3,16 +3,9 @@
     <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
 
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">任务编号</label>
+            <label class="layui-form-label">编号名称</label>
             <label class="layui-input-inline">
-                <input name="code" value="{$get.code|default=''}" placeholder="请输入任务编号" class="layui-input">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">任务名称</label>
-            <label class="layui-input-inline">
-                <input name="title" value="{$get.title|default=''}" placeholder="请输入任务名称" class="layui-input">
+                <input name="title" value="{$get.title|default=''}" placeholder="请输入名称或编号" class="layui-input">
             </label>
         </div>
 
diff --git a/app/admin/view/user/index.html b/app/admin/view/user/index.html
index 94b003391..f8c7921b8 100644
--- a/app/admin/view/user/index.html
+++ b/app/admin/view/user/index.html
@@ -47,13 +47,13 @@
                         return layui.laytpl('<div class="headimg headimg-xs margin-0" data-tips-image data-tips-hover data-lazy-src="{{d.headimg}}"></div>').render(d);
                     }
                 },
-                {field: 'username', title: '登录账号', minWidth: 100, templet: '<div>{{d.username||"-"}}</div>'},
-                {field: 'nickname', title: '用户名称', minWidth: 100, templet: '<div>{{d.nickname||"-"}}</div>'},
+                {field: 'username', title: '登录账号', minWidth: 100, align: 'center', templet: '<div>{{d.username||"-"}}</div>'},
+                {field: 'nickname', title: '用户名称', minWidth: 100, align: 'center', templet: '<div>{{d.nickname||"-"}}</div>'},
                 /* {notempty name='bases'} */
                 {
-                    field: 'usertype', title: '角色身份', minWidth: 140, sort: true, templet: function (d) {
+                    field: 'usertype', title: '角色身份', minWidth: 100, align: 'center', templet: function (d) {
                         d.userinfo = d.userinfo || {};
-                        return d.userinfo.code ? (d.userinfo.name + ' ( ' + d.userinfo.code + ' ) ') : '';
+                        return d.userinfo.code ? (d.userinfo.name + ' ( ' + d.userinfo.code + ' ) ') : '-';
                     }
                 },
                 /* {/notempty} */
@@ -63,7 +63,7 @@
                 {field: 'login_num', title: '登录次数', align: 'center', minWidth: 100, sort: true},
                 {field: 'login_at', title: '最后登录', align: 'center', minWidth: 170, sort: true},
                 {field: 'create_at', title: '创建时间', align: 'center', minWidth: 170, sort: true},
-                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 160, fixed: 'right'}
+                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 150, fixed: 'right'}
             ]]
         });
 
diff --git a/app/admin/view/user/index_search.html b/app/admin/view/user/index_search.html
index 60a2a66ec..5a959411c 100644
--- a/app/admin/view/user/index_search.html
+++ b/app/admin/view/user/index_search.html
@@ -1,16 +1,9 @@
 <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
 
     <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">登录账号</label>
+        <label class="layui-form-label">账号名称</label>
         <label class="layui-input-inline">
-            <input name="username" value="{$get.username|default=''}" placeholder="请输入登录账号" class="layui-input">
-        </label>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">用户名称</label>
-        <label class="layui-input-inline">
-            <input name="nickname" value="{$get.nickname|default=''}" placeholder="请输入用户名称" class="layui-input">
+            <input name="username" value="{$get.username|default=''}" placeholder="请输入账号或名称" class="layui-input">
         </label>
     </div>