新增：用户联系方式是否支持在通讯录开放查看的开关；

升级：layUI升级到最新版2.9.3；

app/home/controller/Index.php

@@ -233,6 +233,10 @@ class Index extends BaseController
                 ->each(function ($item, $key) {
                     $item->department = Db::name('Department')->where(['id' => $item->did])->value('title');
                     $item->position = Db::name('Position')->where(['id' => $item->position_id])->value('title');
+					if($item->is_hide ==1){
+						$item->mobile = hidetel($item->mobile);
+						$item->email = hidetel($item->email);
+					}
                     $item->entry_time = empty($item->entry_time) ? '-' : date('Y-m-d', $item->entry_time);
                 });
             return table_assign(0, '', $admin);

app/home/view/index/mail_list.html

@@ -22,7 +22,7 @@
 	<div class="body-table" style="margin-left:228px; overflow:hidden;">
 		<form class="layui-form gg-form-bar border-t border-x" lay-filter="barsearchform">
 			<div class="layui-input-inline" style="width:240px">
-				<input type="text" name="keywords" placeholder="输入关键字，如：ID/姓名/手机号码" class="layui-input" autocomplete="off" />
+				<input type="text" name="keywords" placeholder="输入关键字，如：ID/姓名" class="layui-input" autocomplete="off" />
 			</div>
 			<div class="layui-input-inline" style="width:150px;">
 				<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform"><i class="layui-icon layui-icon-search mr-1"></i>搜索</button>
@@ -61,6 +61,8 @@
 							   ,page:{curr:1}
 							});
 							$('[name="keywords"]').val('');
+							$('[name="type"]').val('');
+							layui.form.render('select');
 						}
 					});	
 				}
@@ -75,7 +77,8 @@
 			page: true, //开启分页
 			limit: 20,
 			cols: [
-				[{
+				[
+					{
 						field: 'thumb',
 						title: '头像',
 						toolbar: '#thumb',
@@ -150,9 +153,7 @@
 		//监听搜索提交
 		form.on('submit(webform)', function (data) {
 			layui.pageTable.reload({
-				where: {
-					keywords: data.field.keywords
-				},
+				where: data.field,
 				page: {
 					curr: 1
 				}

app/install/data/gouguoa.sql

@@ -44,6 +44,7 @@ CREATE TABLE `oa_admin`  (
   `bank_account` varchar(255) NOT NULL DEFAULT '' COMMENT '银行账号',
   `bank_info` varchar(255) NOT NULL DEFAULT '' COMMENT '银行卡信息',
   `desc` text NULL COMMENT '员工个人简介',
+  `is_hide` int(1) NOT NULL DEFAULT 0 COMMENT '是否隐藏联系方式:0否,1是',
   `entry_time` int(11) NOT NULL DEFAULT 0 COMMENT '员工入职日期',
   `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '注册时间',
   `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新信息时间',

app/user/view/user/add.html

@@ -75,11 +75,16 @@
 		</tr>
 		<tr>
 			<td class="layui-td-gray">账号状态</td>
-			<td colspan="5">
+			<td>
 				<input type="radio" name="status" value="0" title="禁止登录">
 				<input type="radio" name="status" value="1" title="正常" checked>
 				<input type="radio" name="status" value="2" title="离职">
 			</td>
+			<td class="layui-td-gray-3">是否隐藏联系方式</td>
+			<td colspan="3">
+				<input type="radio" name="is_hide" value="0" title="否" checked>
+				<input type="radio" name="is_hide" value="1" title="是">
+			</td>
 		</tr>
 		<tr>
 			<td class="layui-td-gray">员工简介</td>
@@ -162,17 +167,22 @@
 			</td>
 		</tr>
 		<tr>
+			<td class="layui-td-gray">员工性别<font>*</font></td>
+			<td>
+				<input type="radio" name="sex" value="1" title="男" {eq name="$detail.sex" value="1"}checked{/eq}>
+				<input type="radio" name="sex" value="2" title="女" {eq name="$detail.sex" value="2"}checked{/eq}>
+			</td>
+			<td class="layui-td-gray-3">是否隐藏联系方式<font>*</font></td>
+			<td>
+				<input type="radio" name="is_hide" value="0" title="否" {eq name="$detail.is_hide" value="0"}checked{/eq}>
+				<input type="radio" name="is_hide" value="1" title="是" {eq name="$detail.is_hide" value="1"}checked{/eq}>
+			</td>
 			<td class="layui-td-gray">账号状态</td>
 			<td>
 				{eq name="$detail.status" value="0"}<span style="color:#FF5722">禁止登录</span>{/eq}
 				{eq name="$detail.status" value="1"}<span style="color:#009688">正常</span>{/eq}
 				{eq name="$detail.status" value="2"}<span style="color:#FFB800">已离职</span>{/eq}
 			</td>
-			<td class="layui-td-gray">员工性别<font>*</font></td>
-			<td colspan="3">
-				<input type="radio" name="sex" value="1" title="男" {eq name="$detail.sex" value="1"}checked{/eq}>
-				<input type="radio" name="sex" value="2" title="女" {eq name="$detail.sex" value="2"}checked{/eq}>
-			</td>
 		</tr>
 		<tr>
 			<td class="layui-td-gray">员工简介</td>

public/index.php

@@ -15,10 +15,10 @@ if (empty(file_exists(__DIR__ . '/../vendor/autoload.php'))) {
 require __DIR__ . '/../vendor/autoload.php';
 
 // 定义当前版本号
-define('CMS_VERSION','4.95.12');
+define('CMS_VERSION','4.96.16');
 
 // 定义Layui版本号
-define('LAYUI_VERSION','2.9.2');
+define('LAYUI_VERSION','2.9.3');
 
 // 定义项目目录
 define('CMS_ROOT', __DIR__ . '/../');