Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop
Showing
3 changed files
with
29 additions
and
16 deletions
| ... | @@ -123,9 +123,12 @@ | ... | @@ -123,9 +123,12 @@ |
| 123 | if(draw) { | 123 | if(draw) { |
| 124 | ret.draw = draw; | 124 | ret.draw = draw; |
| 125 | } | 125 | } |
| 126 | // ret.draw = parseInt(json.page.currentPage); | 126 | ret.recordsTotal = 0; |
| 127 | ret.recordsFiltered = 0; | ||
| 128 | if (json.page) { | ||
| 127 | ret.recordsTotal = parseInt(json.page.totalNumber); | 129 | ret.recordsTotal = parseInt(json.page.totalNumber); |
| 128 | ret.recordsFiltered = parseInt(json.page.totalNumber); | 130 | ret.recordsFiltered = parseInt(json.page.totalNumber); |
| 131 | } | ||
| 129 | return JSON.stringify(ret); | 132 | return JSON.stringify(ret); |
| 130 | }, | 133 | }, |
| 131 | data: function (data) { | 134 | data: function (data) { | ... | ... |
| 1 | <?php $this->load->view('common/header'); ?> | 1 | <?php $this->load->view('common/header'); ?> |
| 2 | 2 | ||
| 3 | <body> | 3 | <body> |
| 4 | <?php $this->load->view('common/work_header'); ?> | 4 | <?php $this->load->view('common/work_header'); ?> |
| 5 | <div class="page-container"> | 5 | <div class="page-container"> |
| 6 | <form class="search"> | 6 | <form class="search"> |
| 7 | <div class="date mb-20"> | 7 | <div class="date mb-20"> |
| 8 | <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'logmax\')||\'%y-%M-%d\'}' })" id="logmin" class="input-text Wdate"> - | 8 | <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'logmax\')||\'%y-%M-%d\'}' })" id="logmin" |
| 9 | <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'logmin\')}',maxDate:'%y-%M-%d' })" id="logmax" class="input-text Wdate"> | 9 | class="input-text Wdate"> - |
| 10 | <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'logmin\')}',maxDate:'%y-%M-%d' })" | ||
| 11 | id="logmax" class="input-text Wdate"> | ||
| 10 | </div> | 12 | </div> |
| 11 | <div class="row cl mb-20"> | 13 | <div class="row cl mb-20"> |
| 12 | <div class="col-xs-2"> | 14 | <div class="col-xs-2"> |
| ... | @@ -91,21 +93,21 @@ | ... | @@ -91,21 +93,21 @@ |
| 91 | </tbody> | 93 | </tbody> |
| 92 | </table> | 94 | </table> |
| 93 | </div> | 95 | </div> |
| 94 | </div> | 96 | </div> |
| 95 | <?php $this->load->view('common/footer'); ?> | 97 | <?php $this->load->view('common/footer'); ?> |
| 96 | 98 | ||
| 97 | <script> | 99 | <script> |
| 98 | function pass(id) { | 100 | function pass(id) { |
| 99 | layer.confirm('通过之后, 将立即进入审批阶段', { | 101 | layer.confirm('通过之后, 将立即进入审批阶段', { |
| 100 | btn: ['确认通过','取消'], | 102 | btn: ['确认通过', '取消'], |
| 101 | title: '确认通过预审', | 103 | title: '确认通过预审', |
| 102 | icon: 3 | 104 | icon: 3 |
| 103 | }, function(){ | 105 | }, function () { |
| 104 | layer.msg('通过'); | 106 | layer.msg('通过'); |
| 105 | }); | 107 | }); |
| 106 | } | 108 | } |
| 107 | </script> | 109 | </script> |
| 108 | <script> | 110 | <script> |
| 109 | var table = $('#table').dataTable({ | 111 | var table = $('#table').dataTable({ |
| 110 | aaSorting: [[1, "desc"]], | 112 | aaSorting: [[1, "desc"]], |
| 111 | serverSide: true, | 113 | serverSide: true, |
| ... | @@ -120,12 +122,16 @@ | ... | @@ -120,12 +122,16 @@ |
| 120 | var ret = {}, json = jQuery.parseJSON(json); | 122 | var ret = {}, json = jQuery.parseJSON(json); |
| 121 | ret.data = json.data; | 123 | ret.data = json.data; |
| 122 | var draw = getUrlParam('draw'); | 124 | var draw = getUrlParam('draw'); |
| 123 | if(draw) { | 125 | if (draw) { |
| 124 | ret.draw = draw; | 126 | ret.draw = draw; |
| 125 | } | 127 | } |
| 126 | // ret.draw = parseInt(json.page.currentPage); | 128 | // ret.draw = parseInt(json.page.currentPage); |
| 129 | ret.recordsTotal = 0; | ||
| 130 | ret.recordsFiltered = 0; | ||
| 131 | if (json.page) { | ||
| 127 | ret.recordsTotal = parseInt(json.page.totalNumber); | 132 | ret.recordsTotal = parseInt(json.page.totalNumber); |
| 128 | ret.recordsFiltered = parseInt(json.page.totalNumber); | 133 | ret.recordsFiltered = parseInt(json.page.totalNumber); |
| 134 | } | ||
| 129 | return JSON.stringify(ret); | 135 | return JSON.stringify(ret); |
| 130 | }, | 136 | }, |
| 131 | data: function (data) { | 137 | data: function (data) { |
| ... | @@ -137,8 +143,8 @@ | ... | @@ -137,8 +143,8 @@ |
| 137 | columns: [ | 143 | columns: [ |
| 138 | { | 144 | { |
| 139 | // data: "id", | 145 | // data: "id", |
| 140 | render:function (data, type, full) { | 146 | render: function (data, type, full) { |
| 141 | return '<input value="'+data+'" type="checkbox">'; | 147 | return '<input value="' + data + '" type="checkbox">'; |
| 142 | } | 148 | } |
| 143 | }, | 149 | }, |
| 144 | { | 150 | { |
| ... | @@ -200,6 +206,6 @@ | ... | @@ -200,6 +206,6 @@ |
| 200 | function resetHandler() { | 206 | function resetHandler() { |
| 201 | $('#table').DataTable().columns().search("").draw(); | 207 | $('#table').DataTable().columns().search("").draw(); |
| 202 | } | 208 | } |
| 203 | </script> | 209 | </script> |
| 204 | </body> | 210 | </body> |
| 205 | <html> | 211 | <html> | ... | ... |
| ... | @@ -112,8 +112,12 @@ | ... | @@ -112,8 +112,12 @@ |
| 112 | ret.draw = draw; | 112 | ret.draw = draw; |
| 113 | } | 113 | } |
| 114 | // ret.draw = parseInt(json.page.currentPage); | 114 | // ret.draw = parseInt(json.page.currentPage); |
| 115 | ret.recordsTotal = 0; | ||
| 116 | ret.recordsFiltered = 0; | ||
| 117 | if (json.page) { | ||
| 115 | ret.recordsTotal = parseInt(json.page.totalNumber); | 118 | ret.recordsTotal = parseInt(json.page.totalNumber); |
| 116 | ret.recordsFiltered = parseInt(json.page.totalNumber); | 119 | ret.recordsFiltered = parseInt(json.page.totalNumber); |
| 120 | } | ||
| 117 | return JSON.stringify(ret); | 121 | return JSON.stringify(ret); |
| 118 | }, | 122 | }, |
| 119 | data: function (data) { | 123 | data: function (data) { | ... | ... |
-
Please register or sign in to post a comment