Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
54ab3a4d by wang
Options

Merge remote-tracking branch 'origin/develop' into develop

2 parents eb5b1abf c849ef40
Inline Side-by-side
Showing 7 changed files with 161 additions and 35 deletions
application/controllers/Work.php
...@@ -121,7 +121,7 @@ class Work extends CI_Controller ...@@ -121,7 +121,7 @@ class Work extends CI_Controller
121 'clientInfoOutputVO' => $ret->clientInfoOutputVO, 121 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
122 'clientUnitOutputVO' => $ret->clientUnitOutputVO, 122 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
123 'clientContactOutputVOS' => $ret->clientContactOutputVOS, 123 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
124 'applyOrderVO' => $ret->applyOrderVO, 124 'applyOrderVO' => $ret->orderVO,
125 'operatorRecord' => $ret2 125 'operatorRecord' => $ret2
126 ); 126 );
127 $this->load->view('work/订单详情', $data); 127 $this->load->view('work/订单详情', $data);
...@@ -152,7 +152,7 @@ class Work extends CI_Controller ...@@ -152,7 +152,7 @@ class Work extends CI_Controller
152 'clientInfoOutputVO' => $ret->clientInfoOutputVO, 152 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
153 'clientUnitOutputVO' => $ret->clientUnitOutputVO, 153 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
154 'clientContactOutputVOS' => $ret->clientContactOutputVOS, 154 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
155 'applyOrderVO' => $ret->applyOrderVO, 155 'applyOrderVO' => $ret->orderVO,
156 'operatorRecord' => $ret2, 156 'operatorRecord' => $ret2,
157 'id' => $id 157 'id' => $id
158 ); 158 );
...@@ -179,8 +179,8 @@ class Work extends CI_Controller ...@@ -179,8 +179,8 @@ class Work extends CI_Controller
179 if (!$ret->clientContactOutputVOS) { 179 if (!$ret->clientContactOutputVOS) {
180 $ret->clientContactOutputVOS = array(); 180 $ret->clientContactOutputVOS = array();
181 } 181 }
182 if (!$ret->applyOrderVO) { 182 if (!$ret->orderVO) {
183 $ret->applyOrderVO = array(); 183 $ret->orderVO = array();
184 } 184 }
185 185
186 $url2 = $this->config->item('apiBaseUrl') . 'audit/creditReport/' . $id; 186 $url2 = $this->config->item('apiBaseUrl') . 'audit/creditReport/' . $id;
...@@ -202,7 +202,7 @@ class Work extends CI_Controller ...@@ -202,7 +202,7 @@ class Work extends CI_Controller
202 'clientInfoOutputVO' => $ret->clientInfoOutputVO, 202 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
203 'clientUnitOutputVO' => $ret->clientUnitOutputVO, 203 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
204 'clientContactOutputVOS' => $ret->clientContactOutputVOS, 204 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
205 'applyOrderVO' => $ret->applyOrderVO, 205 'applyOrderVO' => $ret->orderVO,
206 'credit'=> $credit,//信用报告 206 'credit'=> $credit,//信用报告
207 'id' => $id, 207 'id' => $id,
208 'dueDiligence'=>$dueDiligence //尽调报告 208 'dueDiligence'=>$dueDiligence //尽调报告
...@@ -227,10 +227,10 @@ class Work extends CI_Controller ...@@ -227,10 +227,10 @@ class Work extends CI_Controller
227 $this->load->view('work/审批/交易记录', $data); 227 $this->load->view('work/审批/交易记录', $data);
228 break; 228 break;
229 case 6: 229 case 6:
230 if($ret->applyOrderVO->status == 4){ 230 if($ret->orderVO->status == 4){
231 $this->load->view('work/审批/录入信用报告', $data); 231 $this->load->view('work/审批/录入信用报告', $data);
232 } else{ 232 } else{
233 if($ret->applyOrderVO->status == 6){ 233 if($ret->orderVO->status == 6){
234 //查询初审结果，复审结果 234 //查询初审结果，复审结果
235 $getFirstCheckUrl = $this->config->item('apiBaseUrl') . 'flow/getFirstCheck/' . $id; 235 $getFirstCheckUrl = $this->config->item('apiBaseUrl') . 'flow/getFirstCheck/' . $id;
236 $getFirstCheckResult = file_get_contents($getFirstCheckUrl); 236 $getFirstCheckResult = file_get_contents($getFirstCheckUrl);
...@@ -300,26 +300,50 @@ class Work extends CI_Controller ...@@ -300,26 +300,50 @@ class Work extends CI_Controller
300 $ret->clientContactOutputVOS = array(); 300 $ret->clientContactOutputVOS = array();
301 } 301 }
302 //查询还款计划表 302 //查询还款计划表
303 $str = 'borrowAmount=' . $ret->applyOrderVO->applyMoney . '&productId=' . $ret->applyOrderVO->productId . '&loanDeadline=' . $ret->applyOrderVO->deadline; 303 $str = 'borrowAmount=' . $ret->orderVO->agreeMoney . '&productId=' . $ret->orderVO->productId . '&loanDeadline=' . $ret->orderVO->deadline;
304 $url2 = $this->config->item('apiBaseUrl') . 'application/tool/interest?' . $str; 304 $url2 = $this->config->item('apiBaseUrl') . 'application/tool/interest?' . $str;
305 $result2 = file_get_contents($url2); 305 $result2 = file_get_contents($url2);
306 $json2 = json_decode($result2); 306 $json2 = json_decode($result2);
307 $ret2 = $json2->data; 307 $ret2 = $json2->data;
308 var_dump($url2, $ret2);exit; 308 // var_dump($url2, $ret2);
309 309
310 $data = array( 310 $data = array(
311 'clientInfoOutputVO' => $ret->clientInfoOutputVO, 311 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
312 'clientUnitOutputVO' => $ret->clientUnitOutputVO, 312 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
313 'clientContactOutputVOS' => $ret->clientContactOutputVOS, 313 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
314 'applyOrderVO' => $ret->applyOrderVO, 314 'applyOrderVO' => $ret->orderVO,
315 'plan'=>$ret2 315 'plan'=>$ret2
316 ); 316 );
317 $this->load->view('work/客户确认/客户确认', $data); 317 $this->load->view('work/客户确认/客户确认', $data);
318 } 318 }
319 319
320 public function move() 320 public function move($id)
321 { 321 {
322 $this->load->view('work/资料/资料移交'); 322 $url = $this->config->item('apiBaseUrl') . 'order/detail/' . $id;
323 $result = file_get_contents($url);
324 $json = json_decode($result);
325 $ret = $json->data;
326 if (!$ret->clientUnitOutputVO) {
327 $ret->clientUnitOutputVO = array();
328 }
329 if (!$ret->clientContactOutputVOS) {
330 $ret->clientContactOutputVOS = array();
331 }
332 //查询还款计划表
333 $str = 'borrowAmount=' . $ret->orderVO->agreeMoney . '&productId=' . $ret->orderVO->productId . '&loanDeadline=' . $ret->orderVO->deadline;
334 $url2 = $this->config->item('apiBaseUrl') . 'application/tool/interest?' . $str;
335 $result2 = file_get_contents($url2);
336 $json2 = json_decode($result2);
337 $ret2 = $json2->data;
338
339 $data = array(
340 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
341 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
342 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
343 'applyOrderVO' => $ret->orderVO,
344 'plan'=>$ret2
345 );
346 $this->load->view('work/资料/资料移交', $data);
323 } 347 }
324 348
325 public function side($state = null) 349 public function side($state = null)
...@@ -415,7 +439,7 @@ class Work extends CI_Controller ...@@ -415,7 +439,7 @@ class Work extends CI_Controller
415 'clientInfoOutputVO' => $ret->clientInfoOutputVO, 439 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
416 'clientUnitOutputVO' => $ret->clientUnitOutputVO, 440 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
417 'clientContactOutputVOS' => $ret->clientContactOutputVOS, 441 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
418 'applyOrderVO' => $ret->applyOrderVO, 442 'applyOrderVO' => $ret->orderVO,
419 'id'=>$id 443 'id'=>$id
420 ); 444 );
421 445
......
application/views/loan/资料移交.php
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
14 <th>类型</th> 14 <th>类型</th>
15 <th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th> 15 <th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th>
16 </tr> 16 </tr>
17 </tbody> 17 </thead>
18 <tbody> 18 <tbody class="upload-tbody">
19 <tr data-id="1"> 19 <tr data-id="1">
20 <td class="text-c"><input type="checkbox"></td> 20 <td class="text-c"><input type="checkbox"></td>
21 <td class="text-c">处理日志</td> 21 <td class="text-c">处理日志</td>
......
application/views/work/图片上传.php
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 <th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th> 35 <th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th>
36 </tr> 36 </tr>
37 </thead> 37 </thead>
38 <tbody> 38 <tbody class="upload-tbody">
39 </tbody> 39 </tbody>
40 </table> 40 </table>
41 </div> 41 </div>
......
application/views/work/客户确认/客户确认.php
...@@ -61,12 +61,14 @@ ...@@ -61,12 +61,14 @@
61 </tr> 61 </tr>
62 </thead> 62 </thead>
63 <tbody class="text-c"> 63 <tbody class="text-c">
64 <?php if($plan && $plan->repayPlans):?>
64 <?php foreach ($plan->repayPlans as $k=>$v):?> 65 <?php foreach ($plan->repayPlans as $k=>$v):?>
65 <tr> 66 <tr>
66 <td><?=$v->period?> 期</td> 67 <td><?=$v->period?> 期</td>
67 <td><?=$v->totalAmount?>元</td> 68 <td><?=$v->totalAmount?>元</td>
68 </tr> 69 </tr>
69 <?php endforeach;?> 70 <?php endforeach;?>
71 <?php endif;?>
70 </tbody> 72 </tbody>
71 </table> 73 </table>
72 </div> 74 </div>
......
application/views/work/尽调报告/打工.php
1 <?php $this->load->view('work/尽调报告/法人'); ?> 1 <div class="panel panel-default mb-20">
2 <div class="panel-header">基本信息</div>
3 <div class="panel-body">
4 <div class="row cl">
5 <div class="form-group col-sm-3 col-md-2">
6 <label>姓名</label>
7 <input type="text" class="form-control input-text" name="userName" value="">
8 </div>
9 <div class="form-group col-sm-3 col-md-2">
10 <label>身份证</label>
11 <input type="text" class="form-control input-text" name="idNumber">
12 </div>
13 </div>
14
15 <div class="row cl">
16 <div class="form-group col-sm-6 col-md-4">
17 <label>房产地址</label>
18 <input type="text" class="form-control input-text" name="houseAddress" value="">
19 </div>
20 <div class="form-group col-sm-3 col-md-1">
21 <label>&nbsp</label>
22 <span class="form-control select-box">
23 <select class="select" name="houseAddressHasReal" size="1">
24 <option value="">是否真实</option>
25 <option value="1">真实</option>
26 <option value="0">不真实</option>
27 </select>
28 </span>
29 </div>
30 </div>
31
32 <div class="row cl">
33 <div class="form-group col-sm-6 col-md-4">
34 <label>现住地址</label>
35 <input type="text" class="form-control input-text" name="nowAddress" value="">
36 </div>
37 <div class="form-group col-sm-2 col-md-1">
38 <label>&nbsp</label>
39 <span class="form-control select-box">
40 <select class="select" size="1" name="nowAddressHasReal">
41 <option value="">是否真实</option>
42 <option value="1">真实</option>
43 <option value="2">不真实</option>
44 </select>
45 </span>
46 </div>
47 </div>
48
49 <div class="row cl">
50 <div class="form-group col-sm-6 col-md-4">
51 <label>家人是否知晓</label>
52 <div class="info">
53 <div class="live-info">
54 <input type="radio" name="folkHasKnow" value="1" checked>
55 <span>知晓且支持</span>
56 </div>
57 <div class="live-info">
58 <input type="radio" name="folkHasKnow" value="0">
59 <span>不知晓</span>
60 </div>
61 <div class="live-info">
62 <input type="radio" name="folkHasKnow" value="1">
63 <span>知晓不支持</span>
64 </div>
65 <input type="text" name="folkHasKnowRemark" class="form-control input-text" value="" placeholder="备注">
66 </div>
67 </div>
68 </div>
69
70 <div class="row cl">
71 <div class="form-group col-sm-3 col-md-2">
72 <label>联系方式</label>
73 <input type="text" class="form-control input-text" name="userPhone" value="">
74 </div>
75 <div class="form-group col-sm-3 col-md-2">
76 <label>单位联系方式</label>
77 <input type="text" class="form-control input-text" name="unitPhone" value="">
78 </div>
79 <div class="form-group col-sm-3 col-md-2">
80 <label>配偶联系方式</label>
81 <input type="text" class="form-control input-text" name="matePhone" value="">
82 </div>
83 </div>
84
85 <div class="row cl">
86 <div class="form-group col-sm-6 col-md-4">
87 <label>公司名称</label>
88 <input type="text" class="form-control input-text" name="companyName" value="">
89 </div>
90 </div>
91
92 <div class="row cl">
93 <div class="form-group col-sm-6 col-md-4">
94 <label>公司地址</label>
95 <input type="text" class="form-control input-text" name="companyAddress" value="">
96 </div>
97 </div>
98 </div>
99 </div>
100
2 101
3 <div class="panel panel-default mb-20"> 102 <div class="panel panel-default mb-20">
4 <div class="panel-header">工作情况</div> 103 <div class="panel-header">工作情况</div>
......
application/views/work/资料/资料移交.php
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
8 <div class="row cl"> 8 <div class="row cl">
9 <div class="form-group col-sm-4 col-md-2"> 9 <div class="form-group col-sm-4 col-md-2">
10 <label>申请金额</label> 10 <label>申请金额</label>
11 <input type="text" class="form-control input-text" value="" disabled> 11 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->applyMoney : ''?>" disabled>
12 <span class="glyphicon form-control-feedback">元</span> 12 <span class="glyphicon form-control-feedback">元</span>
13 </div> 13 </div>
14 <div class="form-group col-sm-4 col-md-2"> 14 <div class="form-group col-sm-4 col-md-2">
15 <label>申请期限</label> 15 <label>申请期限</label>
16 <input type="text" class="form-control input-text" value="" disabled> 16 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
17 <span class="glyphicon form-control-feedback">天</span> 17 <span class="glyphicon form-control-feedback">天</span>
18 </div> 18 </div>
19 </div> 19 </div>
...@@ -22,26 +22,27 @@ ...@@ -22,26 +22,27 @@
22 22
23 <div class="panel panel-default"> 23 <div class="panel panel-default">
24 <div class="panel-header">授信信息</div> 24 <div class="panel-header">授信信息</div>
25 <!-- GET /flow/getLastCheck-->
25 <div class="panel-body"> 26 <div class="panel-body">
26 <div class="row cl"> 27 <div class="row cl">
27 <div class="form-group col-sm-4 col-md-2"> 28 <div class="form-group col-sm-4 col-md-2">
28 <label>核批金额</label> 29 <label>核批金额</label>
29 <input type="text" class="form-control input-text" value="" disabled> 30 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
30 <span class="glyphicon form-control-feedback">元</span> 31 <span class="glyphicon form-control-feedback">元</span>
31 </div> 32 </div>
32 <div class="form-group col-sm-4 col-md-2"> 33 <div class="form-group col-sm-4 col-md-2">
33 <label>借款期限</label> 34 <label>借款期限</label>
34 <input type="text" class="form-control input-text" value="" disabled> 35 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
35 <span class="glyphicon form-control-feedback">天</span> 36 <span class="glyphicon form-control-feedback">天</span>
36 </div> 37 </div>
37 <div class="form-group col-sm-4 col-md-2"> 38 <div class="form-group col-sm-4 col-md-2">
38 <label>借款利率</label> 39 <label>借款利率</label>
39 <input type="text" class="form-control input-text" value="" disabled> 40 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
40 <span class="glyphicon form-control-feedback">%</span> 41 <span class="glyphicon form-control-feedback">%</span>
41 </div> 42 </div>
42 <div class="form-group col-sm-4 col-md-2"> 43 <div class="form-group col-sm-4 col-md-2">
43 <label>每月还款金额</label> 44 <label>每月还款金额</label>
44 <input type="text" class="form-control input-text" value="" disabled> 45 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
45 <span class="glyphicon form-control-feedback">元</span> 46 <span class="glyphicon form-control-feedback">元</span>
46 </div> 47 </div>
47 </div> 48 </div>
...@@ -59,14 +60,14 @@ ...@@ -59,14 +60,14 @@
59 </tr> 60 </tr>
60 </thead> 61 </thead>
61 <tbody class="text-c"> 62 <tbody class="text-c">
62 <tr> 63 <?php if($plan && $plan->repayPlans):?>
63 <td>1期</td> 64 <?php foreach ($plan->repayPlans as $k=>$v):?>
64 <td>500元</td> 65 <tr>
65 </tr> 66 <td><?=$v->period?> 期</td>
66 <tr> 67 <td><?=$v->totalAmount?>元</td>
67 <td>1期</td> 68 </tr>
68 <td>500元</td> 69 <?php endforeach;?>
69 </tr> 70 <?php endif;?>
70 </tbody> 71 </tbody>
71 </table> 72 </table>
72 </div> 73 </div>
...@@ -83,8 +84,8 @@ ...@@ -83,8 +84,8 @@
83 <th>类型</th> 84 <th>类型</th>
84 <th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th> 85 <th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th>
85 </tr> 86 </tr>
86 </tbody> 87 </thead>
87 <tbody> 88 <tbody class="upload-tbody">
88 <tr data-id="1"> 89 <tr data-id="1">
89 <td class="text-c"><input type="checkbox"></td> 90 <td class="text-c"><input type="checkbox"></td>
90 <td class="text-c">处理日志</td> 91 <td class="text-c">处理日志</td>
......
resource/upload.js
...@@ -40,7 +40,7 @@ jQuery(function() { ...@@ -40,7 +40,7 @@ jQuery(function() {
40 <div class="filelist"></div>\ 40 <div class="filelist"></div>\
41 </td>\ 41 </td>\
42 </tr>' 42 </tr>'
43 $('tbody').append(tr); 43 $('tbody.upload-tbody').append(tr);
44 } 44 }
45 45
46 var $list = $('tr[data-id='+$id+'] .filelist'); 46 var $list = $('tr[data-id='+$id+'] .filelist');
...@@ -159,7 +159,7 @@ window.uploadList = function () { ...@@ -159,7 +159,7 @@ window.uploadList = function () {
159 html += '</div></td></tr>'; 159 html += '</div></td></tr>';
160 } 160 }
161 161
162 $('tbody').append(html); 162 $('tbody.upload-tbody').append(html);
163 163
164 $('.file-item').on('mouseenter', function () { 164 $('.file-item').on('mouseenter', function () {
165 $(this).find('.file-panel').stop().animate({height: 30}); 165 $(this).find('.file-panel').stop().animate({height: 30});
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!