Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop
Showing
3 changed files
with
158 additions
and
145 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.recordsTotal = parseInt(json.page.totalNumber); | 127 | ret.recordsFiltered = 0; |
| 128 | ret.recordsFiltered = parseInt(json.page.totalNumber); | 128 | if (json.page) { |
| 129 | ret.recordsTotal = 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 | </div> | 10 | <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'logmin\')}',maxDate:'%y-%M-%d' })" |
| 11 | <div class="row cl mb-20"> | 11 | id="logmax" class="input-text Wdate"> |
| 12 | <div class="col-xs-2"> | 12 | </div> |
| 13 | <div class="row cl mb-20"> | ||
| 14 | <div class="col-xs-2"> | ||
| 13 | <span class="select-box"> | 15 | <span class="select-box"> |
| 14 | <select class="select" size="1"> | 16 | <select class="select" size="1"> |
| 15 | <option value="" selected>网点</option> | 17 | <option value="" selected>网点</option> |
| ... | @@ -18,8 +20,8 @@ | ... | @@ -18,8 +20,8 @@ |
| 18 | <option value="3">菜单三</option> | 20 | <option value="3">菜单三</option> |
| 19 | </select> | 21 | </select> |
| 20 | </span> | 22 | </span> |
| 21 | </div> | 23 | </div> |
| 22 | <div class="col-xs-2"> | 24 | <div class="col-xs-2"> |
| 23 | <span class="select-box"> | 25 | <span class="select-box"> |
| 24 | <select class="select" size="1"> | 26 | <select class="select" size="1"> |
| 25 | <option value="" selected>产品名称</option> | 27 | <option value="" selected>产品名称</option> |
| ... | @@ -28,8 +30,8 @@ | ... | @@ -28,8 +30,8 @@ |
| 28 | <option value="3">菜单三</option> | 30 | <option value="3">菜单三</option> |
| 29 | </select> | 31 | </select> |
| 30 | </span> | 32 | </span> |
| 31 | </div> | 33 | </div> |
| 32 | <div class="col-xs-2"> | 34 | <div class="col-xs-2"> |
| 33 | <span class="select-box"> | 35 | <span class="select-box"> |
| 34 | <select class="select" size="1"> | 36 | <select class="select" size="1"> |
| 35 | <option value="" selected>客户经理</option> | 37 | <option value="" selected>客户经理</option> |
| ... | @@ -38,8 +40,8 @@ | ... | @@ -38,8 +40,8 @@ |
| 38 | <option value="3">菜单三</option> | 40 | <option value="3">菜单三</option> |
| 39 | </select> | 41 | </select> |
| 40 | </span> | 42 | </span> |
| 41 | </div> | 43 | </div> |
| 42 | <div class="col-xs-2"> | 44 | <div class="col-xs-2"> |
| 43 | <span class="select-box"> | 45 | <span class="select-box"> |
| 44 | <select class="select" size="1"> | 46 | <select class="select" size="1"> |
| 45 | <option value="" selected>流程节点</option> | 47 | <option value="" selected>流程节点</option> |
| ... | @@ -48,8 +50,8 @@ | ... | @@ -48,8 +50,8 @@ |
| 48 | <option value="3">菜单三</option> | 50 | <option value="3">菜单三</option> |
| 49 | </select> | 51 | </select> |
| 50 | </span> | 52 | </span> |
| 51 | </div> | 53 | </div> |
| 52 | <div class="col-xs-2"> | 54 | <div class="col-xs-2"> |
| 53 | <span class="select-box"> | 55 | <span class="select-box"> |
| 54 | <select class="select" size="1"> | 56 | <select class="select" size="1"> |
| 55 | <option value="" selected>处理人</option> | 57 | <option value="" selected>处理人</option> |
| ... | @@ -58,148 +60,152 @@ | ... | @@ -58,148 +60,152 @@ |
| 58 | <option value="3">菜单三</option> | 60 | <option value="3">菜单三</option> |
| 59 | </select> | 61 | </select> |
| 60 | </span> | 62 | </span> |
| 61 | </div> | ||
| 62 | </div> | 63 | </div> |
| 63 | <div> | ||
| 64 | <input class="btn btn-primary radius" type="submit" value="提交搜索"> | ||
| 65 | <input class="btn btn-warning radius" type="reset" value="重置搜索"> | ||
| 66 | </div> | ||
| 67 | </form> | ||
| 68 | |||
| 69 | <div class="body mt-20"> | ||
| 70 | <table class="table table-border table-bordered table-bg" id="table"> | ||
| 71 | <thead class="text-c"> | ||
| 72 | <tr> | ||
| 73 | <th width="15px"><input type="checkbox"></th> | ||
| 74 | <th width="68px">操作</th> | ||
| 75 | <th>订单编号</th> | ||
| 76 | <th>申请人</th> | ||
| 77 | <th>身份证</th> | ||
| 78 | <th>手机号</th> | ||
| 79 | <th>进件时间</th> | ||
| 80 | <th>网点</th> | ||
| 81 | <th>产品名称</th> | ||
| 82 | <th>申请金额</th> | ||
| 83 | <th>审批金额</th> | ||
| 84 | <th>客户经理</th> | ||
| 85 | <th>流程节点</th> | ||
| 86 | <th>流转时间</th> | ||
| 87 | <th>处理人</th> | ||
| 88 | </tr> | ||
| 89 | </thead> | ||
| 90 | <tbody class="text-c"> | ||
| 91 | </tbody> | ||
| 92 | </table> | ||
| 93 | </div> | 64 | </div> |
| 65 | <div> | ||
| 66 | <input class="btn btn-primary radius" type="submit" value="提交搜索"> | ||
| 67 | <input class="btn btn-warning radius" type="reset" value="重置搜索"> | ||
| 68 | </div> | ||
| 69 | </form> | ||
| 70 | |||
| 71 | <div class="body mt-20"> | ||
| 72 | <table class="table table-border table-bordered table-bg" id="table"> | ||
| 73 | <thead class="text-c"> | ||
| 74 | <tr> | ||
| 75 | <th width="15px"><input type="checkbox"></th> | ||
| 76 | <th width="68px">操作</th> | ||
| 77 | <th>订单编号</th> | ||
| 78 | <th>申请人</th> | ||
| 79 | <th>身份证</th> | ||
| 80 | <th>手机号</th> | ||
| 81 | <th>进件时间</th> | ||
| 82 | <th>网点</th> | ||
| 83 | <th>产品名称</th> | ||
| 84 | <th>申请金额</th> | ||
| 85 | <th>审批金额</th> | ||
| 86 | <th>客户经理</th> | ||
| 87 | <th>流程节点</th> | ||
| 88 | <th>流转时间</th> | ||
| 89 | <th>处理人</th> | ||
| 90 | </tr> | ||
| 91 | </thead> | ||
| 92 | <tbody class="text-c"> | ||
| 93 | </tbody> | ||
| 94 | </table> | ||
| 94 | </div> | 95 | </div> |
| 95 | <?php $this->load->view('common/footer'); ?> | 96 | </div> |
| 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, |
| 112 | processing: true, | 114 | processing: true, |
| 113 | bSort: false, | 115 | bSort: false, |
| 114 | searching: false,//是否显示搜索 | 116 | searching: false,//是否显示搜索 |
| 115 | iDisplayLength: 6, | 117 | iDisplayLength: 6, |
| 116 | bLengthChange: false, | 118 | bLengthChange: false, |
| 117 | ajax: { | 119 | ajax: { |
| 118 | url: apiBaseUrl + '/order/getStatus3', | 120 | url: apiBaseUrl + '/order/getStatus3', |
| 119 | dataFilter: function (json) { | 121 | dataFilter: function (json) { |
| 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); |
| 129 | return JSON.stringify(ret); | 134 | } |
| 130 | }, | 135 | return JSON.stringify(ret); |
| 131 | data: function (data) { | 136 | }, |
| 132 | data.pageSize = data.length; | 137 | data: function (data) { |
| 133 | data.currentPage = parseFloat(data.start / data.length) + 1; | 138 | data.pageSize = data.length; |
| 134 | return data; | 139 | data.currentPage = parseFloat(data.start / data.length) + 1; |
| 140 | return data; | ||
| 141 | } | ||
| 142 | }, | ||
| 143 | columns: [ | ||
| 144 | { | ||
| 145 | // data: "id", | ||
| 146 | render: function (data, type, full) { | ||
| 147 | return '<input value="' + data + '" type="checkbox">'; | ||
| 135 | } | 148 | } |
| 136 | }, | 149 | }, |
| 137 | columns: [ | 150 | { |
| 138 | { | 151 | data: "id", render: function (data, type, full) { |
| 139 | // data: "id", | 152 | return '<span class="dropDown dropDown_hover">\ |
| 140 | render:function (data, type, full) { | ||
| 141 | return '<input value="'+data+'" type="checkbox">'; | ||
| 142 | } | ||
| 143 | }, | ||
| 144 | { | ||
| 145 | data: "id", render: function (data, type, full) { | ||
| 146 | return '<span class="dropDown dropDown_hover">\ | ||
| 147 | <button class="btn radius size-M">请选择 <i class="Hui-iconfont"></i></button>\ | 153 | <button class="btn radius size-M">请选择 <i class="Hui-iconfont"></i></button>\ |
| 148 | <ul class="dropDown-menu menu radius box-shadow"><li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=0\')">查看详细</a></li>\ | 154 | <ul class="dropDown-menu menu radius box-shadow"><li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=0\')">查看详细</a></li>\ |
| 149 | <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=2\')">处理记录</a></li>\ | 155 | <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=2\')">处理记录</a></li>\ |
| 150 | <li><a href="#">客户取消</a></li>\ | 156 | <li><a href="#">客户取消</a></li>\ |
| 151 | </ul></span>'; | 157 | </ul></span>'; |
| 152 | } | 158 | } |
| 153 | }, | 159 | }, |
| 154 | {data: "orderId"},//订单编号 | 160 | {data: "orderId"},//订单编号 |
| 155 | {data: "createUser"},//申请人 | 161 | {data: "createUser"},//申请人 |
| 156 | {data: "idCard"},//身份证 | 162 | {data: "idCard"},//身份证 |
| 157 | {data: "phoneNumber"},//手机号 | 163 | {data: "phoneNumber"},//手机号 |
| 158 | {data: "createTime"},//进件时间 | 164 | {data: "createTime"},//进件时间 |
| 159 | {data: "createTime"},//网点 | 165 | {data: "createTime"},//网点 |
| 160 | {data: "createTime"},//产品名称 | 166 | {data: "createTime"},//产品名称 |
| 161 | {data: "createTime"},//申请金额 | 167 | {data: "createTime"},//申请金额 |
| 162 | {data: "createTime"},//审批金额 | 168 | {data: "createTime"},//审批金额 |
| 163 | {data: "createTime"},//客户经理 | 169 | {data: "createTime"},//客户经理 |
| 164 | {data: "createTime"},//流程节点 | 170 | {data: "createTime"},//流程节点 |
| 165 | {data: "createTime"},//流转时间 | 171 | {data: "createTime"},//流转时间 |
| 166 | {data: "createTime"}//处理人 | 172 | {data: "createTime"}//处理人 |
| 167 | ] | 173 | ] |
| 168 | }); | 174 | }); |
| 169 | 175 | ||
| 170 | $.fn.dataTableExt.afnFiltering.push( | 176 | $.fn.dataTableExt.afnFiltering.push( |
| 171 | function (oSettings, aData, iDataIndex) { | 177 | function (oSettings, aData, iDataIndex) { |
| 172 | var min = document.getElementById('min').value; | 178 | var min = document.getElementById('min').value; |
| 173 | var max = document.getElementById('max').value; | 179 | var max = document.getElementById('max').value; |
| 174 | var iDateCol = 12; | 180 | var iDateCol = 12; |
| 175 | 181 | ||
| 176 | var dateMin = new Date(aData[iDateCol]); | 182 | var dateMin = new Date(aData[iDateCol]); |
| 177 | var dateMax = new Date(aData[iDateCol]); | 183 | var dateMax = new Date(aData[iDateCol]); |
| 178 | 184 | ||
| 179 | if (min === '' && max === '') | 185 | if (min === '' && max === '') |
| 180 | return true; | 186 | return true; |
| 181 | else if (new Date(min).getTime() <= dateMin.getTime() && max === '') | 187 | else if (new Date(min).getTime() <= dateMin.getTime() && max === '') |
| 182 | return true; | 188 | return true; |
| 183 | else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime()) | 189 | else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime()) |
| 184 | return true; | 190 | return true; |
| 185 | return false; | 191 | return false; |
| 186 | } | 192 | } |
| 187 | ); | 193 | ); |
| 188 | 194 | ||
| 189 | $('.table_search').on('change', function () { | 195 | $('.table_search').on('change', function () { |
| 190 | search = $(this).val(); | 196 | search = $(this).val(); |
| 191 | column = $(this).attr('column'); | 197 | column = $(this).attr('column'); |
| 192 | 198 | ||
| 193 | $('#table').DataTable().column(column).search(search).draw(); | 199 | $('#table').DataTable().column(column).search(search).draw(); |
| 194 | }); | 200 | }); |
| 195 | 201 | ||
| 196 | $('#min, #max').on('keyup', function () { | 202 | $('#min, #max').on('keyup', function () { |
| 197 | $('#table').DataTable().draw(); | 203 | $('#table').DataTable().draw(); |
| 198 | }); | 204 | }); |
| 199 | 205 | ||
| 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 = parseInt(json.page.totalNumber); | 115 | ret.recordsTotal = 0; |
| 116 | ret.recordsFiltered = parseInt(json.page.totalNumber); | 116 | ret.recordsFiltered = 0; |
| 117 | if (json.page) { | ||
| 118 | ret.recordsTotal = 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