71366bb1 by wang

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

2 parents 64bba2e3 0794f3bc
......@@ -208,7 +208,6 @@ class Work extends CI_Controller
'dueDiligence'=>$dueDiligence //尽调报告
);
// array_merge($data, $dueDiligence);
}
switch ($state) {
......@@ -228,7 +227,28 @@ class Work extends CI_Controller
$this->load->view('work/审批/交易记录', $data);
break;
case 6:
$this->load->view('work/审批/录入信用报告', $data);
if($ret->applyOrderVO->status == 4){
$this->load->view('work/审批/录入信用报告', $data);
} else{
if($ret->applyOrderVO->status == 6){
//查询初审结果,复审结果
$getFirstCheckUrl = $this->config->item('apiBaseUrl') . 'flow/getFirstCheck/' . $id;
$getFirstCheckResult = file_get_contents($getFirstCheckUrl);
$getFirstCheckResult = json_decode($getFirstCheckResult);
$getFirstCheck = $getFirstCheckResult->data;
$data['getFirstCheck'] = $getFirstCheck;
//查询初审结果,复审结果
$getSecondCheckUrl = $this->config->item('apiBaseUrl') . 'flow/getSecoundCheck/' . $id;
$getSecondCheckResult = file_get_contents($getSecondCheckUrl);
$getSecondCheckResult = json_decode($getSecondCheckResult);
$getSecondCheck = $getSecondCheckResult->data;
$data['getSecondCheck'] = $getSecondCheck;
$this->load->view('work/审批/终审意见', $data);
}else{
$this->load->view('work/审批/意见', $data);
}
}
break;
case 7:
$this->load->view('work/审批/网查筛选', $data);
......@@ -279,12 +299,19 @@ class Work extends CI_Controller
if (!$ret->clientContactOutputVOS) {
$ret->clientContactOutputVOS = array();
}
//查询还款计划表
$str = 'borrowAmount=' . $ret->applyOrderVO->applyMoney . '&productId=' . $ret->applyOrderVO->productId . '&loanDeadline=' . $ret->applyOrderVO->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->applyOrderVO
'applyOrderVO' => $ret->applyOrderVO,
'plan'=>$ret2
);
$this->load->view('work/客户确认/客户确认', $data);
}
......
<?php
var_dump($credit);
//var_dump($credit);
?>
<form action="" id="form1">
<input type="hidden" name="orderId" value="<?=$id?>">
......@@ -14,7 +14,7 @@ var_dump($credit);
<select class="select" size="1" name="hasBankBlacklist">
<!-- <option value="1">是</option>-->
<!-- <option value="0">否</option>-->
<option value=""><?=$credit->hasBankBlacklist ? '是' : '否'?></option>
<option value=""><?=$credit && $credit->hasBankBlacklist ? '是' : '否'?></option>
</select>
</span>
</div>
......@@ -24,7 +24,7 @@ var_dump($credit);
<select class="select" size="1" name="hasTradeInto">
<!-- <option value="1">是</option>-->
<!-- <option value="0">否</option>-->
<option value=""><?=$credit->hasTradeInto ? '是' : '否'?></option>
<option value=""><?=$credit && $credit->hasTradeInto ? '是' : '否'?></option>
</select>
</span>
</div>
......@@ -32,7 +32,7 @@ var_dump($credit);
<label>征信五级分类异常</label>
<span class="form-control select-box">
<select class="select" size="1" name="hasCreditTypeException">
<option value=""><?=$credit->hasCreditTypeException ? '是' : '否'?></option>
<option value=""><?=$credit && $credit->hasCreditTypeException ? '是' : '否'?></option>
<!--<option value="1">是</option>
<option value="0">否</option>-->
</select>
......@@ -58,17 +58,17 @@ var_dump($credit);
<div class="row cl">
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>总授信</label>
<input type="text" class="form-control input-text" name="loanTotalCreditAmount" value="value="<?=$credit ? $credit->loanTotalCreditAmount : ''?>">
<input type="text" class="form-control input-text" name="loanTotalCreditAmount" value="<?=$credit ? $credit->loanTotalCreditAmount : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>余额</label>
<input type="text" class="form-control input-text" name="loanBalance" value="value="<?=$credit ? $credit->loanBalance : ''?>">
<input type="text" class="form-control input-text" name="loanBalance" value="<?=$credit ? $credit->loanBalance : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>逾期</label>
<input type="text" class="form-control input-text" name="loanDue" value="value="<?=$credit ? $credit->loanDue : ''?>">
<input type="text" class="form-control input-text" name="loanDue" value="<?=$credit ? $credit->loanDue : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
......
......@@ -17,9 +17,10 @@
<!-- <button class="btn btn-primary radius">预览信用报告</button>-->
</span>
</div>
<?php $this->load->view('work/审批/信用报告'); ?>
<?php if($applyOrderVO->status == 4): ?>
<?php $this->load->view('work/审批/信用报告'); ?>
<?php else:?>
<?php endif;?>
<div class="row cl pb-20 col-sm-12">
<div class="col-sm-offset-3 col-sm-2">
<button class="btn btn-warning btn-block">退回订单</button>
......
......@@ -3,9 +3,11 @@
<body>
<div class="cl pd-5 bg-1">
<span class="l">
<button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/6/'.$id)?>', '录入信用报告');">录入信用报告</button>
<button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/7/'.$id)?>', '网查筛查');">网查筛查</button>
<button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/8/'.$id)?>', '电核');">电核</button>
<?php if($applyOrderVO->status == 4): ?>
<button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/6/'.$id)?>', '录入信用报告');">录入信用报告</button>
<button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/7/'.$id)?>', '网查筛查');">网查筛查</button>
<button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/8/'.$id)?>', '电核');">电核</button>
<?php endif;?>
<button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/9/'.$id)?>', '受理意见');">受理意见</button>
</span>
</div>
......@@ -47,7 +49,7 @@
<div class="row cl pb-20 col-sm-12">
<div class="col-sm-offset-4 col-sm-2">
<button class="btn btn-warning btn-block">退回订单</button>
<button class="btn btn-warning btn-block" onclick="history.back()">退回订单</button>
</div>
<div class="col-sm-2">
<button class="btn btn-primary btn-block" onclick="next()">通过</button>
......@@ -65,7 +67,7 @@
}, function(){
var data = $('#form').serializeJson();
//发起尽调
if(data.dueDiligence){
if(data.dueDiligence && data.dueDiligence == '1'){
$.ajax({
type: 'post',
url: apiBaseUrl + 'flow/firstDueDiligence',
......@@ -81,7 +83,7 @@
} else {
layer.alert('操作成功');
}
if(!data.code){
if(data.success){
setTimeout(function () {
loadIframe('<?=site_url('/work/check/12/'.$id);?>', '审核意见');
}, 500)
......
<?php $this->load->view('common/header'); ?>
<body>
<div class="cl pd-5 bg-1">
<span class="l">
<?php if ($applyOrderVO->status == 4): ?>
<button class="btn btn-primary radius"
onclick="loadIframe('<?= site_url('work/check/6/' . $id) ?>', '录入信用报告');">录入信用报告</button>
<button class="btn btn-primary radius"
onclick="loadIframe('<?= site_url('work/check/7/' . $id) ?>', '网查筛查');">网查筛查</button>
<button class="btn btn-primary radius"
onclick="loadIframe('<?= site_url('work/check/8/' . $id) ?>', '电核');">电核</button>
<?php endif; ?>
<button class="btn btn-primary radius"
onclick="loadIframe('<?= site_url('work/check/9/' . $id) ?>', '受理意见');">受理意见</button>
</span>
</div>
<form action="" id="form">
<div class="panel panel-default mb-20">
<div class="panel-header">初审意见</div>
<div class="panel-body cl">
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<label>拟批</label>
<input type="text" class="form-control input-text"
value="<?= $getFirstCheck ? $getFirstCheck->mockMoney : '' ?>" disabled>
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-12 col-md-12">
<label>拟批备注</label>
<textarea class="textarea"
disabled><?= $getFirstCheck ? $getFirstCheck->description : '' ?></textarea>
</div>
</div>
</div>
</div>
<div class="panel panel-default mb-20">
<div class="panel-header">复审意见</div>
<div class="panel-body cl">
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<label>拟批</label>
<input type="text" class="form-control input-text"
value="<?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?>" disabled>
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-12 col-md-12">
<label>拟批备注</label>
<textarea class="textarea"
disabled><?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?></textarea>
</div>
</div>
</div>
</div>
<div class="panel panel-default mb-20">
<div class="panel-header">终审意见</div>
<div class="panel-body cl">
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<label>审核结果</label>
<span class="form-control select-box">
<select class="select" size="1">
<option value="1">通过</option>
<option value="0">不通过</option>
</select>
</span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<label>核批金额</label>
<input type="text" class="form-control input-text" name="agreeMoney" value="">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group col-sm-3 col-md-1">
<label>借款期限</label>
<input type="text" class="form-control input-text" name="deadLine" value="">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group col-sm-3 col-md-1">
<label>借款利率</label>
<input type="text" class="form-control input-text" name="annualInterestRate" value="">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>每月还款金额</label>
<input type="text" class="form-control input-text" name="repayMonth" value="">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-3 col-md-2">
<label>贷款产品</label>
<span class="form-control select-box">
<select class="select" size="1" name="productId">
<option value="">贷款产品</option>
<?php foreach ($this->session->products as $k => $v): ?>
<option value="<?= $v->id ?>"><?= $v->productName ?></option>
<?php endforeach; ?>
</select>
</span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-12 col-md-12">
<label>审批意见</label>
<textarea class="textarea" name="description"></textarea>
</div>
</div>
</div>
</div>
<input type="hidden" name="orderId" value="<?= $id ?>">
</form>
<div class="row cl pb-20 col-sm-12">
<div class="col-sm-offset-4 col-sm-2">
<button class="btn btn-warning btn-block" onclick="history.back()">退回订单</button>
</div>
<div class="col-sm-2">
<button class="btn btn-primary btn-block" onclick="next()">通过</button>
</div>
</div>
<?php $this->load->view('common/footer'); ?>
<script>
function next() {
layer.confirm('确认通过', {
btn: ['确认', '取消'],
title: '通过',
icon: 3
}, function () {
var data = $('#form').serializeJson();
data.status = 1;
var orderStatus = "<?=$applyOrderVO->status?>";
var url = 'flow/saveFirstCheck';
if (orderStatus == 4) {
url = url;
} else if (orderStatus == 5) {
url = 'flow/saveSecoundCheck';
} else if (orderStatus == 6) {
url = 'flow/saveLastCheck';
}
$.ajax({
type: 'post',
url: apiBaseUrl + url,
cache: false,
data: JSON.stringify(data),
dataType: 'json',
contentType: "application/json; charset=UTF-8",
success: function (data) {
if (data.msg) {
layer.alert(data.msg);
} else if (data.code != 0) {
layer.alert('操作失败');
} else {
layer.alert('操作成功');
}
if (!data.code) {
setTimeout(function () {
loadIframe('<?=site_url('/work/check/12/' . $id);?>', '审核意见');
}, 500)
}
},
error: function () {
layer.alert("操作失败")
}
})
});
}
</script>
</body>
</html>
......@@ -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>
......@@ -27,22 +27,22 @@
<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>
......@@ -50,7 +50,8 @@
</div>
<div class="panel panel-default">
<div class="panel-header">还款计划表 <button class="btn btn-success">导出</button></div>
<div class="panel-header">还款计划表
<!-- <button class="btn btn-success">导出</button></div>-->
<div class="panel-body text-c">
<table class="table table-border table-bordered table-bg">
<thead class="text-c">
......@@ -60,14 +61,12 @@
</tr>
</thead>
<tbody class="text-c">
<tr>
<td>1期</td>
<td>500元</td>
</tr>
<tr>
<td>1期</td>
<td>500元</td>
</tr>
<?php foreach ($plan->repayPlans as $k=>$v):?>
<tr>
<td><?=$v->period?></td>
<td><?=$v->totalAmount?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!