Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
71fd7709 by Zelig
Options

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

2 parents 2840f7f4 b528e7d7
Inline Side-by-side
Showing 3 changed files with 90 additions and 29 deletions
application/hooks/CheckLogin.php
...@@ -36,6 +36,9 @@ class CheckLogin ...@@ -36,6 +36,9 @@ class CheckLogin
36 $session->repaymentPlans = $this->getRepaymentPlans(); 36 $session->repaymentPlans = $this->getRepaymentPlans();
37 } 37 }
38 38
39 if(!$session->repaymentPlanSource){
40 $session->repaymentPlanSource = $this->getRepaymentPlanSource();
41 }
39 42
40 43
41 /*if (preg_match("/admin|base/i", uri_string())) { 44 /*if (preg_match("/admin|base/i", uri_string())) {
...@@ -128,4 +131,15 @@ class CheckLogin ...@@ -128,4 +131,15 @@ class CheckLogin
128 } 131 }
129 } 132 }
130 133
134 private function getRepaymentPlanSource(){
135 try {
136 $url = $this->CI->config->item('apiBaseUrl') . 'enum/repaymentPlan/source';
137 $res = json_decode(file_get_contents($url));
138 $products = $res->data;
139 return $products;
140 } catch (Exception $e) {
141 return array();
142 }
143 }
144
131 } 145 }
...\ No newline at end of file ...\ No newline at end of file
......
application/views/finance/checkTheAccount.php
...@@ -3,7 +3,65 @@ ...@@ -3,7 +3,65 @@
3 <body> 3 <body>
4 <div class="page-container"> 4 <div class="page-container">
5 <form class="" onreset="resetHandler()"> 5 <form class="" onreset="resetHandler()">
6 <<<<<<< HEAD
6 <?php $this->load->view('work/search2'); ?> 7 <?php $this->load->view('work/search2'); ?>
8 =======
9 <div class="date mb-20">
10 <input type="text"
11 onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
12 id="min" class="input-text Wdate"> -
13 <input type="text"
14 onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })"
15 id="max" class="input-text Wdate">
16 </div>
17 <div class="row cl mb-20">
18 <div class="col-xs-2">
19 <span class="select-box">
20 <select class="select table_search" size="1">
21 <option value="" selected>还款状态</option>
22 <?php foreach ($this->session->repaymentPlans as $k => $v): ?>
23 <option value="<?= $k ?>"><?= $v ?></option>
24 <?php endforeach; ?>
25 </select>
26 </span>
27 </div>
28 <div class="col-xs-2">
29 <span class="select-box">
30 <select class="select table_search" name="departmentId" size="1" column="6">
31 <option value="" selected>网点</option>
32 <?php foreach ($this->session->departments as $k => $v): ?>
33 <option value="<?= $v->id ?>"><?= $v->name ?></option>
34 <?php endforeach; ?>
35 </select>
36 </span>
37 </div>
38 <div class="col-xs-2">
39 <span class="select-box">
40 <select class="select table_search" size="1">
41 <option value="" selected>是否逾期</option>
42 <option value="0">否</option>
43 <option value="1">是</option>
44 </select>
45 </span>
46 </div>
47 <div class="col-xs-2">
48 <span class="select-box">
49 <select class="select table_search" size="1">
50 <option value="" selected>来源</option>
51 <?php foreach ($this->session->repaymentPlanSource as $k => $v): ?>
52 <option value="<?= $k ?>"><?= $v ?></option>
53 <?php endforeach; ?>
54 </select>
55 </span>
56 </div>
57 <div class="col-xs-2">
58 <input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="2">
59 </div>
60 <div class="col-xs-2">
61 <input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="4">
62 </div>
63 </div>
64 >>>>>>> b528e7d7be87ddca09c05b5be0d74417e77abf3a
7 <div> 65 <div>
8 <input class="btn btn-warning radius" type="reset" value="重置"> 66 <input class="btn btn-warning radius" type="reset" value="重置">
9 </div> 67 </div>
......
application/views/finance/makeLoan.php
...@@ -23,25 +23,11 @@ ...@@ -23,25 +23,11 @@
23 <th>申请金额</th> 23 <th>申请金额</th>
24 <th>审批金额</th> 24 <th>审批金额</th>
25 <th>客户经理</th> 25 <th>客户经理</th>
26 <th>期数</th> 26 <!-- <th>期数</th>-->
27 <th>当月应还(元)</th> 27 <!-- <th>当月应还(元)</th>-->
28 </tr> 28 </tr>
29 </thead> 29 </thead>
30 <tbody class="text-c"> 30 <tbody class="text-c">
31 <tr>
32 <td></td>
33 <td></td>
34 <td></td>
35 <td></td>
36 <td></td>
37 <td></td>
38 <td></td>
39 <td></td>
40 <td></td>
41 <td></td>
42 <td></td>
43 <td></td>
44 </tr>
45 </tbody> 31 </tbody>
46 </table> 32 </table>
47 </div> 33 </div>
...@@ -58,7 +44,7 @@ ...@@ -58,7 +44,7 @@
58 iDisplayLength: 6, 44 iDisplayLength: 6,
59 bLengthChange: false, 45 bLengthChange: false,
60 ajax: { 46 ajax: {
61 url: apiBaseUrl + '/order/into/getAllApplyOrder', 47 url: apiBaseUrl + '/order/getStatus14',
62 dataFilter: function (json) { 48 dataFilter: function (json) {
63 var ret = {}, json = jQuery.parseJSON(json); 49 var ret = {}, json = jQuery.parseJSON(json);
64 ret.data = json.data; 50 ret.data = json.data;
...@@ -66,9 +52,12 @@ ...@@ -66,9 +52,12 @@
66 if(draw) { 52 if(draw) {
67 ret.draw = draw; 53 ret.draw = draw;
68 } 54 }
69 // ret.draw = parseInt(json.page.currentPage); 55 ret.recordsTotal = 0;
70 ret.recordsTotal = parseInt(json.page.totalNumber); 56 ret.recordsFiltered = 0;
71 ret.recordsFiltered = parseInt(json.page.totalNumber); 57 if (json.page) {
58 ret.recordsTotal = parseInt(json.page.totalNumber);
59 ret.recordsFiltered = parseInt(json.page.totalNumber);
60 }
72 return JSON.stringify(ret); 61 return JSON.stringify(ret);
73 }, 62 },
74 data: function (data) { 63 data: function (data) {
...@@ -78,18 +67,18 @@ ...@@ -78,18 +67,18 @@
78 } 67 }
79 }, 68 },
80 columns: [ 69 columns: [
81 {data: "orderId"},//订单编号 70 {data: "orderNo"},//订单编号
82 {data: "createUser"},//申请人 71 {data: "userName"},//申请人
83 {data: "idCard"},//身份证 72 {data: "idCard"},//身份证
84 {data: "phoneNumber"},//手机号 73 {data: "phoneNumber"},//手机号
85 {data: "createTime"},//进件时间 74 {data: "createTime"},//进件时间
86 {data: "createTime"},//网点 75 {data: "departmentName"},//网点
87 {data: "createTime"},//产品名称 76 {data: "productName"},//产品名称
88 {data: "createTime"},//申请金额 77 {data: "applyMoney"},//申请金额
89 {data: "createTime"},//审批金额 78 {data: "agreeMoney"},//审批金额
90 {data: "createTime"},//客户经理 79 {data: "createUser"}//客户经理
91 {data: "createTime"},//期数 80 // {data: "statusDesc"},//期数
92 {data: "createTime"},//当月应还 81 // {data: "modifyTime"}//当月应还
93 ] 82 ]
94 }); 83 });
95 84
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!