489e1c9a by Zelig

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

2 parents 0628e3d5 bf108142
...@@ -109,14 +109,6 @@ ...@@ -109,14 +109,6 @@
109 searching: false,//是否显示搜索 109 searching: false,//是否显示搜索
110 iDisplayLength: 6, 110 iDisplayLength: 6,
111 bLengthChange: false, 111 bLengthChange: false,
112 //ajax: '<?//=site_url("work/data")?>//',
113 // dataSrc: function ( json ) {
114 // alert('json')
115 // for ( var i=0, ien=json.data.length ; i<ien ; i++ ) {
116 // json.data[i][0] = '<a href="/message/'+json.data[i][0]+'>View message</a>';
117 // }
118 // return json.data;
119 // },
120 ajax: { 112 ajax: {
121 url: apiBaseUrl + '/order/into/getAllApplyOrder', 113 url: apiBaseUrl + '/order/into/getAllApplyOrder',
122 dataFilter: function (json) { 114 dataFilter: function (json) {
...@@ -136,15 +128,6 @@ ...@@ -136,15 +128,6 @@
136 data.currentPage = parseFloat(data.start / data.length) + 1; 128 data.currentPage = parseFloat(data.start / data.length) + 1;
137 return data; 129 return data;
138 } 130 }
139 /*,
140 dataSrc: function (json) {
141 var ret = {};
142 ret.data = json.data;
143 ret.draw = parseInt(json.page.currentPage);
144 ret.recordsTotal = parseInt(json.page.totalNumber);
145 ret.recordsFiltered = parseInt(json.page.totalNumber);
146 return ret.data;
147 }*/
148 }, 131 },
149 columns: [ 132 columns: [
150 { 133 {
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 </form> 70 </form>
71 71
72 <div class="body mt-20"> 72 <div class="body mt-20">
73 <table class="table table-border table-bordered table-bg"> 73 <table class="table table-border table-bordered table-bg" id="table">
74 <thead class="text-c"> 74 <thead class="text-c">
75 <tr> 75 <tr>
76 <th width="15px"><input type="checkbox"></th> 76 <th width="15px"><input type="checkbox"></th>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 </tr> 91 </tr>
92 </thead> 92 </thead>
93 <tbody class="text-c"> 93 <tbody class="text-c">
94 <tr> 94 <!--<tr>
95 <td><input type="checkbox"></td> 95 <td><input type="checkbox"></td>
96 <td> 96 <td>
97 <span class="dropDown dropDown_hover"> 97 <span class="dropDown dropDown_hover">
...@@ -142,19 +142,9 @@ ...@@ -142,19 +142,9 @@
142 <td class="c-999">完成</td> 142 <td class="c-999">完成</td>
143 <td>2018-01-02 00:00:00</td> 143 <td>2018-01-02 00:00:00</td>
144 <td>小明</td> 144 <td>小明</td>
145 </tr> 145 </tr>-->
146 </tbody> 146 </tbody>
147 </table> 147 </table>
148 <div class="paginate">
149 <div class="paginate_info">显示 1 到 1 ,共 1 条</div>
150 <div class="paginate_pagination">
151 <a class="paginate_button">上一页</a>
152 <span>
153 <a class="paginate_button current">1</a>
154 </span>
155 <a class="paginate_button">下一页</a>
156 </div>
157 </div>
158 </div> 148 </div>
159 </div> 149 </div>
160 <?php $this->load->view('common/footer'); ?> 150 <?php $this->load->view('common/footer'); ?>
...@@ -180,5 +170,102 @@ ...@@ -180,5 +170,102 @@
180 }); 170 });
181 } 171 }
182 </script> 172 </script>
173
174 <script>
175 var table = $('#table').dataTable({
176 aaSorting: [[1, "desc"]],
177 serverSide: true,
178 processing: true,
179 bSort: false,
180 searching: false,//是否显示搜索
181 iDisplayLength: 6,
182 bLengthChange: false,
183 ajax: {
184 url: apiBaseUrl + '/order/getStatus1',
185 dataFilter: function (json) {
186 var ret = {}, json = jQuery.parseJSON(json);
187 ret.data = json.data;
188 var draw = getUrlParam('draw');
189 if(draw) {
190 ret.draw = draw;
191 }
192 // ret.draw = parseInt(json.page.currentPage);
193 ret.recordsTotal = parseInt(json.page.totalNumber);
194 ret.recordsFiltered = parseInt(json.page.totalNumber);
195 return JSON.stringify(ret);
196 },
197 data: function (data) {
198 data.pageSize = data.length;
199 data.currentPage = parseFloat(data.start / data.length) + 1;
200 return data;
201 }
202 },
203 columns: [
204 {
205 // data: "id",
206 render:function (data, type, full) {
207 return '<input value="'+data+'" type="checkbox">';
208 }
209 },
210 {
211 data: "id", render: function (data, type, full) {
212 return '<span class="dropDown dropDown_hover">\
213 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
214 <ul class="dropDown-menu menu radius box-shadow"><li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=0\')">查看详细</a></li>\
215 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=2\')">处理记录</a></li>\
216 <li><a href="#">客户取消</a></li>\
217 </ul></span>';
218 }
219 },
220 {data: "orderId"},//订单编号
221 {data: "createUser"},//申请人
222 {data: "idCard"},//身份证
223 {data: "phoneNumber"},//手机号
224 {data: "createTime"},//进件时间
225 {data: "createTime"},//网点
226 {data: "createTime"},//产品名称
227 {data: "createTime"},//申请金额
228 {data: "createTime"},//审批金额
229 {data: "createTime"},//客户经理
230 {data: "createTime"},//流程节点
231 {data: "createTime"},//流转时间
232 {data: "createTime"}//处理人
233 ]
234 });
235
236 $.fn.dataTableExt.afnFiltering.push(
237 function (oSettings, aData, iDataIndex) {
238 var min = document.getElementById('min').value;
239 var max = document.getElementById('max').value;
240 var iDateCol = 12;
241
242 var dateMin = new Date(aData[iDateCol]);
243 var dateMax = new Date(aData[iDateCol]);
244
245 if (min === '' && max === '')
246 return true;
247 else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
248 return true;
249 else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
250 return true;
251 return false;
252 }
253 );
254
255 $('.table_search').on('change', function () {
256 search = $(this).val();
257 column = $(this).attr('column');
258
259 $('#table').DataTable().column(column).search(search).draw();
260 });
261
262 $('#min, #max').on('keyup', function () {
263 $('#table').DataTable().draw();
264 });
265
266 function resetHandler() {
267 $('#table').DataTable().columns().search("").draw();
268 }
269 </script>
183 </body> 270 </body>
184 <html> 271 <html>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 </form> 67 </form>
68 68
69 <div class="body mt-20"> 69 <div class="body mt-20">
70 <table class="table table-border table-bordered table-bg"> 70 <table class="table table-border table-bordered table-bg" id="table">
71 <thead class="text-c"> 71 <thead class="text-c">
72 <tr> 72 <tr>
73 <th width="15px"><input type="checkbox"></th> 73 <th width="15px"><input type="checkbox"></th>
...@@ -88,72 +88,8 @@ ...@@ -88,72 +88,8 @@
88 </tr> 88 </tr>
89 </thead> 89 </thead>
90 <tbody class="text-c"> 90 <tbody class="text-c">
91 <tr>
92 <td><input type="checkbox"></td>
93 <td>
94 <span class="dropDown dropDown_hover">
95 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>
96 <ul class="dropDown-menu menu radius box-shadow">
97 <li><a href="javascript:;" onclick="layer_show('订单详情', '/work/detail/1?tab=0')">查看详细</a></li>
98 <li><a href="javascript:;" onclick="pass(1)">提交订单</a></li>
99 <li><a href="#">客户取消</a></li>
100 <li><a href="javascript:;" onclick="layer_show('订单详情', '/work/detail/1?tab=2')">处理记录</a></li>
101 </ul>
102 </span>
103 </td>
104 <td>1001</td>
105 <td>张三</td>
106 <td>333333333333333333</td>
107 <td>13333333333</td>
108 <td>2018-01-01 00:00:00</td>
109 <td>下沙网点</td>
110 <td>融易购</td>
111 <td>100.00</td>
112 <td>100.00</td>
113 <td>李四</td>
114 <td class="c-primary">预审</td>
115 <td>2018-01-02 00:00:00</td>
116 <td>小明</td>
117 </tr>
118 <tr>
119 <td><input type="checkbox"></td>
120 <td>
121 <span class="dropDown dropDown_hover">
122 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>
123 <ul class="dropDown-menu menu radius box-shadow">
124 <li><a href="javascript:;" onclick="layer_show('订单详情', '/work/detail/1?tab=0')">查看详细</a></li>
125 <li><a href="javascript:;" onclick="pass(1)">提交订单</a></li>
126 <li><a href="#">客户取消</a></li>
127 <li><a href="javascript:;" onclick="layer_show('订单详情', '/work/detail/1?tab=2')">处理记录</a></li>
128 </ul>
129 </span>
130 </td>
131 <td>1001</td>
132 <td>张三</td>
133 <td>333333333333333333</td>
134 <td>13333333333</td>
135 <td>2018-01-01 00:00:00</td>
136 <td>下沙网点</td>
137 <td>融易购</td>
138 <td>100.00</td>
139 <td>100.00</td>
140 <td>李四</td>
141 <td class="c-999">完成</td>
142 <td>2018-01-02 00:00:00</td>
143 <td>小明</td>
144 </tr>
145 </tbody> 91 </tbody>
146 </table> 92 </table>
147 <div class="paginate">
148 <div class="paginate_info">显示 1 到 1 ,共 1 条</div>
149 <div class="paginate_pagination">
150 <a class="paginate_button">上一页</a>
151 <span>
152 <a class="paginate_button current">1</a>
153 </span>
154 <a class="paginate_button">下一页</a>
155 </div>
156 </div>
157 </div> 93 </div>
158 </div> 94 </div>
159 <?php $this->load->view('common/footer'); ?> 95 <?php $this->load->view('common/footer'); ?>
...@@ -169,5 +105,101 @@ ...@@ -169,5 +105,101 @@
169 }); 105 });
170 } 106 }
171 </script> 107 </script>
108 <script>
109 var table = $('#table').dataTable({
110 aaSorting: [[1, "desc"]],
111 serverSide: true,
112 processing: true,
113 bSort: false,
114 searching: false,//是否显示搜索
115 iDisplayLength: 6,
116 bLengthChange: false,
117 ajax: {
118 url: apiBaseUrl + '/order/getStatus3',
119 dataFilter: function (json) {
120 var ret = {}, json = jQuery.parseJSON(json);
121 ret.data = json.data;
122 var draw = getUrlParam('draw');
123 if(draw) {
124 ret.draw = draw;
125 }
126 // ret.draw = parseInt(json.page.currentPage);
127 ret.recordsTotal = parseInt(json.page.totalNumber);
128 ret.recordsFiltered = parseInt(json.page.totalNumber);
129 return JSON.stringify(ret);
130 },
131 data: function (data) {
132 data.pageSize = data.length;
133 data.currentPage = parseFloat(data.start / data.length) + 1;
134 return data;
135 }
136 },
137 columns: [
138 {
139 // data: "id",
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">&#xe6d5;</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>\
149 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=2\')">处理记录</a></li>\
150 <li><a href="#">客户取消</a></li>\
151 </ul></span>';
152 }
153 },
154 {data: "orderId"},//订单编号
155 {data: "createUser"},//申请人
156 {data: "idCard"},//身份证
157 {data: "phoneNumber"},//手机号
158 {data: "createTime"},//进件时间
159 {data: "createTime"},//网点
160 {data: "createTime"},//产品名称
161 {data: "createTime"},//申请金额
162 {data: "createTime"},//审批金额
163 {data: "createTime"},//客户经理
164 {data: "createTime"},//流程节点
165 {data: "createTime"},//流转时间
166 {data: "createTime"}//处理人
167 ]
168 });
169
170 $.fn.dataTableExt.afnFiltering.push(
171 function (oSettings, aData, iDataIndex) {
172 var min = document.getElementById('min').value;
173 var max = document.getElementById('max').value;
174 var iDateCol = 12;
175
176 var dateMin = new Date(aData[iDateCol]);
177 var dateMax = new Date(aData[iDateCol]);
178
179 if (min === '' && max === '')
180 return true;
181 else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
182 return true;
183 else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
184 return true;
185 return false;
186 }
187 );
188
189 $('.table_search').on('change', function () {
190 search = $(this).val();
191 column = $(this).attr('column');
192
193 $('#table').DataTable().column(column).search(search).draw();
194 });
195
196 $('#min, #max').on('keyup', function () {
197 $('#table').DataTable().draw();
198 });
199
200 function resetHandler() {
201 $('#table').DataTable().columns().search("").draw();
202 }
203 </script>
172 </body> 204 </body>
173 <html> 205 <html>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 </form> 67 </form>
68 68
69 <div class="body mt-20"> 69 <div class="body mt-20">
70 <table class="table table-border table-bordered table-bg"> 70 <table class="table table-border table-bordered table-bg" id="table">
71 <thead class="text-c"> 71 <thead class="text-c">
72 <tr> 72 <tr>
73 <th width="68px">操作</th> 73 <th width="68px">操作</th>
...@@ -87,68 +87,107 @@ ...@@ -87,68 +87,107 @@
87 </tr> 87 </tr>
88 </thead> 88 </thead>
89 <tbody class="text-c"> 89 <tbody class="text-c">
90 <tr> 90
91 <td>
92 <span class="dropDown dropDown_hover">
93 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>
94 <ul class="dropDown-menu menu radius box-shadow">
95 <li><a href="javascript:;" onclick="layer_show('资料补录', '/work/record')">资料补录</a></li>
96 <li><a href="#">客户取消</a></li>
97 </ul>
98 </span>
99 </td>
100 <td>1001</td>
101 <td>张三</td>
102 <td>333333333333333333</td>
103 <td>13333333333</td>
104 <td>2018-01-01 00:00:00</td>
105 <td>下沙网点</td>
106 <td>融易购</td>
107 <td>100.00</td>
108 <td>100.00</td>
109 <td>李四</td>
110 <td class="c-primary">预审</td>
111 <td>2018-01-02 00:00:00</td>
112 <td>小明</td>
113 </tr>
114 <tr>
115 <td>
116 <span class="dropDown dropDown_hover">
117 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>
118 <ul class="dropDown-menu menu radius box-shadow">
119 <li><a href="javascript:;" onclick="pass(1)">资料补录</a></li>
120 <li><a href="#">客户取消</a></li>
121 </ul>
122 </span>
123 </td>
124 <td>1001</td>
125 <td>张三</td>
126 <td>333333333333333333</td>
127 <td>13333333333</td>
128 <td>2018-01-01 00:00:00</td>
129 <td>下沙网点</td>
130 <td>融易购</td>
131 <td>100.00</td>
132 <td>100.00</td>
133 <td>李四</td>
134 <td class="c-999">完成</td>
135 <td>2018-01-02 00:00:00</td>
136 <td>小明</td>
137 </tr>
138 </tbody> 91 </tbody>
139 </table> 92 </table>
140 <div class="paginate">
141 <div class="paginate_info">显示 1 到 1 ,共 1 条</div>
142 <div class="paginate_pagination">
143 <a class="paginate_button">上一页</a>
144 <span>
145 <a class="paginate_button current">1</a>
146 </span>
147 <a class="paginate_button">下一页</a>
148 </div>
149 </div>
150 </div> 93 </div>
151 </div> 94 </div>
152 <?php $this->load->view('common/footer'); ?> 95 <?php $this->load->view('common/footer'); ?>
96 <script>
97 var table = $('#table').dataTable({
98 aaSorting: [[1, "desc"]],
99 serverSide: true,
100 processing: true,
101 bSort: false,
102 searching: false,//是否显示搜索
103 iDisplayLength: 6,
104 bLengthChange: false,
105 ajax: {
106 url: apiBaseUrl + '/order/getStatus2',
107 dataFilter: function (json) {
108 var ret = {}, json = jQuery.parseJSON(json);
109 ret.data = json.data;
110 var draw = getUrlParam('draw');
111 if(draw) {
112 ret.draw = draw;
113 }
114 // ret.draw = parseInt(json.page.currentPage);
115 ret.recordsTotal = parseInt(json.page.totalNumber);
116 ret.recordsFiltered = parseInt(json.page.totalNumber);
117 return JSON.stringify(ret);
118 },
119 data: function (data) {
120 data.pageSize = data.length;
121 data.currentPage = parseFloat(data.start / data.length) + 1;
122 return data;
123 }
124 },
125 columns: [
126 {
127 // data: "id",
128 render:function (data, type, full) {
129 return '<input value="'+data+'" type="checkbox">';
130 }
131 },
132 {
133 data: "id", render: function (data, type, full) {
134 return '<span class="dropDown dropDown_hover">\
135 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
136 <ul class="dropDown-menu menu radius box-shadow"><li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=0\')">查看详细</a></li>\
137 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=2\')">处理记录</a></li>\
138 <li><a href="#">客户取消</a></li>\
139 </ul></span>';
140 }
141 },
142 {data: "orderId"},//订单编号
143 {data: "createUser"},//申请人
144 {data: "idCard"},//身份证
145 {data: "phoneNumber"},//手机号
146 {data: "createTime"},//进件时间
147 {data: "createTime"},//网点
148 {data: "createTime"},//产品名称
149 {data: "createTime"},//申请金额
150 {data: "createTime"},//审批金额
151 {data: "createTime"},//客户经理
152 {data: "createTime"},//流程节点
153 {data: "createTime"},//流转时间
154 {data: "createTime"}//处理人
155 ]
156 });
157
158 $.fn.dataTableExt.afnFiltering.push(
159 function (oSettings, aData, iDataIndex) {
160 var min = document.getElementById('min').value;
161 var max = document.getElementById('max').value;
162 var iDateCol = 12;
163
164 var dateMin = new Date(aData[iDateCol]);
165 var dateMax = new Date(aData[iDateCol]);
166
167 if (min === '' && max === '')
168 return true;
169 else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
170 return true;
171 else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
172 return true;
173 return false;
174 }
175 );
176
177 $('.table_search').on('change', function () {
178 search = $(this).val();
179 column = $(this).attr('column');
180
181 $('#table').DataTable().column(column).search(search).draw();
182 });
183
184 $('#min, #max').on('keyup', function () {
185 $('#table').DataTable().draw();
186 });
187
188 function resetHandler() {
189 $('#table').DataTable().columns().search("").draw();
190 }
191 </script>
153 </body> 192 </body>
154 <html> 193 <html>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!