From fcdecf25a940d424fc5a769160e238d5244f2193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 17 Nov 2021 00:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/LogList.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/system/LogList.vue b/jshERP-web/src/views/system/LogList.vue
index a2056c41..dd112c92 100644
--- a/jshERP-web/src/views/system/LogList.vue
+++ b/jshERP-web/src/views/system/LogList.vue
@@ -28,6 +28,11 @@
                 </a-form-item>
               </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入操作员账号或姓名" v-model="queryParam.userInfo"></a-input>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="操作IP" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input placeholder="请输入操作IP" v-model="queryParam.clientIp"></a-input>
@@ -96,6 +101,7 @@
           operation:'',
           content:'',
           createTimeRange:[],
+          userInfo: '',
           clientIp:'',
           status:''
         },
@@ -114,7 +120,8 @@
           },
           {title: '操作模块', dataIndex: 'operation', width: 120},
           {title: '操作详情', align:"left", dataIndex: 'content', scopedSlots: { customRender: 'content' }, width: 350 },
-          {title: '操作人员', dataIndex: 'userName', width: 100, align: "center"},
+          {title: '操作员账号', dataIndex: 'loginName', width: 80, align: "center"},
+          {title: '操作员姓名', dataIndex: 'userName', width: 80, align: "center"},
           {
             title: '操作状态', dataIndex: 'status',width:80, align:"center",
             customRender:function (text) {
@@ -126,7 +133,7 @@
             }
           },
           {title: '操作IP', dataIndex: 'clientIp', width: 110, align: "center"},
-          {title: '操作时间', dataIndex: 'createTimeStr', width: 150, align: "center"}
+          {title: '操作时间', dataIndex: 'createTimeStr', width: 120, align: "center"}
         ],
         operateColumn:
         {