71366bb1 by wang

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

2 parents 64bba2e3 0794f3bc
...@@ -208,7 +208,6 @@ class Work extends CI_Controller ...@@ -208,7 +208,6 @@ class Work extends CI_Controller
208 'dueDiligence'=>$dueDiligence //尽调报告 208 'dueDiligence'=>$dueDiligence //尽调报告
209 209
210 ); 210 );
211 // array_merge($data, $dueDiligence);
212 } 211 }
213 212
214 switch ($state) { 213 switch ($state) {
...@@ -228,7 +227,28 @@ class Work extends CI_Controller ...@@ -228,7 +227,28 @@ class Work extends CI_Controller
228 $this->load->view('work/审批/交易记录', $data); 227 $this->load->view('work/审批/交易记录', $data);
229 break; 228 break;
230 case 6: 229 case 6:
231 $this->load->view('work/审批/录入信用报告', $data); 230 if($ret->applyOrderVO->status == 4){
231 $this->load->view('work/审批/录入信用报告', $data);
232 } else{
233 if($ret->applyOrderVO->status == 6){
234 //查询初审结果,复审结果
235 $getFirstCheckUrl = $this->config->item('apiBaseUrl') . 'flow/getFirstCheck/' . $id;
236 $getFirstCheckResult = file_get_contents($getFirstCheckUrl);
237 $getFirstCheckResult = json_decode($getFirstCheckResult);
238 $getFirstCheck = $getFirstCheckResult->data;
239 $data['getFirstCheck'] = $getFirstCheck;
240 //查询初审结果,复审结果
241 $getSecondCheckUrl = $this->config->item('apiBaseUrl') . 'flow/getSecoundCheck/' . $id;
242 $getSecondCheckResult = file_get_contents($getSecondCheckUrl);
243 $getSecondCheckResult = json_decode($getSecondCheckResult);
244 $getSecondCheck = $getSecondCheckResult->data;
245 $data['getSecondCheck'] = $getSecondCheck;
246
247 $this->load->view('work/审批/终审意见', $data);
248 }else{
249 $this->load->view('work/审批/意见', $data);
250 }
251 }
232 break; 252 break;
233 case 7: 253 case 7:
234 $this->load->view('work/审批/网查筛选', $data); 254 $this->load->view('work/审批/网查筛选', $data);
...@@ -279,12 +299,19 @@ class Work extends CI_Controller ...@@ -279,12 +299,19 @@ class Work extends CI_Controller
279 if (!$ret->clientContactOutputVOS) { 299 if (!$ret->clientContactOutputVOS) {
280 $ret->clientContactOutputVOS = array(); 300 $ret->clientContactOutputVOS = array();
281 } 301 }
302 //查询还款计划表
303 $str = 'borrowAmount=' . $ret->applyOrderVO->applyMoney . '&productId=' . $ret->applyOrderVO->productId . '&loanDeadline=' . $ret->applyOrderVO->deadline;
304 $url2 = $this->config->item('apiBaseUrl') . 'application/tool/interest?' . $str;
305 $result2 = file_get_contents($url2);
306 $json2 = json_decode($result2);
307 $ret2 = $json2->data;
282 308
283 $data = array( 309 $data = array(
284 'clientInfoOutputVO' => $ret->clientInfoOutputVO, 310 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
285 'clientUnitOutputVO' => $ret->clientUnitOutputVO, 311 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
286 'clientContactOutputVOS' => $ret->clientContactOutputVOS, 312 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
287 'applyOrderVO' => $ret->applyOrderVO 313 'applyOrderVO' => $ret->applyOrderVO,
314 'plan'=>$ret2
288 ); 315 );
289 $this->load->view('work/客户确认/客户确认', $data); 316 $this->load->view('work/客户确认/客户确认', $data);
290 } 317 }
......
1 <?php 1 <?php
2 2
3 var_dump($credit); 3 //var_dump($credit);
4 ?> 4 ?>
5 <form action="" id="form1"> 5 <form action="" id="form1">
6 <input type="hidden" name="orderId" value="<?=$id?>"> 6 <input type="hidden" name="orderId" value="<?=$id?>">
...@@ -14,7 +14,7 @@ var_dump($credit); ...@@ -14,7 +14,7 @@ var_dump($credit);
14 <select class="select" size="1" name="hasBankBlacklist"> 14 <select class="select" size="1" name="hasBankBlacklist">
15 <!-- <option value="1">是</option>--> 15 <!-- <option value="1">是</option>-->
16 <!-- <option value="0">否</option>--> 16 <!-- <option value="0">否</option>-->
17 <option value=""><?=$credit->hasBankBlacklist ? '是' : '否'?></option> 17 <option value=""><?=$credit && $credit->hasBankBlacklist ? '是' : '否'?></option>
18 </select> 18 </select>
19 </span> 19 </span>
20 </div> 20 </div>
...@@ -24,7 +24,7 @@ var_dump($credit); ...@@ -24,7 +24,7 @@ var_dump($credit);
24 <select class="select" size="1" name="hasTradeInto"> 24 <select class="select" size="1" name="hasTradeInto">
25 <!-- <option value="1">是</option>--> 25 <!-- <option value="1">是</option>-->
26 <!-- <option value="0">否</option>--> 26 <!-- <option value="0">否</option>-->
27 <option value=""><?=$credit->hasTradeInto ? '是' : '否'?></option> 27 <option value=""><?=$credit && $credit->hasTradeInto ? '是' : '否'?></option>
28 </select> 28 </select>
29 </span> 29 </span>
30 </div> 30 </div>
...@@ -32,7 +32,7 @@ var_dump($credit); ...@@ -32,7 +32,7 @@ var_dump($credit);
32 <label>征信五级分类异常</label> 32 <label>征信五级分类异常</label>
33 <span class="form-control select-box"> 33 <span class="form-control select-box">
34 <select class="select" size="1" name="hasCreditTypeException"> 34 <select class="select" size="1" name="hasCreditTypeException">
35 <option value=""><?=$credit->hasCreditTypeException ? '是' : '否'?></option> 35 <option value=""><?=$credit && $credit->hasCreditTypeException ? '是' : '否'?></option>
36 <!--<option value="1">是</option> 36 <!--<option value="1">是</option>
37 <option value="0">否</option>--> 37 <option value="0">否</option>-->
38 </select> 38 </select>
...@@ -58,17 +58,17 @@ var_dump($credit); ...@@ -58,17 +58,17 @@ var_dump($credit);
58 <div class="row cl"> 58 <div class="row cl">
59 <div class="form-group has-feedback col-sm-3 col-md-2"> 59 <div class="form-group has-feedback col-sm-3 col-md-2">
60 <label>总授信</label> 60 <label>总授信</label>
61 <input type="text" class="form-control input-text" name="loanTotalCreditAmount" value="value="<?=$credit ? $credit->loanTotalCreditAmount : ''?>"> 61 <input type="text" class="form-control input-text" name="loanTotalCreditAmount" value="<?=$credit ? $credit->loanTotalCreditAmount : ''?>">
62 <span class="glyphicon form-control-feedback" aria-hidden="true"></span> 62 <span class="glyphicon form-control-feedback" aria-hidden="true"></span>
63 </div> 63 </div>
64 <div class="form-group has-feedback col-sm-3 col-md-2"> 64 <div class="form-group has-feedback col-sm-3 col-md-2">
65 <label>余额</label> 65 <label>余额</label>
66 <input type="text" class="form-control input-text" name="loanBalance" value="value="<?=$credit ? $credit->loanBalance : ''?>"> 66 <input type="text" class="form-control input-text" name="loanBalance" value="<?=$credit ? $credit->loanBalance : ''?>">
67 <span class="glyphicon form-control-feedback" aria-hidden="true"></span> 67 <span class="glyphicon form-control-feedback" aria-hidden="true"></span>
68 </div> 68 </div>
69 <div class="form-group has-feedback col-sm-3 col-md-2"> 69 <div class="form-group has-feedback col-sm-3 col-md-2">
70 <label>逾期</label> 70 <label>逾期</label>
71 <input type="text" class="form-control input-text" name="loanDue" value="value="<?=$credit ? $credit->loanDue : ''?>"> 71 <input type="text" class="form-control input-text" name="loanDue" value="<?=$credit ? $credit->loanDue : ''?>">
72 <span class="glyphicon form-control-feedback" aria-hidden="true"></span> 72 <span class="glyphicon form-control-feedback" aria-hidden="true"></span>
73 </div> 73 </div>
74 </div> 74 </div>
......
...@@ -17,9 +17,10 @@ ...@@ -17,9 +17,10 @@
17 <!-- <button class="btn btn-primary radius">预览信用报告</button>--> 17 <!-- <button class="btn btn-primary radius">预览信用报告</button>-->
18 </span> 18 </span>
19 </div> 19 </div>
20 20 <?php if($applyOrderVO->status == 4): ?>
21 <?php $this->load->view('work/审批/信用报告'); ?> 21 <?php $this->load->view('work/审批/信用报告'); ?>
22 22 <?php else:?>
23 <?php endif;?>
23 <div class="row cl pb-20 col-sm-12"> 24 <div class="row cl pb-20 col-sm-12">
24 <div class="col-sm-offset-3 col-sm-2"> 25 <div class="col-sm-offset-3 col-sm-2">
25 <button class="btn btn-warning btn-block">退回订单</button> 26 <button class="btn btn-warning btn-block">退回订单</button>
......
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
3 <body> 3 <body>
4 <div class="cl pd-5 bg-1"> 4 <div class="cl pd-5 bg-1">
5 <span class="l"> 5 <span class="l">
6 <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/6/'.$id)?>', '录入信用报告');">录入信用报告</button> 6 <?php if($applyOrderVO->status == 4): ?>
7 <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/7/'.$id)?>', '网查筛查');">网查筛查</button> 7 <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/6/'.$id)?>', '录入信用报告');">录入信用报告</button>
8 <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/8/'.$id)?>', '电核');">电核</button> 8 <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/7/'.$id)?>', '网查筛查');">网查筛查</button>
9 <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/8/'.$id)?>', '电核');">电核</button>
10 <?php endif;?>
9 <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/9/'.$id)?>', '受理意见');">受理意见</button> 11 <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/9/'.$id)?>', '受理意见');">受理意见</button>
10 </span> 12 </span>
11 </div> 13 </div>
...@@ -47,7 +49,7 @@ ...@@ -47,7 +49,7 @@
47 49
48 <div class="row cl pb-20 col-sm-12"> 50 <div class="row cl pb-20 col-sm-12">
49 <div class="col-sm-offset-4 col-sm-2"> 51 <div class="col-sm-offset-4 col-sm-2">
50 <button class="btn btn-warning btn-block">退回订单</button> 52 <button class="btn btn-warning btn-block" onclick="history.back()">退回订单</button>
51 </div> 53 </div>
52 <div class="col-sm-2"> 54 <div class="col-sm-2">
53 <button class="btn btn-primary btn-block" onclick="next()">通过</button> 55 <button class="btn btn-primary btn-block" onclick="next()">通过</button>
...@@ -65,7 +67,7 @@ ...@@ -65,7 +67,7 @@
65 }, function(){ 67 }, function(){
66 var data = $('#form').serializeJson(); 68 var data = $('#form').serializeJson();
67 //发起尽调 69 //发起尽调
68 if(data.dueDiligence){ 70 if(data.dueDiligence && data.dueDiligence == '1'){
69 $.ajax({ 71 $.ajax({
70 type: 'post', 72 type: 'post',
71 url: apiBaseUrl + 'flow/firstDueDiligence', 73 url: apiBaseUrl + 'flow/firstDueDiligence',
...@@ -81,7 +83,7 @@ ...@@ -81,7 +83,7 @@
81 } else { 83 } else {
82 layer.alert('操作成功'); 84 layer.alert('操作成功');
83 } 85 }
84 if(!data.code){ 86 if(data.success){
85 setTimeout(function () { 87 setTimeout(function () {
86 loadIframe('<?=site_url('/work/check/12/'.$id);?>', '审核意见'); 88 loadIframe('<?=site_url('/work/check/12/'.$id);?>', '审核意见');
87 }, 500) 89 }, 500)
......
1 <?php $this->load->view('common/header'); ?>
2
3 <body>
4 <div class="cl pd-5 bg-1">
5 <span class="l">
6 <?php if ($applyOrderVO->status == 4): ?>
7 <button class="btn btn-primary radius"
8 onclick="loadIframe('<?= site_url('work/check/6/' . $id) ?>', '录入信用报告');">录入信用报告</button>
9 <button class="btn btn-primary radius"
10 onclick="loadIframe('<?= site_url('work/check/7/' . $id) ?>', '网查筛查');">网查筛查</button>
11 <button class="btn btn-primary radius"
12 onclick="loadIframe('<?= site_url('work/check/8/' . $id) ?>', '电核');">电核</button>
13 <?php endif; ?>
14 <button class="btn btn-primary radius"
15 onclick="loadIframe('<?= site_url('work/check/9/' . $id) ?>', '受理意见');">受理意见</button>
16 </span>
17 </div>
18
19 <form action="" id="form">
20
21
22 <div class="panel panel-default mb-20">
23 <div class="panel-header">初审意见</div>
24 <div class="panel-body cl">
25 <div class="row cl">
26 <div class="form-group col-sm-3 col-md-1">
27 <label>拟批</label>
28 <input type="text" class="form-control input-text"
29 value="<?= $getFirstCheck ? $getFirstCheck->mockMoney : '' ?>" disabled>
30 <span class="glyphicon form-control-feedback"></span>
31 </div>
32 </div>
33 <div class="row cl">
34 <div class="form-group col-sm-12 col-md-12">
35 <label>拟批备注</label>
36 <textarea class="textarea"
37 disabled><?= $getFirstCheck ? $getFirstCheck->description : '' ?></textarea>
38 </div>
39 </div>
40 </div>
41 </div>
42
43 <div class="panel panel-default mb-20">
44 <div class="panel-header">复审意见</div>
45 <div class="panel-body cl">
46 <div class="row cl">
47 <div class="form-group col-sm-3 col-md-1">
48 <label>拟批</label>
49 <input type="text" class="form-control input-text"
50 value="<?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?>" disabled>
51 <span class="glyphicon form-control-feedback"></span>
52 </div>
53 </div>
54 <div class="row cl">
55 <div class="form-group col-sm-12 col-md-12">
56 <label>拟批备注</label>
57 <textarea class="textarea"
58 disabled><?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?></textarea>
59 </div>
60 </div>
61 </div>
62 </div>
63
64 <div class="panel panel-default mb-20">
65 <div class="panel-header">终审意见</div>
66 <div class="panel-body cl">
67 <div class="row cl">
68 <div class="form-group col-sm-3 col-md-1">
69 <label>审核结果</label>
70 <span class="form-control select-box">
71 <select class="select" size="1">
72 <option value="1">通过</option>
73 <option value="0">不通过</option>
74 </select>
75 </span>
76 </div>
77 </div>
78 <div class="row cl">
79 <div class="form-group col-sm-3 col-md-1">
80 <label>核批金额</label>
81 <input type="text" class="form-control input-text" name="agreeMoney" value="">
82 <span class="glyphicon form-control-feedback"></span>
83 </div>
84 <div class="form-group col-sm-3 col-md-1">
85 <label>借款期限</label>
86 <input type="text" class="form-control input-text" name="deadLine" value="">
87 <span class="glyphicon form-control-feedback"></span>
88 </div>
89 <div class="form-group col-sm-3 col-md-1">
90 <label>借款利率</label>
91 <input type="text" class="form-control input-text" name="annualInterestRate" value="">
92 </div>
93 <div class="form-group col-sm-4 col-md-2">
94 <label>每月还款金额</label>
95 <input type="text" class="form-control input-text" name="repayMonth" value="">
96 <span class="glyphicon form-control-feedback"></span>
97 </div>
98 </div>
99 <div class="row cl">
100 <div class="form-group col-sm-3 col-md-2">
101 <label>贷款产品</label>
102 <span class="form-control select-box">
103 <select class="select" size="1" name="productId">
104 <option value="">贷款产品</option>
105 <?php foreach ($this->session->products as $k => $v): ?>
106 <option value="<?= $v->id ?>"><?= $v->productName ?></option>
107 <?php endforeach; ?>
108 </select>
109 </span>
110 </div>
111 </div>
112 <div class="row cl">
113 <div class="form-group col-sm-12 col-md-12">
114 <label>审批意见</label>
115 <textarea class="textarea" name="description"></textarea>
116 </div>
117 </div>
118 </div>
119 </div>
120 <input type="hidden" name="orderId" value="<?= $id ?>">
121 </form>
122
123 <div class="row cl pb-20 col-sm-12">
124 <div class="col-sm-offset-4 col-sm-2">
125 <button class="btn btn-warning btn-block" onclick="history.back()">退回订单</button>
126 </div>
127 <div class="col-sm-2">
128 <button class="btn btn-primary btn-block" onclick="next()">通过</button>
129 </div>
130 </div>
131
132 <?php $this->load->view('common/footer'); ?>
133
134 <script>
135 function next() {
136 layer.confirm('确认通过', {
137 btn: ['确认', '取消'],
138 title: '通过',
139 icon: 3
140 }, function () {
141 var data = $('#form').serializeJson();
142 data.status = 1;
143 var orderStatus = "<?=$applyOrderVO->status?>";
144 var url = 'flow/saveFirstCheck';
145 if (orderStatus == 4) {
146 url = url;
147 } else if (orderStatus == 5) {
148 url = 'flow/saveSecoundCheck';
149 } else if (orderStatus == 6) {
150 url = 'flow/saveLastCheck';
151 }
152 $.ajax({
153 type: 'post',
154 url: apiBaseUrl + url,
155 cache: false,
156 data: JSON.stringify(data),
157 dataType: 'json',
158 contentType: "application/json; charset=UTF-8",
159 success: function (data) {
160 if (data.msg) {
161 layer.alert(data.msg);
162 } else if (data.code != 0) {
163 layer.alert('操作失败');
164 } else {
165 layer.alert('操作成功');
166 }
167 if (!data.code) {
168 setTimeout(function () {
169 loadIframe('<?=site_url('/work/check/12/' . $id);?>', '审核意见');
170 }, 500)
171 }
172 },
173 error: function () {
174 layer.alert("操作失败")
175 }
176 })
177 });
178 }
179 </script>
180 </body>
181 </html>
...@@ -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>
...@@ -27,22 +27,22 @@ ...@@ -27,22 +27,22 @@
27 <div class="row cl"> 27 <div class="row cl">
28 <div class="form-group col-sm-4 col-md-2"> 28 <div class="form-group col-sm-4 col-md-2">
29 <label>核批金额</label> 29 <label>核批金额</label>
30 <input type="text" class="form-control input-text" value="" disabled> 30 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
31 <span class="glyphicon form-control-feedback"></span> 31 <span class="glyphicon form-control-feedback"></span>
32 </div> 32 </div>
33 <div class="form-group col-sm-4 col-md-2"> 33 <div class="form-group col-sm-4 col-md-2">
34 <label>借款期限</label> 34 <label>借款期限</label>
35 <input type="text" class="form-control input-text" value="" disabled> 35 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
36 <span class="glyphicon form-control-feedback"></span> 36 <span class="glyphicon form-control-feedback"></span>
37 </div> 37 </div>
38 <div class="form-group col-sm-4 col-md-2"> 38 <div class="form-group col-sm-4 col-md-2">
39 <label>借款利率</label> 39 <label>借款利率</label>
40 <input type="text" class="form-control input-text" value="" disabled> 40 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
41 <span class="glyphicon form-control-feedback">%</span> 41 <span class="glyphicon form-control-feedback">%</span>
42 </div> 42 </div>
43 <div class="form-group col-sm-4 col-md-2"> 43 <div class="form-group col-sm-4 col-md-2">
44 <label>每月还款金额</label> 44 <label>每月还款金额</label>
45 <input type="text" class="form-control input-text" value="" disabled> 45 <input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
46 <span class="glyphicon form-control-feedback"></span> 46 <span class="glyphicon form-control-feedback"></span>
47 </div> 47 </div>
48 </div> 48 </div>
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
50 </div> 50 </div>
51 51
52 <div class="panel panel-default"> 52 <div class="panel panel-default">
53 <div class="panel-header">还款计划表 <button class="btn btn-success">导出</button></div> 53 <div class="panel-header">还款计划表
54 <!-- <button class="btn btn-success">导出</button></div>-->
54 <div class="panel-body text-c"> 55 <div class="panel-body text-c">
55 <table class="table table-border table-bordered table-bg"> 56 <table class="table table-border table-bordered table-bg">
56 <thead class="text-c"> 57 <thead class="text-c">
...@@ -60,14 +61,12 @@ ...@@ -60,14 +61,12 @@
60 </tr> 61 </tr>
61 </thead> 62 </thead>
62 <tbody class="text-c"> 63 <tbody class="text-c">
63 <tr> 64 <?php foreach ($plan->repayPlans as $k=>$v):?>
64 <td>1期</td> 65 <tr>
65 <td>500元</td> 66 <td><?=$v->period?></td>
66 </tr> 67 <td><?=$v->totalAmount?></td>
67 <tr> 68 </tr>
68 <td>1期</td> 69 <?php endforeach;?>
69 <td>500元</td>
70 </tr>
71 </tbody> 70 </tbody>
72 </table> 71 </table>
73 </div> 72 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!