ab020deb by Zelig

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

2 parents edab0910 2d1d276c
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </form> 66 </form>
67 67
68 <div class="body mt-20"> 68 <div class="body mt-20">
69 <table class="table table-border table-bordered table-bg"> 69 <table class="table table-border table-bordered table-bg" id="table">
70 <thead class="text-c"> 70 <thead class="text-c">
71 <tr> 71 <tr>
72 <th width="15px"><input type="checkbox"></th> 72 <th width="15px"><input type="checkbox"></th>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
87 </tr> 87 </tr>
88 </thead> 88 </thead>
89 <tbody class="text-c"> 89 <tbody class="text-c">
90 <tr> 90 <!--<tr>
91 <td><input type="checkbox"></td> 91 <td><input type="checkbox"></td>
92 <td> 92 <td>
93 <span class="dropDown dropDown_hover"> 93 <span class="dropDown dropDown_hover">
...@@ -113,23 +113,115 @@ ...@@ -113,23 +113,115 @@
113 <td class="c-primary">预审</td> 113 <td class="c-primary">预审</td>
114 <td>2018-01-02 00:00:00</td> 114 <td>2018-01-02 00:00:00</td>
115 <td>小明</td> 115 <td>小明</td>
116 </tr> 116 </tr>-->
117 </tbody> 117 </tbody>
118 </table> 118 </table>
119 <div class="paginate"> 119
120 <div class="paginate_info">显示 1 到 1 ,共 1 条</div>
121 <div class="paginate_pagination">
122 <a class="paginate_button">上一页</a>
123 <span>
124 <a class="paginate_button current">1</a>
125 </span>
126 <a class="paginate_button">下一页</a>
127 </div>
128 </div>
129 </div> 120 </div>
130 </div> 121 </div>
131 <?php $this->load->view('common/footer'); ?> 122 <?php $this->load->view('common/footer'); ?>
123 <script>
124 var table = $('#table').dataTable({
125 aaSorting: [[1, "desc"]],
126 serverSide: true,
127 processing: true,
128 bSort: false,
129 searching: false,//是否显示搜索
130 iDisplayLength: 6,
131 bLengthChange: false,
132 ajax: {
133 url: apiBaseUrl + '/order/getStatus8',
134 dataFilter: function (json) {
135 var ret = {}, json = jQuery.parseJSON(json);
136 ret.data = json.data || [];
137 var draw = getUrlParam('draw');
138 if(draw) {
139 ret.draw = draw;
140 }
141 ret.recordsTotal = 0;
142 ret.recordsFiltered = 0;
143 if (json.page) {
144 ret.recordsTotal = parseInt(json.page.totalNumber);
145 ret.recordsFiltered = parseInt(json.page.totalNumber);
146 }
147 return JSON.stringify(ret);
148 },
149 data: function (data) {
150 data.pageSize = data.length;
151 data.currentPage = parseFloat(data.start / data.length) + 1;
152 return data;
153 }
154 },
155 columns: [
156 {
157 // data: "id",
158 render:function (data, type, full) {
159 return '<input value="'+data+'" type="checkbox">';
160 }
161 },
162 {
163 data: "id", render: function (data, type, full) {
164 return '<span class="dropDown dropDown_hover">\
165 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
166 <ul class="dropDown-menu menu radius box-shadow">\
167 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/1?tab=0\')">查看详细</a></li>\
168 <li><a href="javascript:;" onclick="creatIframe(\'/work/verify\', \'客户确认\')">客户确认</a></li>\
169 <li><a href="#">客户取消</a></li>\
170 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/1?tab=2\')">处理记录</a></li>\
171 </ul>\
172 </span>';
173 }
174 },
175 {data: "orderNo"},//订单编号
176 {data: "userName"},//申请人
177 {data: "idCard"},//身份证
178 {data: "phoneNumber"},//手机号
179 {data: "createTime"},//进件时间
180 {data: "departmentName"},//网点
181 {data: "productName"},//产品名称
182 {data: "applyMoney"},//申请金额
183 {data: "agreeMoney"},//审批金额
184 {data: "createUser"},//客户经理
185 {data: "statusDesc"},//流程节点
186 {data: "modifyTime"},//流转时间
187 {data: "modifyUser"}//处理人
188 ]
189 });
190
191 $.fn.dataTableExt.afnFiltering.push(
192 function (oSettings, aData, iDataIndex) {
193 var min = document.getElementById('min').value;
194 var max = document.getElementById('max').value;
195 var iDateCol = 12;
132 196
197 var dateMin = new Date(aData[iDateCol]);
198 var dateMax = new Date(aData[iDateCol]);
199
200 if (min === '' && max === '')
201 return true;
202 else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
203 return true;
204 else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
205 return true;
206 return false;
207 }
208 );
209
210 $('.table_search').on('change', function () {
211 search = $(this).val();
212 column = $(this).attr('column');
213
214 $('#table').DataTable().column(column).search(search).draw();
215 });
216
217 $('#min, #max').on('keyup', function () {
218 $('#table').DataTable().draw();
219 });
220
221 function resetHandler() {
222 $('#table').DataTable().columns().search("").draw();
223 }
224 </script>
133 <script> 225 <script>
134 function pass(id) { 226 function pass(id) {
135 layer.confirm('通过之后, 将立即进入审批阶段', { 227 layer.confirm('通过之后, 将立即进入审批阶段', {
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </form> 66 </form>
67 67
68 <div class="body mt-20"> 68 <div class="body mt-20">
69 <table class="table table-border table-bordered table-bg"> 69 <table class="table table-border table-bordered table-bg" id="table">
70 <thead class="text-c"> 70 <thead class="text-c">
71 <tr> 71 <tr>
72 <th width="15px"><input type="checkbox"></th> 72 <th width="15px"><input type="checkbox"></th>
...@@ -87,60 +87,126 @@ ...@@ -87,60 +87,126 @@
87 </tr> 87 </tr>
88 </thead> 88 </thead>
89 <tbody class="text-c"> 89 <tbody class="text-c">
90 <tr> 90
91 <td><input type="checkbox"></td>
92 <td>
93 <span class="dropDown dropDown_hover">
94 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>
95 <ul class="dropDown-menu menu radius box-shadow">
96 <li><a href="javascript:;" onclick="layer_show('订单详情', '/work/detail/1?tab=0')">查看详细</a></li>
97 <li><a href="javascript:;" onclick="layer_show('资料补录', '/work/record')">马上尽调</a></li>
98 <li>
99 <a href="#">退回订单<i class="arrow Hui-iconfont">&#xe6d7;</i></a>
100 <ul class="menu">
101 <li><a href="#">退至【资料补录】阶段</a></li>
102 <li><a href="#">退至【审批-初审】阶段</a></li>
103 <li><a href="#">退至【审批-复审】阶段</a></li>
104 <li><a href="#">退至【审批-终审】阶段</a></li>
105 <li><a href="#">退至【尽调】阶段</a></li>
106 <li><a href="#">退至【客户确认】阶段</a></li>
107 <li><a href="#">退至【等待放款-移交】阶段</a></li>
108 </ul>
109 </li>
110 <li><a href="#">客户取消</a></li>
111 <li><a href="javascript:;" onclick="layer_show('订单详情', '/work/detail/1?tab=2')">处理记录</a></li>
112 </ul>
113 </span>
114 </td>
115 <td>1001</td>
116 <td>张三</td>
117 <td>333333333333333333</td>
118 <td>13333333333</td>
119 <td>2018-01-01 00:00:00</td>
120 <td>下沙网点</td>
121 <td>融易购</td>
122 <td>100.00</td>
123 <td>100.00</td>
124 <td>李四</td>
125 <td class="c-primary">预审</td>
126 <td>2018-01-02 00:00:00</td>
127 <td>小明</td>
128 </tr>
129 </tbody> 91 </tbody>
130 </table> 92 </table>
131 <div class="paginate">
132 <div class="paginate_info">显示 1 到 1 ,共 1 条</div>
133 <div class="paginate_pagination">
134 <a class="paginate_button">上一页</a>
135 <span>
136 <a class="paginate_button current">1</a>
137 </span>
138 <a class="paginate_button">下一页</a>
139 </div>
140 </div>
141 </div> 93 </div>
142 </div> 94 </div>
143 <?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/getStatus7',
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.recordsTotal = 0;
115 ret.recordsFiltered = 0;
116 if (json.page) {
117 ret.recordsTotal = parseInt(json.page.totalNumber);
118 ret.recordsFiltered = parseInt(json.page.totalNumber);
119 }
120 return JSON.stringify(ret);
121 },
122 data: function (data) {
123 data.pageSize = data.length;
124 data.currentPage = parseFloat(data.start / data.length) + 1;
125 return data;
126 }
127 },
128 columns: [
129 {
130 // data: "id",
131 render:function (data, type, full) {
132 return '<input value="'+data+'" type="checkbox">';
133 }
134 },
135 {
136 data: "id", render: function (data, type, full) {
137 return '<span class="dropDown dropDown_hover">\
138 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
139 <ul class="dropDown-menu menu radius box-shadow">\
140 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/1?tab=0\')">查看详细</a></li>\
141 <li><a href="javascript:;" onclick="layer_show(\'资料补录\', \'/work/record\')">马上尽调</a></li>\
142 <li>\
143 <a href="#">退回订单<i class="arrow Hui-iconfont">&#xe6d7;</i></a>\
144 <ul class="menu">\
145 <li><a href="#">退至【资料补录】阶段</a></li>\
146 <li><a href="#">退至【审批-初审】阶段</a></li>\
147 <li><a href="#">退至【审批-复审】阶段</a></li>\
148 <li><a href="#">退至【审批-终审】阶段</a></li>\
149 <li><a href="#">退至【尽调】阶段</a></li>\
150 <li><a href="#">退至【客户确认】阶段</a></li>\
151 <li><a href="#">退至【等待放款-移交】阶段</a></li>\
152 </ul>\
153 </li>\
154 <li><a href="#">客户取消</a></li>\
155 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/1?tab=2\')">处理记录</a></li>\
156 </ul>\
157 </span>';
158 }
159 },
160 {data: "orderNo"},//订单编号
161 {data: "userName"},//申请人
162 {data: "idCard"},//身份证
163 {data: "phoneNumber"},//手机号
164 {data: "createTime"},//进件时间
165 {data: "departmentName"},//网点
166 {data: "productName"},//产品名称
167 {data: "applyMoney"},//申请金额
168 {data: "agreeMoney"},//审批金额
169 {data: "createUser"},//客户经理
170 {data: "statusDesc"},//流程节点
171 {data: "modifyTime"},//流转时间
172 {data: "modifyUser"}//处理人
173 ]
174 });
175
176 $.fn.dataTableExt.afnFiltering.push(
177 function (oSettings, aData, iDataIndex) {
178 var min = document.getElementById('min').value;
179 var max = document.getElementById('max').value;
180 var iDateCol = 12;
181
182 var dateMin = new Date(aData[iDateCol]);
183 var dateMax = new Date(aData[iDateCol]);
184
185 if (min === '' && max === '')
186 return true;
187 else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
188 return true;
189 else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
190 return true;
191 return false;
192 }
193 );
194
195 $('.table_search').on('change', function () {
196 search = $(this).val();
197 column = $(this).attr('column');
198
199 $('#table').DataTable().column(column).search(search).draw();
200 });
201
202 $('#min, #max').on('keyup', function () {
203 $('#table').DataTable().draw();
204 });
205
206 function resetHandler() {
207 $('#table').DataTable().columns().search("").draw();
208 }
209 </script>
144 210
145 <script> 211 <script>
146 function pass(id) { 212 function pass(id) {
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </form> 66 </form>
67 67
68 <div class="body mt-20"> 68 <div class="body mt-20">
69 <table class="table table-border table-bordered table-bg"> 69 <table class="table table-border table-bordered table-bg" id="table">
70 <thead class="text-c"> 70 <thead class="text-c">
71 <tr> 71 <tr>
72 <th width="15px"><input type="checkbox"></th> 72 <th width="15px"><input type="checkbox"></th>
...@@ -87,61 +87,127 @@ ...@@ -87,61 +87,127 @@
87 </tr> 87 </tr>
88 </thead> 88 </thead>
89 <tbody class="text-c"> 89 <tbody class="text-c">
90 <tr> 90
91 <td><input type="checkbox"></td>
92 <td>
93 <span class="dropDown dropDown_hover">
94 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>
95 <ul class="dropDown-menu menu radius box-shadow">
96 <li><a href="javascript:;" onclick="layer_show('订单详情', '/work/detail/1?tab=0')">查看详细</a></li>
97 <li><a href="javascript:;" onclick="loan(1)">线下已放款</a></li>
98 <li>
99 <a href="#">退回订单<i class="arrow Hui-iconfont">&#xe6d7;</i></a>
100 <ul class="menu">
101 <li><a href="#">退至【资料补录】阶段</a></li>
102 <li><a href="#">退至【审批-初审】阶段</a></li>
103 <li><a href="#">退至【审批-复审】阶段</a></li>
104 <li><a href="#">退至【审批-终审】阶段</a></li>
105 <li><a href="#">退至【尽调】阶段</a></li>
106 <li><a href="#">退至【客户确认】阶段</a></li>
107 <li><a href="#">退至【等待放款-移交】阶段</a></li>
108 </ul>
109 </li>
110 <li><a href="#">客户取消</a></li>
111 <li><a href="javascript:;" onclick="layer_show('订单详情', '/work/detail/1?tab=2')">处理记录</a></li>
112 </ul>
113 </span>
114 </td>
115 <td>1001</td>
116 <td>张三</td>
117 <td>333333333333333333</td>
118 <td>13333333333</td>
119 <td>2018-01-01 00:00:00</td>
120 <td>下沙网点</td>
121 <td>融易购</td>
122 <td>100.00</td>
123 <td>100.00</td>
124 <td>李四</td>
125 <td class="c-primary">预审</td>
126 <td>2018-01-02 00:00:00</td>
127 <td>小明</td>
128 </tr>
129 </tbody> 91 </tbody>
130 </table> 92 </table>
131 <div class="paginate"> 93
132 <div class="paginate_info">显示 1 到 1 ,共 1 条</div>
133 <div class="paginate_pagination">
134 <a class="paginate_button">上一页</a>
135 <span>
136 <a class="paginate_button current">1</a>
137 </span>
138 <a class="paginate_button">下一页</a>
139 </div>
140 </div>
141 </div> 94 </div>
142 </div> 95 </div>
143 <?php $this->load->view('common/footer'); ?> 96 <?php $this->load->view('common/footer'); ?>
97 <script>
98 var table = $('#table').dataTable({
99 aaSorting: [[1, "desc"]],
100 serverSide: true,
101 processing: true,
102 bSort: false,
103 searching: false,//是否显示搜索
104 iDisplayLength: 6,
105 bLengthChange: false,
106 ajax: {
107 url: apiBaseUrl + '/order/getStatus10',
108 dataFilter: function (json) {
109 var ret = {}, json = jQuery.parseJSON(json);
110 ret.data = json.data || [];
111 var draw = getUrlParam('draw');
112 if(draw) {
113 ret.draw = draw;
114 }
115 ret.recordsTotal = 0;
116 ret.recordsFiltered = 0;
117 if (json.page) {
118 ret.recordsTotal = parseInt(json.page.totalNumber);
119 ret.recordsFiltered = parseInt(json.page.totalNumber);
120 }
121 return JSON.stringify(ret);
122 },
123 data: function (data) {
124 data.pageSize = data.length;
125 data.currentPage = parseFloat(data.start / data.length) + 1;
126 return data;
127 }
128 },
129 columns: [
130 {
131 // data: "id",
132 render:function (data, type, full) {
133 return '<input value="'+data+'" type="checkbox">';
134 }
135 },
136 {
137 data: "id", render: function (data, type, full) {
138 return '<span class="dropDown dropDown_hover">\
139 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
140 <ul class="dropDown-menu menu radius box-shadow">\
141 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/1?tab=0\')">查看详细</a></li>\
142 <li><a href="javascript:;" onclick="loan(1)">线下已放款</a></li>\
143 <li>\
144 <a href="#">退回订单<i class="arrow Hui-iconfont">&#xe6d7;</i></a>\
145 <ul class="menu">\
146 <li><a href="#">退至【资料补录】阶段</a></li>\
147 <li><a href="#">退至【审批-初审】阶段</a></li>\
148 <li><a href="#">退至【审批-复审】阶段</a></li>\
149 <li><a href="#">退至【审批-终审】阶段</a></li>\
150 <li><a href="#">退至【尽调】阶段</a></li>\
151 <li><a href="#">退至【客户确认】阶段</a></li>\
152 <li><a href="#">退至【等待放款-移交】阶段</a></li>\
153 </ul>\
154 </li>\
155 <li><a href="#">客户取消</a></li>\
156 <li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/1?tab=2\')">处理记录</a></li>\
157 </ul>\
158 </span>';
159 }
160 },
161 {data: "orderNo"},//订单编号
162 {data: "userName"},//申请人
163 {data: "idCard"},//身份证
164 {data: "phoneNumber"},//手机号
165 {data: "createTime"},//进件时间
166 {data: "departmentName"},//网点
167 {data: "productName"},//产品名称
168 {data: "applyMoney"},//申请金额
169 {data: "agreeMoney"},//审批金额
170 {data: "createUser"},//客户经理
171 {data: "statusDesc"},//流程节点
172 {data: "modifyTime"},//流转时间
173 {data: "modifyUser"}//处理人
174 ]
175 });
144 176
177 $.fn.dataTableExt.afnFiltering.push(
178 function (oSettings, aData, iDataIndex) {
179 var min = document.getElementById('min').value;
180 var max = document.getElementById('max').value;
181 var iDateCol = 12;
182
183 var dateMin = new Date(aData[iDateCol]);
184 var dateMax = new Date(aData[iDateCol]);
185
186 if (min === '' && max === '')
187 return true;
188 else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
189 return true;
190 else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
191 return true;
192 return false;
193 }
194 );
195
196 $('.table_search').on('change', function () {
197 search = $(this).val();
198 column = $(this).attr('column');
199
200 $('#table').DataTable().column(column).search(search).draw();
201 });
202
203 $('#min, #max').on('keyup', function () {
204 $('#table').DataTable().draw();
205 });
206
207 function resetHandler() {
208 $('#table').DataTable().columns().search("").draw();
209 }
210 </script>
145 <script> 211 <script>
146 function loan(id) { 212 function loan(id) {
147 layer_show('线下已放款', '/work/loan'); 213 layer_show('线下已放款', '/work/loan');
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <span>资料信息</span> 8 <span>资料信息</span>
9 </div> 9 </div>
10 10
11 <from> 11 <form>
12 <div class="tabCon"> 12 <div class="tabCon">
13 <div class="panel panel-default mb-20"> 13 <div class="panel panel-default mb-20">
14 <div class="panel-header">选择贷款产品</div> 14 <div class="panel-header">选择贷款产品</div>
...@@ -17,31 +17,31 @@ ...@@ -17,31 +17,31 @@
17 <div class="col-sm-4 mb-20"> 17 <div class="col-sm-4 mb-20">
18 <label class="radio"> 18 <label class="radio">
19 <input type="radio" name="1"/> 19 <input type="radio" name="1"/>
20 <img src="holder.js/180x180"> 20 <img src="/holder.js/180x180">
21 </label> 21 </label>
22 </div> 22 </div>
23 <div class="col-sm-4 mb-20"> 23 <div class="col-sm-4 mb-20">
24 <label class="radio"> 24 <label class="radio">
25 <input type="radio" name="1"/> 25 <input type="radio" name="1"/>
26 <img src="holder.js/180x180"> 26 <img src="/holder.js/180x180">
27 </label> 27 </label>
28 </div> 28 </div>
29 <div class="col-sm-4 mb-20"> 29 <div class="col-sm-4 mb-20">
30 <label class="radio"> 30 <label class="radio">
31 <input type="radio" name="1"/> 31 <input type="radio" name="1"/>
32 <img src="holder.js/180x180"> 32 <img src="/holder.js/180x180">
33 </label> 33 </label>
34 </div> 34 </div>
35 <div class="col-sm-4 mb-20"> 35 <div class="col-sm-4 mb-20">
36 <label class="radio"> 36 <label class="radio">
37 <input type="radio" name="1"/> 37 <input type="radio" name="1"/>
38 <img src="holder.js/180x180"> 38 <img src="/holder.js/180x180">
39 </label> 39 </label>
40 </div> 40 </div>
41 <div class="col-sm-4 mb-20"> 41 <div class="col-sm-4 mb-20">
42 <label class="radio"> 42 <label class="radio">
43 <input type="radio" name="1"/> 43 <input type="radio" name="1"/>
44 <img src="holder.js/180x180"> 44 <img src="/holder.js/180x180">
45 </label> 45 </label>
46 </div> 46 </div>
47 </div> 47 </div>
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
380 </div> 380 </div>
381 381
382 <div class="col-sm-offset-4 col-sm-4 pb-20"> 382 <div class="col-sm-offset-4 col-sm-4 pb-20">
383 <button class="btn btn-primary btn-block" onclick="submit()">提交</button> 383 <button class="btn btn-primary btn-block" type="button" onclick="submit()">提交</button>
384 </div> 384 </div>
385 </form> 385 </form>
386 </div> 386 </div>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <div class="flow pb-20"> 16 <div class="flow pb-20">
17 </div> 17 </div>
18 <div> 18 <div>
19 <button onclick="layer_load('资料补录', '<?=site_url("work/record")?>');" class="btn btn-primary size-M radius mr-20">重新资料补录</a> 19 <button onclick="layer_load('资料补录', '<?=site_url("work/record")?>');" class="btn btn-primary size-M radius mr-20">重新资料补录</button>
20 <button onclick="layer_close()" class="btn btn-primary size-M radius ml-20">关闭</button> 20 <button onclick="layer_close()" class="btn btn-primary size-M radius ml-20">关闭</button>
21 </div> 21 </div>
22 </div> 22 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!