Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
d05f93fb by wang
Options

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

2 parents 20612be2 bc1a381a
Inline Side-by-side
Showing 9 changed files with 128 additions and 51 deletions
application/controllers/User.php
......@@ -19,7 +19,8 @@ class User extends CI_Controller {
'clientInfoOutputVO'=>$data->clientInfoOutputVO,
'clientUnitOutputVO'=>$data->clientUnitOutputVO,
'clientContactOutputVOS'=>$data->clientContactOutputVOS,
'applyOrderVO'=>$data->applyOrderVO
'applyOrderVO'=>$data->applyOrderVO,
'id'=>$data->applyOrderVo->id
);
switch ($state) {
case '1':
......
application/controllers/Work.php
......@@ -146,7 +146,7 @@ class Work extends CI_Controller
$recordUrl = $this->config->item('apiBaseUrl') . 'order/orderOperatorRecord/' . $id;
$result2 = file_get_contents($recordUrl);
$json2 = json_decode($result2);
$ret2 = $json2->data;
$ret2 = isset($json2->data) ? $json2 : array();
$data = array(
'clientInfoOutputVO' => $ret->clientInfoOutputVO,
......
application/views/common/footer.php
......@@ -42,8 +42,10 @@
return null; //返回参数值
}
function getNowFormatDate() {
var date = new Date();
function getNowFormatDate(date) {
if(!date){
date = new Date();
}
var seperator1 = "-";
var year = date.getFullYear();
var month = date.getMonth() + 1;
......@@ -141,6 +143,7 @@
url: apiBaseUrl + url,
cache: false,
data:JSON.stringify(data),
// data:data,
dataType:'json',
contentType: "application/json; charset=UTF-8",
success:function(data){
......
application/views/user/index.php
......@@ -13,7 +13,7 @@
<table class="table table-border table-bordered table-bg" id="table">
<thead class="text-c">
<tr>
<!-- <th width="68px">操作</th>-->
<th width="68px">操作</th>
<th>客户编号</th>
<th>姓名</th>
<th>身份证</th>
......@@ -60,10 +60,9 @@
}
},
columns: [
/*{
{
data: "id", render: function (data, type, full) {
var url = "< ?=site_url('/user/info')?>";
var url = "<?=site_url('/user/info')?>";
url += '/' + data;
return '<span class="dropDown dropDown_hover">\
<button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
......@@ -71,7 +70,7 @@
<li><a href="javascript:;" onclick="creatIframe(\''+url+'\', \'查看详细\')">查看详细</a></li>\
</ul></span>';
}
},*/
},
{data: "id"},//客户编号
{data: "userName"},//姓名
{data: "idCard"},//身份证
......
application/views/work/index.php
......@@ -59,14 +59,22 @@
{data: "userName"},//申请人
{data: "idCard"},//身份证
{data: "phoneNumber"},//手机号
{data: "createTime"},//进件时间
{data: function (data) {
if(!data.createTime)
return '';
return getNowFormatDate(new Date(parseInt(data.createTime)));
}},//进件时间
{name: "departmentId", data: "departmentName"},//网点
{name: "productId", data: "productName"},//产品名称
{data: "applyMoney"},//申请金额
{data: "agreeMoney"},//审批金额
{name: "createUser", data: "createUserName"},//客户经理
{name: "status", data: "statusDesc"},//流程节点
{data: "modifyTime"},//流转时间
{data: function (data) {
if(!data.modifyTime)
return '';
return getNowFormatDate(new Date(parseInt(data.modifyTime)));
}},//流转时间
{name: "modifyUser", data: "modifyUserName"}, //处理人
]
});
......
application/views/work/审批/信用报告.php
......@@ -12,9 +12,9 @@
<label>银行黑名单</label>
<span class="form-control select-box">
<select class="select" size="1" name="hasBankBlacklist">
<!-- <option value="1">是</option>-->
<!-- <option value="0">否</option>-->
<option value=""><?=$credit && $credit->hasBankBlacklist ? '是' : '否'?></option>
<option value=""</option>
<option <?=$credit && $credit->hasBankBlacklist ==1 ? 'selected' : ''?> value="1">是</option>
<option <?=$credit && $credit->hasBankBlacklist ==0 ? 'selected' : ''?> value="0">否</option>
</select>
</span>
</div>
......@@ -22,9 +22,9 @@
<label>同业进件</label>
<span class="form-control select-box">
<select class="select" size="1" name="hasTradeInto">
<!-- <option value="1">是</option>-->
<!-- <option value="0">否</option>-->
<option value=""><?=$credit && $credit->hasTradeInto ? '是' : '否'?></option>
<option value=""</option>
<option <?=$credit && $credit->hasTradeInto ==1 ? 'selected' : ''?> value="1">是</option>
<option <?=$credit && $credit->hasTradeInto ==0 ? 'selected' : ''?> value="0">否</option>
</select>
</span>
</div>
......@@ -32,9 +32,9 @@
<label>征信五级分类异常</label>
<span class="form-control select-box">
<select class="select" size="1" name="hasCreditTypeException">
<option value=""><?=$credit && $credit->hasCreditTypeException ? '是' : '否'?></option>
<!--<option value="1">是</option>
<option value="0">否</option>-->
<option value=""</option>
<option <?=$credit && $credit->hasCreditTypeException ==1 ? 'selected' : ''?> value="1">是</option>
<option <?=$credit && $credit->hasCreditTypeException ==0 ? 'selected' : ''?> value="0">否</option>
</select>
</span>
</div>
......@@ -76,31 +76,33 @@
<div class="row cl">
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>M1</label>
<input type="text" class="form-control input-text" name="creditCardMOne" value="<?=$credit ? $credit->creditCardMOne : ''?>">
<input type="text" class="form-control input-text" name="loanMOne" value="<?=$credit ? $credit->loanMOne : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">个</span>
</div>
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>M2</label>
<input type="text" class="form-control input-text" name="creditCardMTwo" value="<?=$credit ? $credit->creditCardMTwo : ''?>">
<input type="text" class="form-control input-text" name="loanMTwo" value="<?=$credit ? $credit->loanMTwo : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">个</span>
</div>
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>M3</label>
<input type="text" class="form-control input-text" name="creditCardMThree" value="<?=$credit ? $credit->creditCardMThree : ''?>">
<input type="text" class="form-control input-text" name="loanMThree" value="<?=$credit ? $credit->loanMThree : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">个</span>
</div>
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>M7</label>
<input type="text" class="form-control input-text" name="creditCardMSeven" value="<?=$credit ? $credit->creditCardMSeven : ''?>">
<input type="text" class="form-control input-text" name="loanMSeven" value="<?=$credit ? $credit->loanMSeven : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">个</span>
</div>
</div>
<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="loanRecord" value="<?=$credit ? $credit->creditCardUseRecord : ''?>" >
<input type="text" class="form-control input-text" name="creditCardUseRecord" value="<?=$credit ? $credit->creditCardUseRecord : ''?>" >
<span class="glyphicon form-control-feedback" aria-hidden="true">年</span>
</div>
</div>
......@@ -112,13 +114,13 @@
<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="<?=$credit ? $credit->creditCardUseRecord : ''?>">
<label>已使用额度</label>
<input type="text" class="form-control input-text" name="creditCardHaveUsedAmount" value="<?=$credit ? $credit->creditCardHaveUsedAmount : ''?>">
<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="<?=$credit ? $credit->creditCardUseRecord : ''?>">
<label>6个月平均使用</label>
<input type="text" class="form-control input-text" name="creditCardSixMonthAverageAmount" value="<?=$credit ? $credit->creditCardSixMonthAverageAmount : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">元</span>
</div>
</div>
......@@ -126,25 +128,60 @@
<div class="row cl">
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>M1</label>
<input type="text" class="form-control input-text" name="creditCardMOne" value="<?=$credit ? $credit->loanMOne : ''?>">
<input type="text" class="form-control input-text" name="creditCardMOne" value="<?=$credit ? $credit->creditCardMOne : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">个</span>
</div>
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>M2</label>
<input type="text" class="form-control input-text" name="creditCardMTwo" value="<?=$credit ? $credit->loanMTwo : ''?>">
<input type="text" class="form-control input-text" name="creditCardMTwo" value="<?=$credit ? $credit->creditCardMTwo : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">个</span>
</div>
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>M3</label>
<input type="text" class="form-control input-text" name="creditCardMThree" value="<?=$credit ? $credit->loanMThree : ''?>">
<input type="text" class="form-control input-text" name="creditCardMThree" value="<?=$credit ? $credit->creditCardMThree : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">个</span>
</div>
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>M7</label>
<input type="text" class="form-control input-text" name="creditCardMSeven" value="<?=$credit ? $credit->loanMSeven : ''?>">
<input type="text" class="form-control input-text" name="creditCardMSeven" value="<?=$credit ? $credit->creditCardMSeven : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">个</span>
</div>
</div>
<div class="row cl">
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>三个月查询记录</label>
</div>
</div>
<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="threeMonthLoan" value="<?=$credit ? $credit->threeMonthLoan : ''?>">
<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="threeMonthCreditCard" value="<?=$credit ? $credit->threeMonthCreditCard : ''?>">
<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="threeMonthGuarantee" value="<?=$credit ? $credit->threeMonthGuarantee : ''?>">
<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="threeMonthGuaranteeBefore" value="<?=$credit ? $credit->threeMonthGuaranteeBefore : ''?>">
<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="threeMonthPersonage" value="<?=$credit ? $credit->threeMonthPersonage : ''?>">
<span class="glyphicon form-control-feedback" aria-hidden="true">元</span>
</div>
</div>
</div>
</div>
......
application/views/work/审批/终审意见.php
......@@ -23,7 +23,7 @@
<div class="panel-header">初审意见</div>
<div class="panel-body cl">
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<div class="form-group col-sm-3 col-md-2">
<label>拟批</label>
<input type="text" class="form-control input-text"
value="<?= $getFirstCheck ? $getFirstCheck->mockMoney : '' ?>" disabled>
......@@ -44,7 +44,7 @@
<div class="panel-header">复审意见</div>
<div class="panel-body cl">
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<div class="form-group col-sm-3 col-md-2">
<label>拟批</label>
<input type="text" class="form-control input-text"
value="<?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?>" disabled>
......@@ -55,7 +55,7 @@
<div class="form-group col-sm-12 col-md-12">
<label>拟批备注</label>
<textarea class="textarea"
disabled><?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?></textarea>
disabled><?= $getSecondCheck ? $getSecondCheck->description : '' ?></textarea>
</div>
</div>
</div>
......@@ -89,6 +89,7 @@
<div class="form-group col-sm-3 col-md-1">
<label>借款利率</label>
<input type="text" class="form-control input-text" name="annualInterestRate" value="">
<span class="glyphicon form-control-feedback">%</span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>每月还款金额</label>
......@@ -103,7 +104,7 @@
<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>
<option <?=$applyOrderVO->productId == $v->id ? 'selected' : ''?> value="<?= $v->id ?>"><?= $v->productName ?></option>
<?php endforeach; ?>
</select>
</span>
......@@ -149,6 +150,7 @@
} else if (orderStatus == 6) {
url = 'flow/saveLastCheck';
}
data.annualInterestRate = parseFloat(data.annualInterestRate) /100;
$.ajax({
type: 'post',
url: apiBaseUrl + url,
......
application/views/work/资料/资料补录.php
......@@ -273,17 +273,17 @@
value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->unitPhone : '' ?>">
</div>
<div class="form-group col-sm-3 col-md-2">
<!--<div class="form-group col-sm-3 col-md-2">
<label>职称类型</label>
<span class="form-control select-box">
<select class="select" size="1" name="clientUnitInputVO.jobType">
<?php foreach ($this->session->jobTypeEnum as $k => $v): ?>
<option <?= $clientUnitOutputVO && $clientUnitOutputVO->jobType == $k ? 'selected' : '' ?>
value="<?= $k ?>"><?= $v ?></option>
<?php endforeach; ?>
<?php /*foreach ($this->session->jobTypeEnum as $k => $v): */?>
<option <?/*= $clientUnitOutputVO && $clientUnitOutputVO->jobType == $k ? 'selected' : '' */?>
value="<?/*= $k */?>"><?/*= $v */?></option>
<?php /*endforeach; */?>
</select>
</span>
</div>
</div>-->
</div>
......@@ -532,7 +532,7 @@
}
reader.readAsDataURL(file[0]);
} else {
alert(file[0].name + " is not a valid image file.");
alert(file[0].name + " is not a valid image file.");;
dvPreview.html("");
return false;
}
......@@ -546,7 +546,8 @@
var data = $("form").serializeJson();
data = json(data);
data.clientContactInputVOS = Object.values(data.clientContactInputVOS);
var dwellDetail = $('[name=clientInfoInputVO\\.dwellState]:checked').parent().find('input[type=text]').val();
data.clientInfoInputVO.dwellDetail = dwellDetail;
ajax('client/collection', 'post', data, '操作成功', function () {
window.parent.reload();
layer_close();
......
application/views/work/资料补录.php
......@@ -72,13 +72,39 @@
</script>
<script>
function cancel(id) {
layer.confirm('取消之后, 将立即进入【已取消】列表', {
btn: ['确认', '取消'],
title: '客户取消',
icon: 2
}, function () {
layer.msg('取消');
layer.confirm('确定取消？', {
btn: ['是','否'],
title: '确认',
icon: 3
}, function(){
var targetUrl = 'flow/cancelOrder/' + id;
$.ajax({
type: 'put',
url: apiBaseUrl + targetUrl,
cache: false,
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('操作成功');
}
setTimeout(function () {
if(!data.code) {
table.fnDraw();
layer_close();
}
},500);
},
error: function () {
layer.alert("操作失败")
}
})
});
}
</script>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!