From 3a00e8962cf5787cb37ed4069016261a3d9a6fc8 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Sat, 4 Feb 2023 15:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=9D=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8C=89=E7=85=A7=E6=89=80=E5=B1=9E=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=EF=BC=8C=E5=AE=A1=E6=89=B9=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E8=BD=AC=E6=AD=A3=E3=80=81=E7=A6=BB=E8=81=8C=E3=80=81=E8=BD=AC?=
 =?UTF-8?q?=E5=B2=97=E5=AE=A1=E6=89=B9=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E9=80=89=E6=8B=A9=E6=95=88=E6=9E=9C=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/customer/controller/Index.php        | 108 ++++++++++++++---------
 app/customer/view/index/index.html       |  52 ++++++++++-
 app/customer/view/index/sea.html         |  10 +++
 app/customer/view/index/trash.html       |  10 +++
 app/home/controller/Login.php            |   2 +-
 app/install/data/gouguoa.sql             |   8 +-
 app/oa/view/approve/add_lizhi.html       |  10 ++-
 app/oa/view/approve/add_zhuangang.html   |  10 ++-
 app/oa/view/approve/add_zhuanzheng.html  |  10 ++-
 app/user/validate/DepartmentCheck.php    |   3 +-
 public/static/assets/gougu/css/gougu.css |   4 +-
 11 files changed, 167 insertions(+), 60 deletions(-)

diff --git a/app/customer/controller/Index.php b/app/customer/controller/Index.php
index 2154e5b..f38a6f8 100644
--- a/app/customer/controller/Index.php
+++ b/app/customer/controller/Index.php
@@ -44,49 +44,54 @@ class Index extends BaseController
 			
 			$uid = $this->uid;
 			$auth = isAuth($uid,'customer_admin');
