|
|
@@ -20,25 +20,26 @@
|
|
|
<div class="box-body">
|
|
|
|
|
|
<div id="status-div" class="col-xs-6 form-inline" style="width: auto;float: right">
|
|
|
- <select class="form-control selectpicker" id="pushModelSelect">
|
|
|
- <option value=-1>全部</option>
|
|
|
- <option value=0>开启</option>
|
|
|
- <option value=1>关闭</option>
|
|
|
- </select>
|
|
|
- <span class="input-group date date-picker" id="starttime">
|
|
|
+ <label for="pushModelSelect">状态：
|
|
|
+ <select class="form-control selectpicker" id="pushModelSelect">
|
|
|
+ <option value=-1>全部</option>
|
|
|
+ <option value=0>开启</option>
|
|
|
+ <option value=1>关闭</option></select></label>
|
|
|
+ </span>
|
|
|
+ <span class="input-group date date-picker" id="starttime" data-provide="datepicker">
|
|
|
<input type="text" class="form-control form-filter input-sm" readonly name="starttime" placeholder="开始日期" />
|
|
|
<span class="input-group-addon">
|
|
|
<i class="fa fa-calendar"></i>
|
|
|
</span>
|
|
|
</span>
|
|
|
- <span class="input-group date date-picker" id="endtime">
|
|
|
+ <span class="input-group date date-picker" id="endtime" data-provide="datepicker">
|
|
|
<input type="text" class="form-control form-filter input-sm" readonly name="endtime" placeholder="结束日期" />
|
|
|
<span class="input-group-addon">
|
|
|
<i class="fa fa-calendar"></i>
|
|
|
</span>
|
|
|
</span>
|
|
|
-<!-- <input type="button" class="btn btn-sm btn-primary" onclick="exportTask()" value="导出">-->
|
|
|
- <a type="button" class="btn btn-sm btn-primary" href="/front/group/task/export">导出</a>
|
|
|
+ <input type="button" class="btn btn-sm btn-primary" onclick="exportTask()" value="导出">
|
|
|
+<!-- <a type="button" class="btn btn-sm btn-primary" href="/front/group/task/export">导出</a>-->
|
|
|
</div>
|
|
|
|
|
|
<table id="dataTable" class="table table-bordered table-hover">
|
|
|
@@ -156,12 +157,15 @@
|
|
|
todayBtn: false, //今日按钮
|
|
|
format: "yyyy-mm-dd"
|
|
|
});
|
|
|
- $('#starttime').datepicker({ 'changeDate': function(e) {
|
|
|
- console.log(e.data.toString())
|
|
|
- }
|
|
|
+ $('#starttime').datepicker().on('changeDate', function (e) {
|
|
|
+ console.log(e)
|
|
|
+ console.log(e.dates[0])
|
|
|
+ console.log(e.dates[0].toLocaleDateString())
|
|
|
+ $('#endtime').datepicker('setStartDate', e.dates[0])
|
|
|
})
|
|
|
-
|
|
|
- // $('#datetimepicker').datetimepicker('setStartDate', '2012-01-01');
|
|
|
+ // $('#endtime').datepicker().on('changeDate', function (e) {
|
|
|
+ // console.log(e.timeStamp)
|
|
|
+ // })
|
|
|
});
|
|
|
|
|
|
// 收回
|
|
|
@@ -207,19 +211,13 @@
|
|
|
function exportTask() {
|
|
|
|
|
|
const search = $("[type=search]").val();
|
|
|
- console.log(search)
|
|
|
- $.ajax({
|
|
|
- url: "/front/group/task/export",
|
|
|
- type: 'POST',
|
|
|
- data: {"i_starttime": 1638876802, "i_completetime": 1639031189, "s_status": "-1"},
|
|
|
- success: function (r) {
|
|
|
- if (r.success) {
|
|
|
- showTip("导出成功")
|
|
|
- } else {
|
|
|
- showTip(r.msg);
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
+ let s = $('#starttime').datepicker('getDate').toLocaleDateString()
|
|
|
+ let sc = Date.parse(new Date(s).toString())/1000
|
|
|
+ console.log(s, sc)
|
|
|
+ let e = $('#endtime').datepicker('getDate').toLocaleDateString()
|
|
|
+ let ec = Date.parse(new Date(e).toString())/1000
|
|
|
+ console.log(e, ec)
|
|
|
+ window.open("/front/group/task/export?"+"i_starttime="+sc+"&i_completetime="+ec+"&s_search="+search+"&s_status="+"-1")
|
|
|
}
|
|
|
|
|
|
</script>
|
