From 6a4bdd9bd5125d1f0adcbf4c1464b3616c1188b6 Mon Sep 17 00:00:00 2001
From: "HDM58\\hdm58" <hdm58@qq.com>
Date: Mon, 9 Oct 2023 11:12:19 +0800
Subject: [PATCH] =?UTF-8?q?1=E4=BC=98=E5=8C=96=EF=BC=9A=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=90=84=E4=B8=AA=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8C=BA=E9=97=B4=E7=9A=84=E7=AD=9B=E9=80=89=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=202=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E7=9A=84=E5=8F=91=E7=A5=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E6=8A=84=E9=80=81=E7=BB=99=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=97=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/customer/controller/Chance.php        |  8 ++--
 app/customer/view/chance/index.html       | 33 +++----------
 app/finance/controller/Expense.php        | 31 ++++++------
 app/finance/controller/Income.php         | 11 ++---
 app/finance/controller/Invoice.php        | 29 ++++++------
 app/finance/view/expense/checkedlist.html | 28 ++++-------
 app/finance/view/expense/copy.html        | 29 ++++--------
 app/finance/view/expense/index.html       | 29 ++++--------
 app/finance/view/income/index.html        | 28 ++++-------
 app/finance/view/invoice/checkedlist.html | 28 ++++-------
 app/finance/view/invoice/copy.html        | 28 ++++-------
 app/finance/view/invoice/index.html       | 28 ++++-------
 app/project/controller/Task.php           |  9 ++--
 app/project/view/task/task_time.html      | 57 ++++++-----------------
 14 files changed, 133 insertions(+), 243 deletions(-)

diff --git a/app/customer/controller/Chance.php b/app/customer/controller/Chance.php
index 8d356b9..8cdd272 100644
--- a/app/customer/controller/Chance.php
+++ b/app/customer/controller/Chance.php
@@ -31,9 +31,11 @@ class Chance extends BaseController
 			if (!empty($param['stage'])) {
                 $where[] = ['a.stage', '=', $param['stage']];
             }
