From ab16f85da5bc731d1a4f8f02e774c25abb61f1ad Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Tue, 9 Aug 2022 14:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E9=82=AE=E7=AE=B1=E5=9C=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=B1=95=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/oa/view/approve/view_step.html | 8 ++++----
 app/user/view/user/index.html      | 4 ++++
 app/user/view/user/view.html       | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/oa/view/approve/view_step.html b/app/oa/view/approve/view_step.html
index 2de8982..2f38fcd 100644
--- a/app/oa/view/approve/view_step.html
+++ b/app/oa/view/approve/view_step.html
@@ -2,10 +2,10 @@
 		<tr>
 			<td class="layui-td-gray">审核状态</td>
 			<td>{eq name="$detail.check_status" value="0"}<span class="black">待审批</span>{/eq}
-				{eq name="$detail.check_status" value="1"}<span style="blue">审批中</span>{/eq}
-				{eq name="$detail.check_status" value="2"}<span style="green">已通过</span>{/eq}
-				{eq name="$detail.check_status" value="3"}<span style="red">已拒绝</span>{/eq}
-				{eq name="$detail.check_status" value="4"}<span style="yellow">已撤销</span>{/eq}
+				{eq name="$detail.check_status" value="1"}<span class="blue">审批中</span>{/eq}
+				{eq name="$detail.check_status" value="2"}<span class="green">已通过</span>{/eq}
+				{eq name="$detail.check_status" value="3"}<span class="red">已拒绝</span>{/eq}
+				{eq name="$detail.check_status" value="4"}<span class="yellow">已撤销</span>{/eq}
 			</td>
 			<td class="layui-td-gray-2">当前审核人</td>
 			<td>{$detail.check_user}</td>
diff --git a/app/user/view/user/index.html b/app/user/view/user/index.html
index 9396c16..958417e 100644
--- a/app/user/view/user/index.html
+++ b/app/user/view/user/index.html
@@ -153,6 +153,10 @@
 						title: '手机号码',
 						align: 'center',
 						width: 120
+					},{
+						field: 'email',
+						title: '电子邮箱',
+						width: 200
 					},{
 						field: 'sex',
 						title: '性别',
diff --git a/app/user/view/user/view.html b/app/user/view/user/view.html
index 14d4d11..4de12cc 100644
--- a/app/user/view/user/view.html
+++ b/app/user/view/user/view.html
@@ -42,16 +42,16 @@
 			<td class="layui-td-gray">员工姓名</td>
 			<td>
 				{$detail.name}
+				{eq name="$detail.sex" value="1"}  <span class="layui-badge layui-bg-green">男</span>{/eq}
+				{eq name="$detail.sex" value="2"}  <span class="layui-badge layui-bg-red">女</span>{/eq}
 			</td>
 			<td class="layui-td-gray">手机号码</td>
 			<td>
 				{$detail.mobile}
 			</td>
-			<td class="layui-td-gray">性别</td>
+			<td class="layui-td-gray">电子邮箱</td>
 			<td>
-				{eq name="$detail.sex" value="0"}未知{/eq}
-				{eq name="$detail.sex" value="1"}男{/eq}
-				{eq name="$detail.sex" value="2"}女{/eq}
+				{$detail.email}
 			</td>
 		</tr>
 		<tr>