71659609 by Zelig

Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

2 parents d365509b 968e085c
......@@ -123,9 +123,12 @@
if(draw) {
ret.draw = draw;
}
// ret.draw = parseInt(json.page.currentPage);
ret.recordsTotal = 0;
ret.recordsFiltered = 0;
if (json.page) {
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
}
return JSON.stringify(ret);
},
data: function (data) {
......
<?php $this->load->view('common/header'); ?>
<body>
<?php $this->load->view('common/work_header'); ?>
<div class="page-container">
<?php $this->load->view('common/work_header'); ?>
<div class="page-container">
<form class="search">
<div class="date mb-20">
<input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'logmax\')||\'%y-%M-%d\'}' })" id="logmin" class="input-text Wdate"> -
<input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'logmin\')}',maxDate:'%y-%M-%d' })" id="logmax" class="input-text Wdate">
<input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'logmax\')||\'%y-%M-%d\'}' })" id="logmin"
class="input-text Wdate"> -
<input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'logmin\')}',maxDate:'%y-%M-%d' })"
id="logmax" class="input-text Wdate">
</div>
<div class="row cl mb-20">
<div class="col-xs-2">
......@@ -91,21 +93,21 @@
</tbody>
</table>
</div>
</div>
<?php $this->load->view('common/footer'); ?>
</div>
<?php $this->load->view('common/footer'); ?>
<script>
<script>
function pass(id) {
layer.confirm('通过之后, 将立即进入审批阶段', {
btn: ['确认通过','取消'],
btn: ['确认通过', '取消'],
title: '确认通过预审',
icon: 3
}, function(){
}, function () {
layer.msg('通过');
});
}
</script>
<script>
</script>
<script>
var table = $('#table').dataTable({
aaSorting: [[1, "desc"]],
serverSide: true,
......@@ -120,12 +122,16 @@
var ret = {}, json = jQuery.parseJSON(json);
ret.data = json.data;
var draw = getUrlParam('draw');
if(draw) {
if (draw) {
ret.draw = draw;
}
// ret.draw = parseInt(json.page.currentPage);
ret.recordsTotal = 0;
ret.recordsFiltered = 0;
if (json.page) {
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
}
return JSON.stringify(ret);
},
data: function (data) {
......@@ -137,8 +143,8 @@
columns: [
{
// data: "id",
render:function (data, type, full) {
return '<input value="'+data+'" type="checkbox">';
render: function (data, type, full) {
return '<input value="' + data + '" type="checkbox">';
}
},
{
......@@ -200,6 +206,6 @@
function resetHandler() {
$('#table').DataTable().columns().search("").draw();
}
</script>
</script>
</body>
<html>
......
......@@ -112,8 +112,12 @@
ret.draw = draw;
}
// ret.draw = parseInt(json.page.currentPage);
ret.recordsTotal = 0;
ret.recordsFiltered = 0;
if (json.page) {
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
}
return JSON.stringify(ret);
},
data: function (data) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!