-			$dids = get_department_role($uid);
-			if($auth==0){
-				if($tab==1){
-					$whereOr[] =['a.belong_uid', '=', $uid];
-				}
-				else if($tab==2){
-					if(!empty($dids)){
-						$whereOr[] =['a.belong_did', 'in', $dids];
-					}
-					else{
-						$whereOr[] =['a.belong_did', '=', 0];
-						$where[] =['a.belong_uid', '>', 0];
-					}
-				}
-				else if($tab==3){
-					$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
-				}
-				else{
-					$whereOr[] =['a.belong_uid', '=', $uid];	
-					if(!empty($dids)){
-						$whereOr[] =['a.belong_did', 'in', $dids];
-					}			
-					$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
-				}
+			if (!empty($param['uid']) && $auth == 1) {
+				$where[] =['a.belong_uid', '=', $param['uid']];	
 			}
-			else if($auth==1){
-				if($tab==1){
-					$whereOr[] =['a.belong_uid', '=', $uid];
-				}
-				else if($tab==2){
-					if(!empty($dids)){
-						$whereOr[] =['a.belong_did', 'in', $dids];
+			else{
+				$dids = get_department_role($uid);
+				if($auth == 0){
+					if($tab == 1){
+						$whereOr[] =['a.belong_uid', '=', $uid];
+					}
+					else if($tab == 2){
+						if(!empty($dids)){
+							$whereOr[] =['a.belong_did', 'in', $dids];
+						}
+						else{
+							$whereOr[] =['a.belong_did', '=', 0];
+							$where[] =['a.belong_uid', '>', 0];
+						}
+					}
+					else if($tab == 3){
+						$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
 					}
 					else{
-						$whereOr[] =['a.belong_did', '=', 0];
-						$where[] =['a.belong_uid', '>', 0];
+						$whereOr[] =['a.belong_uid', '=', $uid];	
+						if(!empty($dids)){
+							$whereOr[] =['a.belong_did', 'in', $dids];
+						}			
+						$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
 					}
 				}
-				else if($tab==3){
-					$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
-				}
-				else{
-					$whereOr[] =['a.belong_uid', '>', 0];
+				else if($auth ==1 ){
+					if($tab == 1){
+						$whereOr[] =['a.belong_uid', '=', $uid];
+					}
+					else if($tab == 2){
+						if(!empty($dids)){
+							$whereOr[] =['a.belong_did', 'in', $dids];
+						}
+						else{
+							$whereOr[] =['a.belong_did', '=', 0];
+							$where[] =['a.belong_uid', '>', 0];
+						}
+					}
+					else if($tab == 3){
+						$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
+					}
+					else{
+						$whereOr[] =['a.belong_uid', '>', 0];
+					}
 				}
 			}
 			
@@ -105,7 +110,13 @@ class Index extends BaseController
                 ->paginate($rows, false, ['query' => $param])
 				->each(function ($item, $key) {
                     $item->belong_name = Db::name('Admin')->where(['id' => $item->belong_uid])->value('name');
-                    $item->create_time = date('Y-m-d H:i:s', (int) $item->create_time);
+					$item->create_time = date('Y-m-d H:i', $item->create_time);
+					if($item->update_time == 0){
+						$item->update_time='-';
+					}
+					else{
+						$item->update_time = date('Y-m-d H:i', $item->update_time);
+					}
                     $item->intent_status_name = CustomerList::$IntentStatus[(int) $item->intent_status];
                     $item->status_name = CustomerList::$Status[(int) $item->status];
 					$contact = Db::name('CustomerContact')->where(['is_default'=>1,'cid' => $item->id])->find();
@@ -125,6 +136,9 @@ class Index extends BaseController
 				});
             return table_assign(0, '', $content);
         } else {
+			$uid = $this->uid;
+			$auth = isAuth($uid,'customer_admin');
+			View::assign('auth', $auth);
             return view();
         }
     }
@@ -162,7 +176,13 @@ class Index extends BaseController
                 ->paginate($rows, false, ['query' => $param])
 				->each(function ($item, $key) {
                     $item->belong_name = Db::name('Admin')->where(['id' => $item->belong_uid])->value('name');
-                    $item->create_time = date('Y-m-d H:i:s', (int) $item->create_time);
+                    $item->create_time = date('Y-m-d H:i', $item->create_time);
+					if($item->update_time == 0){
+						$item->update_time='-';
+					}
+					else{
+						$item->update_time = date('Y-m-d H:i', $item->update_time);
+					}
                     $item->intent_status_name = CustomerList::$IntentStatus[(int) $item->intent_status];
                     $item->status_name = CustomerList::$Status[(int) $item->status];
 					$contact = Db::name('CustomerContact')->where(['is_default'=>1,'cid' => $item->id])->find();
@@ -245,7 +265,13 @@ class Index extends BaseController
                 ->paginate($rows, false, ['query' => $param])
 				->each(function ($item, $key) {
                     $item->belong_name = Db::name('Admin')->where(['id' => $item->belong_uid])->value('name');
-                    $item->create_time = date('Y-m-d H:i:s', (int) $item->create_time);
+                    $item->create_time = date('Y-m-d H:i', $item->create_time);
+					if($item->update_time == 0){
+						$item->update_time='-';
+					}
+					else{
+						$item->update_time = date('Y-m-d H:i', $item->update_time);
+					}
                     $item->intent_status_name = CustomerList::$IntentStatus[(int) $item->intent_status];
                     $item->status_name = CustomerList::$Status[(int) $item->status];
 					$contact = Db::name('CustomerContact')->where(['is_default'=>1,'cid' => $item->id])->find();
diff --git a/app/customer/view/index/index.html b/app/customer/view/index/index.html
index a8f5e05..aa04475 100644
--- a/app/customer/view/index/index.html
+++ b/app/customer/view/index/index.html
@@ -12,7 +12,7 @@
 			</ul>
 		</div>
 	</div>
-	<form class="layui-form gg-form-bar border-x" lay-filter="barsearchform">
+	<form class="layui-form gg-form-bar border-x" lay-filter="barsearchform" id="barsearchform">
 		<div class="layui-input-inline" style="width:150px;">
 			<select name="grade_id">
 				<option value="">请选择客户等级</option>
@@ -48,11 +48,18 @@
 				<option value="5">已成交客户</option>
 			</select>
 		</div>
+		{eq name="$auth" value="1"}
+		<div class="layui-input-inline" style="width:120px;">
+			<input type="text" name="username"  placeholder="选择所属员工" class="layui-input" readonly data-event="select"/>
+			<input type="text" name="uid" value="" style="display:none" />	
+		</div>
+		{/eq}
 		<div class="layui-input-inline" style="width:240px;">
 			<input type="hidden" name="tab" value="0" />
 			<input type="text" name="keywords" placeholder="输入关键字" class="layui-input" autocomplete="off" />
 		</div>
 		<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform">提交搜索</button>
+		<button type="reset" class="layui-btn layui-btn-reset" lay-filter="clear">清空</button>
 	</form>
 	<table class="layui-hide" id="test" lay-filter="test"></table>
 </div>
@@ -68,9 +75,34 @@
 <!-- 脚本 -->
 {block name="script"}
 <script>
-	const moduleInit = ['tool'];
+	const moduleInit = ['tool','employeepicker'];
 	function gouguInit() {
-		var table = layui.table, tool = layui.tool ,form = layui.form, element = layui.element;
+		var table = layui.table, tool = layui.tool ,form = layui.form, element = layui.element, employeepicker = layui.employeepicker;
+		
+		// 选择员工
+		$('body').on('click','[data-event="select"]',function(){
+			var that = $(this);
+			var names = that.val(), ids = $('[name="uid"]').val();
+			employeepicker.init({
+				ids: ids,
+				names: names,
+				type: 0,
+				department_url: "/api/index/get_department_tree",
+				employee_url: "/api/index/get_employee",
+				callback: function (ids, names, dids, departments) {
+					$('[name="uid"]').val(ids);
+					that.val(names);
+					$('[lay-filter="webform"]').click();
+				}
+			})
+		});
+		
+		$('[lay-filter="clear"]').on('click',function(){
+			setTimeout(function(){
+				$('[lay-filter="webform"]').click();
+			},10)			
+		})
+		
 		layui.pageTable = table.render({
 			elem: '#test',
 			title: '客户列表',
@@ -123,6 +155,16 @@
 						title: '微信号',
 						align: 'center',
 						width: 90
+					},{
+						field: 'create_time',
+						title: '创建时间',
+						align: 'center',
+						width: 136
+					},{
+						field: 'update_time',
+						title: '最后编辑时间',
+						align: 'center',
+						width: 136
 					},{
 						field: 'source',
 						title: '来源渠道',
@@ -167,6 +209,7 @@
 		
 		element.on('tab(tab)', function(data){
 			$('[name="tab"]').val(data.index);
+			$("#barsearchform")[0].reset();
 			layui.pageTable.reload({where:{tab:data.index},page:{curr:1}});
 			return false;
 		});
@@ -224,7 +267,8 @@
 					grade_id: data.field.grade_id,
 					source_id: data.field.source_id,
 					type: data.field.type,
-					status: data.field.status
+					status: data.field.status,
+					uid: data.field.uid
 				},
 				page: {
 					curr: 1
diff --git a/app/customer/view/index/sea.html b/app/customer/view/index/sea.html
index cdccee0..6debf14 100644
--- a/app/customer/view/index/sea.html
+++ b/app/customer/view/index/sea.html
@@ -89,6 +89,16 @@
 						title: '微信号',
 						align: 'center',
 						width: 90
+					},{
+						field: 'create_time',
+						title: '创建时间',
+						align: 'center',
+						width: 136
+					},{
+						field: 'update_time',
+						title: '最后编辑时间',
+						align: 'center',
+						width: 136
 					},{
 						field: 'source',
 						title: '来源渠道',
diff --git a/app/customer/view/index/trash.html b/app/customer/view/index/trash.html
index d83e0db..cbbd8e4 100644
--- a/app/customer/view/index/trash.html
+++ b/app/customer/view/index/trash.html
@@ -74,6 +74,16 @@
 						title: '微信号',
 						align: 'center',
 						width: 90
+					},{
+						field: 'create_time',
+						title: '创建时间',
+						align: 'center',
+						width: 136
+					},{
+						field: 'update_time',
+						title: '最后编辑时间',
+						align: 'center',
+						width: 136
 					},{
 						field: 'source',
 						title: '来源渠道',
diff --git a/app/home/controller/Login.php b/app/home/controller/Login.php
index accbcb0..9a9f249 100644
--- a/app/home/controller/Login.php
+++ b/app/home/controller/Login.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
  * @link https://www.gougucms.com
  */
 
diff --git a/app/install/data/gouguoa.sql b/app/install/data/gouguoa.sql
index 9895771..5de7e8d 100644
--- a/app/install/data/gouguoa.sql
+++ b/app/install/data/gouguoa.sql
@@ -331,10 +331,10 @@ INSERT INTO `oa_admin_rule` VALUES (154, 152, 'customer/index/revert', '还原',
 INSERT INTO `oa_admin_rule` VALUES (155, 135, 'customer/contact/index', '客户联系人', '联系人', 'customer', '', 1, 0, 1, 1656143065, 0);
 INSERT INTO `oa_admin_rule` VALUES (156, 155, 'customer/contact/contact_add', '新建/编辑', '联系人', 'customer', '', 2, 0, 1, 1656143065, 0);
 INSERT INTO `oa_admin_rule` VALUES (157, 155, 'customer/contact/contact_del', '删除', '联系人', 'customer', '', 2, 0, 1, 1656143065, 0);
-INSERT INTO `oa_admin_rule` VALUES (158, 135, 'customer/chance/index', '销售机会', '联系人', 'customer', '', 1, 0, 1, 1656143065, 0);
-INSERT INTO `oa_admin_rule` VALUES (159, 158, 'customer/chance/chance_add', '新建/编辑', '联系人', 'customer', '', 2, 0, 1, 1656143065, 0);
-INSERT INTO `oa_admin_rule` VALUES (160, 158, 'customer/chance/chance_view', '删除', '联系人', 'customer', '', 2, 0, 1, 1656143065, 0);
-INSERT INTO `oa_admin_rule` VALUES (161, 158, 'customer/chance/chance_del', '删除', '联系人', 'customer', '', 2, 0, 1, 1656143065, 0);
+INSERT INTO `oa_admin_rule` VALUES (158, 135, 'customer/chance/index', '销售机会', '销售机会', 'customer', '', 1, 0, 1, 1656143065, 0);
+INSERT INTO `oa_admin_rule` VALUES (159, 158, 'customer/chance/chance_add', '新建/编辑', '销售机会', 'customer', '', 2, 0, 1, 1656143065, 0);
+INSERT INTO `oa_admin_rule` VALUES (160, 158, 'customer/chance/chance_view', '删除', '销售机会', 'customer', '', 2, 0, 1, 1656143065, 0);
+INSERT INTO `oa_admin_rule` VALUES (161, 158, 'customer/chance/chance_del', '删除', '销售机会', 'customer', '', 2, 0, 1, 1656143065, 0);
 
 INSERT INTO `oa_admin_rule` VALUES (162, 0, '', '合同协议', '合同协议', 'contract', 'icon-hetongyidong', 1, 10, 1, 1656143065, 0);
 INSERT INTO `oa_admin_rule` VALUES (163, 162, 'contract/cate/conf', '权限配置', '合同权限配置', 'contract', '', 1, 0, 1, 0, 0);
diff --git a/app/oa/view/approve/add_lizhi.html b/app/oa/view/approve/add_lizhi.html
index 39d3006..9e7f2b8 100644
--- a/app/oa/view/approve/add_lizhi.html
+++ b/app/oa/view/approve/add_lizhi.html
@@ -10,7 +10,10 @@
 	<table class="layui-table layui-table-form">
 		<tr>
 			<td class="layui-td-gray">员工姓名<font>*</font></td>
-			<td colspan="2"><input type="text" name="name" value="" autocomplete="off" placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input"></td>
+			<td colspan="2">
+				<input type="text" name="name" value="" autocomplete="off" readonly placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input picker-one">
+				<input type="hidden" name="uid">
+			</td>
 			<td class="layui-td-gray">入职日期<font>*</font></td>
 			<td colspan="2">
 				<input id="detail_time" name="detail_time" autocomplete="off" class="layui-input" value="" readonly lay-verify="required" placeholder="请选择时间" lay-reqText="请选择时间">
@@ -63,7 +66,10 @@
 	<table class="layui-table layui-table-form">
 		<tr>
 			<td class="layui-td-gray">员工姓名<font>*</font></td>
-			<td colspan="2"><input type="text" name="name" value="{$detail.name}" autocomplete="off" placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input"></td>
+			<td colspan="2">
+				<input type="text" name="name" value="{$detail.name}" autocomplete="off" readonly placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input picker-one">
+				<input type="hidden" name="uid">
+			</td>
 			<td class="layui-td-gray">入职日期<font>*</font></td>
 			<td colspan="2">
 				<input id="detail_time" name="detail_time" autocomplete="off" class="layui-input" value="{$detail.detail_time}" readonly lay-verify="required" placeholder="请选择时间" lay-reqText="请选择时间">
diff --git a/app/oa/view/approve/add_zhuangang.html b/app/oa/view/approve/add_zhuangang.html
index b42b3db..dac6663 100644
--- a/app/oa/view/approve/add_zhuangang.html
+++ b/app/oa/view/approve/add_zhuangang.html
@@ -10,7 +10,10 @@
 	<table class="layui-table layui-table-form">
 		<tr>
 			<td class="layui-td-gray">员工姓名<font>*</font></td>
-			<td colspan="2"><input type="text" name="name" value="" autocomplete="off" placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input"></td>
+			<td colspan="2">
+				<input type="text" name="name" value="" autocomplete="off" readonly placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input picker-one">
+				<input type="hidden" name="uid">
+			</td>
 			<td class="layui-td-gray">入职日期<font>*</font></td>
 			<td colspan="2">
 				<input id="detail_time" name="detail_time" autocomplete="off" class="layui-input" value="" readonly lay-verify="required" placeholder="请选择时间" lay-reqText="请选择时间">
@@ -83,7 +86,10 @@
 	<table class="layui-table layui-table-form">
 		<tr>
 			<td class="layui-td-gray">员工姓名<font>*</font></td>
-			<td colspan="2"><input type="text" name="name" value="{$detail.name}" autocomplete="off" placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input"></td>
+			<td colspan="2">
+				<input type="text" name="name" value="{$detail.name}" autocomplete="off" readonly placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input picker-one">
+				<input type="hidden" name="uid">
+			</td>
 			<td class="layui-td-gray">入职日期<font>*</font></td>
 			<td colspan="2">
 				<input id="detail_time" name="detail_time" autocomplete="off" class="layui-input" value="{$detail.detail_time}" readonly lay-verify="required" placeholder="请选择时间" lay-reqText="请选择时间">
diff --git a/app/oa/view/approve/add_zhuanzheng.html b/app/oa/view/approve/add_zhuanzheng.html
index 26c1624..e83258a 100644
--- a/app/oa/view/approve/add_zhuanzheng.html
+++ b/app/oa/view/approve/add_zhuanzheng.html
@@ -10,7 +10,10 @@
 	<table class="layui-table layui-table-form">
 		<tr>
 			<td class="layui-td-gray">员工姓名<font>*</font></td>
-			<td colspan="2"><input type="text" name="name" value="" autocomplete="off" placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input"></td>
+			<td colspan="2">
+				<input type="text" name="name" value="" autocomplete="off" readonly placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input picker-one">
+				<input type="hidden" name="uid">
+			</td>
 			<td class="layui-td-gray">转正日期<font>*</font></td>
 			<td colspan="2">
 				<input id="detail_time" name="detail_time" autocomplete="off" class="layui-input" value="" readonly lay-verify="required" placeholder="请选择时间" lay-reqText="请选择时间">
@@ -55,7 +58,10 @@
 	<table class="layui-table layui-table-form">
 		<tr>
 			<td class="layui-td-gray">员工姓名<font>*</font></td>
-			<td colspan="2"><input type="text" name="name" value="{$detail.name}" autocomplete="off" placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input"></td>
+			<td colspan="2">
+				<input type="text" name="name" value="{$detail.name}" autocomplete="off" readonly placeholder="请输入员工姓名" lay-verify="required" lay-reqText="请输入员工姓名" class="layui-input picker-one">
+				<input type="hidden" name="uid">
+			</td>
 			<td class="layui-td-gray">转正日期<font>*</font></td>
 			<td colspan="2">
 				<input id="detail_time" name="detail_time" autocomplete="off" class="layui-input" value="{$detail.detail_time}" readonly lay-verify="required" placeholder="请选择时间" lay-reqText="请选择时间">
diff --git a/app/user/validate/DepartmentCheck.php b/app/user/validate/DepartmentCheck.php
index 64dfeed..470f0d4 100644
--- a/app/user/validate/DepartmentCheck.php
+++ b/app/user/validate/DepartmentCheck.php
@@ -12,13 +12,12 @@ use think\Validate;
 class DepartmentCheck extends Validate
 {
     protected $rule = [
-        'title' => 'require|unique:department',
+        'title' => 'require',
         'id' => 'require',
     ];
 
     protected $message = [
         'title.require' => '部门名称不能为空',
-        'title.unique' => '同样的部门名称已经存在',
         'id.require' => '缺少更新条件',
     ];
 
diff --git a/public/static/assets/gougu/css/gougu.css b/public/static/assets/gougu/css/gougu.css
index 678b3f8..99cdcea 100644
--- a/public/static/assets/gougu/css/gougu.css
+++ b/public/static/assets/gougu/css/gougu.css
@@ -56,8 +56,8 @@
 .layui-data-none{padding:12px 0; color:#969696; text-align:center; font-size:12px;}
 .gougu-data-none{background:url(../images/data-none.png) no-repeat center center; background-size:auto 80%;}
 
-html {background-color: #FAFAFA; color: #162a48}
-html,body{height:100%;}
+html {background-color: #FAFAFA; color: #162a48;}
+html,body{height:100%;scrollbar-width: thin;}
 body.right-open{overflow:hidden;}
 .bg-white{background-color:#fff;}
 a.tab-a,a.open-a,a.link-a,a.right-a,a.side-a{color:#187FDD; cursor:pointer;}