1优化:财务管理、项目管理各个数据列表时间区间的筛选操作
2修复:财务管理中的发票管理的抄送给我的列表搜索时查询条件错误的问题
This commit is contained in:
parent
6f52406408
commit
6a4bdd9bd5
@ -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;
|
||||
|
@ -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;
|
||||
});
|
||||
|
@ -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);
|
||||
|
@ -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']];
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
});
|
||||
|
||||
|
@ -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;
|
||||
});
|
||||
|
||||
|
@ -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;
|
||||
});
|
||||
|
||||
|
@ -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;
|
||||
});
|
||||
|
||||
|
@ -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;
|
||||
});
|
||||
|
||||
|
@ -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;
|
||||
});
|
||||
|
||||
|
@ -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;
|
||||
});
|
||||
|
||||
|
@ -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];
|
||||
|
@ -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({
|
||||
|
Loading…
x
Reference in New Issue
Block a user