54ab3a4d by wang

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

2 parents eb5b1abf c849ef40
......@@ -121,7 +121,7 @@ class Work extends CI_Controller
'clientInfoOutputVO' => $ret->clientInfoOutputVO,
'clientUnitOutputVO' => $ret->clientUnitOutputVO,
'clientContactOutputVOS' => $ret->clientContactOutputVOS,
'applyOrderVO' => $ret->applyOrderVO,
'applyOrderVO' => $ret->orderVO,
'operatorRecord' => $ret2
);
$this->load->view('work/订单详情', $data);
......@@ -152,7 +152,7 @@ class Work extends CI_Controller
'clientInfoOutputVO' => $ret->clientInfoOutputVO,
'clientUnitOutputVO' => $ret->clientUnitOutputVO,
'clientContactOutputVOS' => $ret->clientContactOutputVOS,
'applyOrderVO' => $ret->applyOrderVO,
'applyOrderVO' => $ret->orderVO,
'operatorRecord' => $ret2,
'id' => $id
);
......@@ -179,8 +179,8 @@ class Work extends CI_Controller
if (!$ret->clientContactOutputVOS) {
$ret->clientContactOutputVOS = array();
}
if (!$ret->applyOrderVO) {
$ret->applyOrderVO = array();
if (!$ret->orderVO) {
$ret->orderVO = array();
}
$url2 = $this->config->item('apiBaseUrl') . 'audit/creditReport/' . $id;
......@@ -202,7 +202,7 @@ class Work extends CI_Controller
'clientInfoOutputVO' => $ret->clientInfoOutputVO,
'clientUnitOutputVO' => $ret->clientUnitOutputVO,
'clientContactOutputVOS' => $ret->clientContactOutputVOS,
'applyOrderVO' => $ret->applyOrderVO,
'applyOrderVO' => $ret->orderVO,
'credit'=> $credit,//信用报告
'id' => $id,
'dueDiligence'=>$dueDiligence //尽调报告
......@@ -227,10 +227,10 @@ class Work extends CI_Controller
$this->load->view('work/审批/交易记录', $data);
break;
case 6:
if($ret->applyOrderVO->status == 4){
if($ret->orderVO->status == 4){
$this->load->view('work/审批/录入信用报告', $data);
} else{
if($ret->applyOrderVO->status == 6){
if($ret->orderVO->status == 6){
//查询初审结果,复审结果
$getFirstCheckUrl = $this->config->item('apiBaseUrl') . 'flow/getFirstCheck/' . $id;
$getFirstCheckResult = file_get_contents($getFirstCheckUrl);
......@@ -300,26 +300,50 @@ class Work extends CI_Controller
$ret->clientContactOutputVOS = array();
}
//查询还款计划表
$str = 'borrowAmount=' . $ret->applyOrderVO->applyMoney . '&productId=' . $ret->applyOrderVO->productId . '&loanDeadline=' . $ret->applyOrderVO->deadline;
$str = 'borrowAmount=' . $ret->orderVO->agreeMoney . '&productId=' . $ret->orderVO->productId . '&loanDeadline=' . $ret->orderVO->deadline;
$url2 = $this->config->item('apiBaseUrl') . 'application/tool/interest?' . $str;
$result2 = file_get_contents($url2);
$json2 = json_decode($result2);
$ret2 = $json2->data;
var_dump($url2, $ret2);exit;
// var_dump($url2, $ret2);
$data = array(
'clientInfoOutputVO' => $ret->clientInfoOutputVO,
'clientUnitOutputVO' => $ret->clientUnitOutputVO,
'clientContactOutputVOS' => $ret->clientContactOutputVOS,
'applyOrderVO' => $ret->applyOrderVO,
'applyOrderVO' => $ret->orderVO,
'plan'=>$ret2
);
$this->load->view('work/客户确认/客户确认', $data);
}
public function move()
public function move($id)
{
$this->load->view('work/资料/资料移交');
$url = $this->config->item('apiBaseUrl') . 'order/detail/' . $id;
$result = file_get_contents($url);
$json = json_decode($result);
$ret = $json->data;
if (!$ret->clientUnitOutputVO) {
$ret->clientUnitOutputVO = array();
}
if (!$ret->clientContactOutputVOS) {
$ret->clientContactOutputVOS = array();
}
//查询还款计划表
$str = 'borrowAmount=' . $ret->orderVO->agreeMoney . '&productId=' . $ret->orderVO->productId . '&loanDeadline=' . $ret->orderVO->deadline;
$url2 = $this->config->item('apiBaseUrl') . 'application/tool/interest?' . $str;
$result2 = file_get_contents($url2);
$json2 = json_decode($result2);
$ret2 = $json2->data;
$data = array(
'clientInfoOutputVO' => $ret->clientInfoOutputVO,
'clientUnitOutputVO' => $ret->clientUnitOutputVO,
'clientContactOutputVOS' => $ret->clientContactOutputVOS,
'applyOrderVO' => $ret->orderVO,
'plan'=>$ret2
);
$this->load->view('work/资料/资料移交', $data);
}
public function side($state = null)
......@@ -415,7 +439,7 @@ class Work extends CI_Controller
'clientInfoOutputVO' => $ret->clientInfoOutputVO,
'clientUnitOutputVO' => $ret->clientUnitOutputVO,
'clientContactOutputVOS' => $ret->clientContactOutputVOS,
'applyOrderVO' => $ret->applyOrderVO,
'applyOrderVO' => $ret->orderVO,
'id'=>$id
);
......
......@@ -14,8 +14,8 @@
<th>类型</th>
<th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th>
</tr>
</tbody>
<tbody>
</thead>
<tbody class="upload-tbody">
<tr data-id="1">
<td class="text-c"><input type="checkbox"></td>
<td class="text-c">处理日志</td>
......
......@@ -35,7 +35,7 @@
<th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th>
</tr>
</thead>
<tbody>
<tbody class="upload-tbody">
</tbody>
</table>
</div>
......
......@@ -61,12 +61,14 @@
</tr>
</thead>
<tbody class="text-c">
<?php if($plan && $plan->repayPlans):?>
<?php foreach ($plan->repayPlans as $k=>$v):?>
<tr>
<td><?=$v->period?></td>
<td><?=$v->totalAmount?></td>
</tr>
<?php endforeach;?>
<?php endif;?>
</tbody>
</table>
</div>
......
<?php $this->load->view('work/尽调报告/法人'); ?>
<div class="panel panel-default mb-20">
<div class="panel-header">基本信息</div>
<div class="panel-body">
<div class="row cl">
<div class="form-group col-sm-3 col-md-2">
<label>姓名</label>
<input type="text" class="form-control input-text" name="userName" value="">
</div>
<div class="form-group col-sm-3 col-md-2">
<label>身份证</label>
<input type="text" class="form-control input-text" name="idNumber">
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-6 col-md-4">
<label>房产地址</label>
<input type="text" class="form-control input-text" name="houseAddress" value="">
</div>
<div class="form-group col-sm-3 col-md-1">
<label>&nbsp</label>
<span class="form-control select-box">
<select class="select" name="houseAddressHasReal" size="1">
<option value="">是否真实</option>
<option value="1">真实</option>
<option value="0">不真实</option>
</select>
</span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-6 col-md-4">
<label>现住地址</label>
<input type="text" class="form-control input-text" name="nowAddress" value="">
</div>
<div class="form-group col-sm-2 col-md-1">
<label>&nbsp</label>
<span class="form-control select-box">
<select class="select" size="1" name="nowAddressHasReal">
<option value="">是否真实</option>
<option value="1">真实</option>
<option value="2">不真实</option>
</select>
</span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-6 col-md-4">
<label>家人是否知晓</label>
<div class="info">
<div class="live-info">
<input type="radio" name="folkHasKnow" value="1" checked>
<span>知晓且支持</span>
</div>
<div class="live-info">
<input type="radio" name="folkHasKnow" value="0">
<span>不知晓</span>
</div>
<div class="live-info">
<input type="radio" name="folkHasKnow" value="1">
<span>知晓不支持</span>
</div>
<input type="text" name="folkHasKnowRemark" class="form-control input-text" value="" placeholder="备注">
</div>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-3 col-md-2">
<label>联系方式</label>
<input type="text" class="form-control input-text" name="userPhone" value="">
</div>
<div class="form-group col-sm-3 col-md-2">
<label>单位联系方式</label>
<input type="text" class="form-control input-text" name="unitPhone" value="">
</div>
<div class="form-group col-sm-3 col-md-2">
<label>配偶联系方式</label>
<input type="text" class="form-control input-text" name="matePhone" value="">
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-6 col-md-4">
<label>公司名称</label>
<input type="text" class="form-control input-text" name="companyName" value="">
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-6 col-md-4">
<label>公司地址</label>
<input type="text" class="form-control input-text" name="companyAddress" value="">
</div>
</div>
</div>
</div>
<div class="panel panel-default mb-20">
<div class="panel-header">工作情况</div>
......
......@@ -8,12 +8,12 @@
<div class="row cl">
<div class="form-group col-sm-4 col-md-2">
<label>申请金额</label>
<input type="text" class="form-control input-text" value="" disabled>
<input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->applyMoney : ''?>" disabled>
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>申请期限</label>
<input type="text" class="form-control input-text" value="" disabled>
<input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
......@@ -22,26 +22,27 @@
<div class="panel panel-default">
<div class="panel-header">授信信息</div>
<!-- GET /flow/getLastCheck-->
<div class="panel-body">
<div class="row cl">
<div class="form-group col-sm-4 col-md-2">
<label>核批金额</label>
<input type="text" class="form-control input-text" value="" disabled>
<input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>借款期限</label>
<input type="text" class="form-control input-text" value="" disabled>
<input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>借款利率</label>
<input type="text" class="form-control input-text" value="" disabled>
<input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
<span class="glyphicon form-control-feedback">%</span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>每月还款金额</label>
<input type="text" class="form-control input-text" value="" disabled>
<input type="text" class="form-control input-text" value="<?=$applyOrderVO ? $applyOrderVO->deadline : ''?>" disabled>
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
......@@ -59,14 +60,14 @@
</tr>
</thead>
<tbody class="text-c">
<tr>
<td>1期</td>
<td>500元</td>
</tr>
<tr>
<td>1期</td>
<td>500元</td>
</tr>
<?php if($plan && $plan->repayPlans):?>
<?php foreach ($plan->repayPlans as $k=>$v):?>
<tr>
<td><?=$v->period?></td>
<td><?=$v->totalAmount?></td>
</tr>
<?php endforeach;?>
<?php endif;?>
</tbody>
</table>
</div>
......@@ -83,8 +84,8 @@
<th>类型</th>
<th>支持相同类型图片上传多张, 格式: png/jpg 单张限制5M</th>
</tr>
</tbody>
<tbody>
</thead>
<tbody class="upload-tbody">
<tr data-id="1">
<td class="text-c"><input type="checkbox"></td>
<td class="text-c">处理日志</td>
......
......@@ -40,7 +40,7 @@ jQuery(function() {
<div class="filelist"></div>\
</td>\
</tr>'
$('tbody').append(tr);
$('tbody.upload-tbody').append(tr);
}
var $list = $('tr[data-id='+$id+'] .filelist');
......@@ -159,7 +159,7 @@ window.uploadList = function () {
html += '</div></td></tr>';
}
$('tbody').append(html);
$('tbody.upload-tbody').append(html);
$('.file-item').on('mouseenter', function () {
$(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!