-			if (!empty($param['start_date']) && !empty($param['end_date'])) {
-                $where[] = ['a.expected_time', 'BETWEEN', [strtotime($param['start_date']),strtotime($param['end_date'])]];
-            }
+			//按时间检索
+			if (!empty($param['diff_time'])) {
+				$diff_time =explode('~', $param['diff_time']);
+				$where[] = ['a.expected_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
+			}
             $where[] = ['a.delete_time', '=', 0];
 			
 			$uid = $this->uid;
diff --git a/app/customer/view/chance/index.html b/app/customer/view/chance/index.html
index 20ce6fd..25b3050 100644
--- a/app/customer/view/chance/index.html
+++ b/app/customer/view/chance/index.html
@@ -14,14 +14,8 @@
             {/volist}
           </select>
 		</div>
-		<div class="layui-input-inline" id="selectDate">
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-			  <input type="text" autocomplete="off" name="start_date" id="startDate" class="layui-input" placeholder="预计签单时间">
-			</div>
-			<div class="layui-input-inline">-</div>
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0;">
-			  <input type="text" autocomplete="off" name="end_date" id="endDate" class="layui-input" placeholder="预计签单时间">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="预计签单时间" readonly name="diff_time">
 		</div>
 		<div class="layui-input-inline" style="width:120px;">
 			<input type="text" name="username" placeholder="请选择归属人" class="layui-input picker-one" autocomplete="off" />
@@ -40,16 +34,11 @@
 <!-- 脚本 -->
 {block name="script"}
 	<script>
-	const moduleInit = ['tool','employeepicker'];
+	const moduleInit = ['tool','employeepicker','laydatePlus'];
 	function gouguInit() {
-		var table = layui.table, tool = layui.tool, form = layui.form,laydate=layui.laydate;
-		
+		var table = layui.table, tool = layui.tool, form = layui.form,laydatePlus=layui.laydatePlus;
 		//日期范围
-		laydate.render({
-			elem: '#selectDate'
-			,range: ['#startDate', '#endDate']
-			,rangeLinked:true
-		});
+		var diff_time = new laydatePlus({'target':'diff_time'});
 		
 		layui.pageTable = table.render({
 			elem: '#test'
@@ -107,16 +96,8 @@
 			//监听搜索提交
 			form.on('submit(webform)', function(data) {
 				layui.pageTable.reload({
-					where: {
-						keywords: data.field.keywords,
-						stage: data.field.stage,
-						uid: data.field.uid,
-						start_date: data.field.start_date,
-						end_date: data.field.end_date
-					},
-					page: {
-						curr: 1
-					}
+					where: data.field,
+					page: {curr: 1}
 				});
 				return false;
 			});
diff --git a/app/finance/controller/Expense.php b/app/finance/controller/Expense.php
index 9cee3f9..2a5b626 100644
--- a/app/finance/controller/Expense.php
+++ b/app/finance/controller/Expense.php
@@ -24,12 +24,11 @@ class Expense extends BaseController
             $param = get_params();
             $where = [];
             $where[] = ['delete_time', '=', 0];
-            //按时间检索
-            $start_time = !empty($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0;
-            $end_time = !empty($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0;
-            if ($start_time > 0 && $end_time > 0) {
-                $where[] = ['expense_time', 'between', [$start_time, $end_time]];
-            }
+			//按时间检索
+			if (!empty($param['diff_time'])) {
+				$diff_time =explode('~', $param['diff_time']);
+				$where[] = ['expense_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
+			}
 
 			$where[] = ['admin_id','=',$this->uid];
             if (!empty($param['check_status']) && $param['check_status']!='') {
@@ -85,11 +84,10 @@ class Expense extends BaseController
 			//查询条件
 			$map = [];
 			//按时间检索
-            $start_time = !empty($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0;
-            $end_time = !empty($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0;
-            if ($start_time > 0 && $end_time > 0) {
-                $map[] = ['expense_time', 'between', [$start_time, $end_time]];
-            }
+			if (!empty($param['diff_time'])) {
+				$diff_time =explode('~', $param['diff_time']);
+				$map[] = ['expense_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
+			}	
 			$map[] = ['check_status', 'in', [2,3,5]];			
 			$map[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',copy_uids)")];
 			$model = new ExpenseList;
@@ -112,12 +110,11 @@ class Expense extends BaseController
 			else{
 				$where[] = ['check_status','in',[2,5]];
 			}
-            //按时间检索
-            $start_time = !empty($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0;
-            $end_time = !empty($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0;
-            if ($start_time > 0 && $end_time > 0) {
-                $where[] = ['expense_time', 'between', [$start_time, $end_time]];
-            }			
+			//按时间检索
+			if (!empty($param['diff_time'])) {
+				$diff_time =explode('~', $param['diff_time']);
+				$where[] = ['expense_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
+			}		
 			$model = new ExpenseList;
 			$list = $model->get_list($param,$where);	
             return table_assign(0, '', $list);
diff --git a/app/finance/controller/Income.php b/app/finance/controller/Income.php
index c55f792..2767b4e 100644
--- a/app/finance/controller/Income.php
+++ b/app/finance/controller/Income.php
@@ -26,12 +26,11 @@ class Income extends BaseController
             $where = [];
             $where[] = ['delete_time', '=', 0];
             $where[] = ['check_status', '=', 5];
-            //按时间检索
-            $start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0;
-            $end_time = isset($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0;
-            if ($start_time > 0 && $end_time > 0) {
-                $where[] = ['enter_time', 'between', [$start_time, $end_time]];
-            }
+			//按时间检索
+			if (!empty($param['diff_time'])) {
+				$diff_time =explode('~', $param['diff_time']);
+				$where[] = ['enter_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
+			}
             if (isset($param['is_cash']) && $param['is_cash']!='') {
                 $where[] = ['is_cash', '=', $param['is_cash']];
             }
diff --git a/app/finance/controller/Invoice.php b/app/finance/controller/Invoice.php
index b642cdb..1defcf8 100644
--- a/app/finance/controller/Invoice.php
+++ b/app/finance/controller/Invoice.php
@@ -28,11 +28,10 @@ class Invoice extends BaseController
 				$where[] = ['i.check_status','=',$param['check_status']];
             }
             //按时间检索
-            $start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0;
-            $end_time = isset($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0;
-            if ($start_time > 0 && $end_time > 0) {
-                $where[] = ['i.create_time', 'between', [$start_time, $end_time]];
-            }			
+			if (!empty($param['diff_time'])) {
+				$diff_time =explode('~', $param['diff_time']);
+				$where[] = ['i.create_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
+			}		
 			$where[] = ['i.admin_id','=',$this->uid];
 			$where[] = ['i.delete_time','=',0];
 			$model = new InvoiceList();
@@ -81,11 +80,10 @@ class Invoice extends BaseController
 			//查询条件
 			$map = [];
 			//按时间检索
-            $start_time = !empty($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0;
-            $end_time = !empty($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0;
-            if ($start_time > 0 && $end_time > 0) {
-                $where[] = ['i.expense_time', 'between', [$start_time, $end_time]];
-            }
+			if (!empty($param['diff_time'])) {
+				$diff_time =explode('~', $param['diff_time']);
+				$map[] = ['i.create_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
+			}
 			$map[] = ['i.delete_time','=',0];
 			$map[] = ['i.check_status', '=', 2];			
 			$map[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',i.copy_uids)")];
@@ -109,12 +107,11 @@ class Invoice extends BaseController
 			else{
 				$where[] = ['i.check_status','in',[2,5,10]];
 			}
-            //按时间检索
-            $start_time = !empty($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0;
-            $end_time = !empty($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0;
-            if ($start_time > 0 && $end_time > 0) {
-                $where[] = ['i.create_time', 'between', [$start_time, $end_time]];
-            }			
+			//按时间检索
+			if (!empty($param['diff_time'])) {
+				$diff_time =explode('~', $param['diff_time']);
+				$where[] = ['i.create_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
+			}			
 			$where[] = ['i.delete_time','=',0];
 			$model = new InvoiceList();
 			$list = $model->get_list($param,$where);
diff --git a/app/finance/view/expense/checkedlist.html b/app/finance/view/expense/checkedlist.html
index 897aa46..25a7440 100644
--- a/app/finance/view/expense/checkedlist.html
+++ b/app/finance/view/expense/checkedlist.html
@@ -3,14 +3,8 @@
 {block name="body"}
 <div class="p-3">
 	<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
-		<div id="barDate" class="layui-input-inline">
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0;">
-				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
-			</div>
-			~
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0;">
-				<input type="text" class="layui-input" id="end_time" placeholder="选择时间区间" readonly name="end_time">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="选择时间区间" readonly name="diff_time">
 		</div>
 		<div class="layui-input-inline">
 			<select name="check_status">
@@ -37,20 +31,18 @@
 <!-- 脚本 -->
 {block name="script"}
 <script>
-	const moduleInit = ['tool'];
+	const moduleInit = ['tool','laydatePlus'];
 	function gouguInit() {
-		var form = layui.form,table = layui.table,tool=layui.tool, laydate = layui.laydate;
+		var form = layui.form,table = layui.table,tool=layui.tool, laydatePlus = layui.laydatePlus;
 		//日期范围
-		laydate.render({
-			elem: '#barDate',
-			range: ['#start_time', '#end_time'],
-			rangeLinked:true
-		});
+		var diff_time = new laydatePlus({'target':'diff_time'});
 		
 		//监听搜索提交
-		form.on('submit(webform)', function(data){
-			let f=data.field;
-			layui.pageTable.reload({where:{check_status:f.check_status,start_time:f.start_time,end_time:f.end_time},page:{curr:1}});
+		form.on('submit(webform)', function(data) {
+			layui.pageTable.reload({
+				where: data.field,
+				page: {curr: 1}
+			});
 			return false;
 		});
 
diff --git a/app/finance/view/expense/copy.html b/app/finance/view/expense/copy.html
index 8e58bc9..90fd7ea 100644
--- a/app/finance/view/expense/copy.html
+++ b/app/finance/view/expense/copy.html
@@ -3,14 +3,8 @@
 {block name="body"}
 <div class="p-3">
 	<form class="layui-form gg-form-bar border-x border-t">
-		<div id="barDate" class="layui-input-inline">
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
-			</div>
-			~
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0;">
-				<input type="text" class="layui-input" id="end_time" placeholder="选择时间区间" readonly name="end_time">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="选择时间区间" readonly name="diff_time">
 		</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>
@@ -25,20 +19,17 @@
 <!-- 脚本 -->
 {block name="script"}
 <script>
-	const moduleInit = ['tool','employeepicker'];
+	const moduleInit = ['tool','laydatePlus'];
 	function gouguInit() {
-		var form = layui.form,table = layui.table,tool=layui.tool, laydate = layui.laydate;
+		var form = layui.form,table = layui.table,tool=layui.tool, laydatePlus = layui.laydatePlus;
 		//日期范围
-		laydate.render({
-			elem: '#barDate',
-			range: ['#start_time', '#end_time'],
-			rangeLinked:true
-		});
-		
+		var diff_time = new laydatePlus({'target':'diff_time'});
 		//监听搜索提交
-		form.on('submit(webform)', function(data){
-			let f=data.field;
-			layui.pageTable.reload({where:{start_time:f.start_time,end_time:f.end_time},page:{curr:1}});
+		form.on('submit(webform)', function(data) {
+			layui.pageTable.reload({
+				where: data.field,
+				page: {curr: 1}
+			});
 			return false;
 		});
 
diff --git a/app/finance/view/expense/index.html b/app/finance/view/expense/index.html
index 2062dcb..018954d 100644
--- a/app/finance/view/expense/index.html
+++ b/app/finance/view/expense/index.html
@@ -3,14 +3,8 @@
 {block name="body"}
 <div class="p-3">
 	<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
-		<div id="barDate" class="layui-input-inline">
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
-			</div>
-			~
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0;">
-				<input type="text" class="layui-input" id="end_time" placeholder="选择时间区间" readonly name="end_time">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="选择时间区间" readonly name="diff_time">
 		</div>
 		<div class="layui-input-inline">
 			<select name="check_status">
@@ -40,20 +34,17 @@
 <!-- 脚本 -->
 {block name="script"}
 <script>
-	const moduleInit = ['tool','employeepicker'];
+	const moduleInit = ['tool','laydatePlus'];
 	function gouguInit() {
-		var form = layui.form,table = layui.table,tool=layui.tool, laydate = layui.laydate;
+		var form = layui.form,table = layui.table,tool=layui.tool, laydatePlus = layui.laydatePlus;
 		//日期范围
-		laydate.render({
-			elem: '#barDate',
-			range: ['#start_time', '#end_time'],
-			rangeLinked:true
-		});
-		
+		var diff_time = new laydatePlus({'target':'diff_time'});
 		//监听搜索提交
-		form.on('submit(webform)', function(data){
-			let f=data.field;
-			layui.pageTable.reload({where:{check_status:f.check_status,start_time:f.start_time,end_time:f.end_time},page:{curr:1}});
+		form.on('submit(webform)', function(data) {
+			layui.pageTable.reload({
+				where: data.field,
+				page: {curr: 1}
+			});
 			return false;
 		});
 
diff --git a/app/finance/view/income/index.html b/app/finance/view/income/index.html
index 986296d..7686334 100644
--- a/app/finance/view/income/index.html
+++ b/app/finance/view/income/index.html
@@ -3,14 +3,8 @@
 {block name="body"}
 <div class="p-3">
 	<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
-		<div id="barDate" class="layui-input-inline">
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
-			</div>
-			~
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="end_time" placeholder="选择时间区间" readonly name="end_time">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="选择时间区间" readonly name="diff_time">
 		</div>
 		<div class="layui-input-inline">
 			<select name="is_cash">
@@ -39,20 +33,18 @@
 {block name="script"}
 <script>
 	const auth = "{$auth}";
-	const moduleInit = ['tool'];
+	const moduleInit = ['tool','laydatePlus'];
 	function gouguInit() {
-		var form = layui.form,table = layui.table,tool=layui.tool, laydate = layui.laydate;
+		var form = layui.form,table = layui.table,tool=layui.tool, laydatePlus = layui.laydatePlus;
 		//日期范围
-		laydate.render({
-			elem: '#barDate',
-			range: ['#start_time', '#end_time'],
-			rangeLinked:true
-		});
+		var diff_time = new laydatePlus({'target':'diff_time'});
 		
 		//监听搜索提交
-		form.on('submit(webform)', function(data){
-			let f=data.field;
-			layui.pageTable.reload({where:{is_cash:f.is_cash,start_time:f.start_time,end_time:f.end_time},page:{curr:1}});
+		form.on('submit(webform)', function(data) {
+			layui.pageTable.reload({
+				where: data.field,
+				page: {curr: 1}
+			});
 			return false;
 		});
 
diff --git a/app/finance/view/invoice/checkedlist.html b/app/finance/view/invoice/checkedlist.html
index e785b11..0540780 100644
--- a/app/finance/view/invoice/checkedlist.html
+++ b/app/finance/view/invoice/checkedlist.html
@@ -3,14 +3,8 @@
 {block name="body"}
 <div class="p-3">
 	<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
-		<div id="barDate" class="layui-input-inline">
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0;">
-				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
-			</div>
-			~
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="end_time" placeholder="选择时间区间" readonly name="end_time">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="选择时间区间" readonly name="diff_time">
 		</div>
 		<div class="layui-input-inline">
 			<select name="check_status">
@@ -38,20 +32,18 @@
 <!-- 脚本 -->
 {block name="script"}
 <script>
-	const moduleInit = ['tool'];
+	const moduleInit = ['tool','laydatePlus'];
 	function gouguInit() {
-		var form = layui.form,table = layui.table,tool=layui.tool, laydate = layui.laydate;
+		var form = layui.form,table = layui.table,tool=layui.tool, laydatePlus = layui.laydatePlus;
 		//日期范围
-		laydate.render({
-			elem: '#barDate',
-			range: ['#start_time', '#end_time'],
-			rangeLinked:true
-		});
+		var diff_time = new laydatePlus({'target':'diff_time'});
 		
 		//监听搜索提交
-		form.on('submit(webform)', function(data){
-			let f=data.field;
-			layui.pageTable.reload({where:{check_status:f.check_status,start_time:f.start_time,end_time:f.end_time},page:{curr:1}});
+		form.on('submit(webform)', function(data) {
+			layui.pageTable.reload({
+				where: data.field,
+				page: {curr: 1}
+			});
 			return false;
 		});
 
diff --git a/app/finance/view/invoice/copy.html b/app/finance/view/invoice/copy.html
index 2a59d80..5d53ff3 100644
--- a/app/finance/view/invoice/copy.html
+++ b/app/finance/view/invoice/copy.html
@@ -3,14 +3,8 @@
 {block name="body"}
 <div class="p-3">
 	<form class="layui-form gg-form-bar border-x border-t">
-		<div id="barDate" class="layui-input-inline">
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
-			</div>
-			~
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="end_time" placeholder="选择时间区间" readonly name="end_time">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="选择时间区间" readonly name="diff_time">
 		</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>
@@ -25,20 +19,18 @@
 <!-- 脚本 -->
 {block name="script"}
 <script>
-	const moduleInit = ['tool','employeepicker'];
+	const moduleInit = ['tool','laydatePlus'];
 	function gouguInit() {
-		var form = layui.form,table = layui.table,tool=layui.tool, laydate = layui.laydate;
+		var form = layui.form,table = layui.table,tool=layui.tool, laydatePlus = layui.laydatePlus;
 		//日期范围
-		laydate.render({
-			elem: '#barDate',
-			range: ['#start_time', '#end_time'],
-			rangeLinked:true
-		});
+		var diff_time = new laydatePlus({'target':'diff_time'});
 		
 		//监听搜索提交
-		form.on('submit(webform)', function(data){
-			let f=data.field;
-			layui.pageTable.reload({where:{start_time:f.start_time,end_time:f.end_time},page:{curr:1}});
+		form.on('submit(webform)', function(data) {
+			layui.pageTable.reload({
+				where: data.field,
+				page: {curr: 1}
+			});
 			return false;
 		});
 
diff --git a/app/finance/view/invoice/index.html b/app/finance/view/invoice/index.html
index 0b5d231..098e941 100644
--- a/app/finance/view/invoice/index.html
+++ b/app/finance/view/invoice/index.html
@@ -3,14 +3,8 @@
 {block name="body"}
 <div class="p-3">
 	<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
-		<div id="barDate" class="layui-input-inline">
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
-			</div>
-			~
-			<div class="layui-input-inline" style="width:110px; margin-bottom:0">
-				<input type="text" class="layui-input" id="end_time" placeholder="选择时间区间" readonly name="end_time">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="选择时间区间" readonly name="diff_time">
 		</div>
 		<div class="layui-input-inline">
 			<select name="check_status">
@@ -41,20 +35,18 @@
 <!-- 脚本 -->
 {block name="script"}
 <script>
-	const moduleInit = ['tool','employeepicker'];
+	const moduleInit = ['tool','laydatePlus'];
 	function gouguInit() {
-		var form = layui.form,table = layui.table,tool=layui.tool, laydate = layui.laydate;
+		var form = layui.form,table = layui.table,tool=layui.tool, laydatePlus = layui.laydatePlus;
 		//日期范围
-		laydate.render({
-			elem: '#barDate',
-			range: ['#start_time', '#end_time'],
-			rangeLinked:true
-		});
+		var diff_time = new laydatePlus({'target':'diff_time'});
 		
 		//监听搜索提交
-		form.on('submit(webform)', function(data){
-			let f=data.field;
-			layui.pageTable.reload({where:{check_status:f.check_status,start_time:f.start_time,end_time:f.end_time},page:{curr:1}});
+		form.on('submit(webform)', function(data) {
+			layui.pageTable.reload({
+				where: data.field,
+				page: {curr: 1}
+			});
 			return false;
 		});
 
diff --git a/app/project/controller/Task.php b/app/project/controller/Task.php
index 35b9319..9d80ac1 100644
--- a/app/project/controller/Task.php
+++ b/app/project/controller/Task.php
@@ -170,9 +170,6 @@ class Task extends BaseController
 	public function task_time() {
         if (request()->isAjax()) {
             $param = get_params();
-            //按时间检索
-            $start_time = isset($param['start_time']) ? strtotime($param['start_time']) : 0;
-            $end_time = isset($param['end_time']) ? strtotime($param['end_time']) : 0;
             $tid = isset($param['tid']) ? $param['tid'] : 0;
             $where = [];
 			if ($tid>0) {
@@ -188,8 +185,10 @@ class Task extends BaseController
 				if (!empty($param['keywords'])) {
 					$where[] = ['a.title', 'like', '%' . trim($param['keywords']) . '%'];
 				}
-				if ($start_time > 0 && $end_time > 0) {
-					$where[] = ['a.start_time', 'between', [$start_time, $end_time]];
+				//按时间检索
+				if (!empty($param['diff_time'])) {
+					$diff_time =explode('~', $param['diff_time']);
+					$where[] = ['a.start_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]];
 				}
 			}
             $where[] = ['a.delete_time', '=', 0];
diff --git a/app/project/view/task/task_time.html b/app/project/view/task/task_time.html
index 219d12a..fc4eaff 100644
--- a/app/project/view/task/task_time.html
+++ b/app/project/view/task/task_time.html
@@ -8,17 +8,11 @@
 {block name="body"}
 <div class="p-3">
 	<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
-		<div id="barDate" class="layui-input-inline">
-			<div class="layui-input-inline" style="width:120px; margin-bottom:0">
-				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
-			</div>
-			~
-			<div class="layui-input-inline" style="width:120px;margin-bottom:0">
-				<input type="text" class="layui-input" id="end_time" placeholder="选择时间区间" readonly name="end_time">
-			</div>
+		<div class="layui-input-inline" style="width:300px;">
+			<input type="text" class="layui-input" id="diff_time" placeholder="时间范围" readonly name="diff_time">
 		</div>
-		<div class="layui-input-inline" style="width:120px;">
-			<input type="text" name="username"  placeholder="请选择员工" class="layui-input" readonly data-event="select"/>
+		<div class="layui-input-inline" style="width:110px;">
+			<input type="text" name="username"  placeholder="请选择员工" class="layui-input picker-one" readonly />
 			<input type="text" name="uid" value="" style="display:none" />	
 		</div>
 		<div class="layui-input-inline" style="width:240px;">
@@ -39,45 +33,24 @@
 <!-- 脚本 -->
 {block name="script"}
 	<script>
-	const moduleInit = ['tool','employeepicker','oaSchedule'];
+	const moduleInit = ['tool','employeepicker','oaSchedule','laydatePlus'];
 	function gouguInit() {
-		var form = layui.form,table = layui.table,tool=layui.tool, employeepicker = layui.employeepicker,laydate = layui.laydate,work = layui.oaSchedule;	  
+		var form = layui.form,table = layui.table,tool=layui.tool, laydatePlus = layui.laydatePlus,laydate = layui.laydate,work = layui.oaSchedule;	  
 		//日期范围
-		laydate.render({
-			elem: '#barDate',
-			range: ['#start_time', '#end_time'],
-			rangeLinked:true
-		});
+		var diff_time = new laydatePlus({'target':'diff_time'});
 
+		//监听搜索提交
+		form.on('submit(webform)', function(data) {
+			layui.scheduleTable.reload({
+				where: data.field,
+				page: {curr: 1}
+			});
+			return false;
+		});
 		$('[lay-filter="clear"]').on('click',function(){
 			setTimeout(function(){
 				$('[lay-filter="webform"]').click();
 			},10)			
-		})
-		
-		// 选择员工
-		$('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();
-				}
-			})
-		});
-
-		//监听搜索提交
-		form.on('submit(webform)', function(data){
-			let f=data.field;
-			layui.scheduleTable.reload({where:{keywords:f.keywords,start_time:f.start_time,end_time:f.end_time,uid:f.uid},page:{curr:1}});
-			return false;
 		});
 
 		layui.scheduleTable = table.render({