Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
3b1fe8ff by wang
Options

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

2 parents 9cce0446 4b6e1f32
Inline Side-by-side
Showing 15 changed files with 301 additions and 135 deletions
application/controllers/Loan.php
......@@ -29,20 +29,15 @@ class Loan extends CI_Controller {
public function import($state = 1)
{
switch ($state) {
case 1:
$this->load->view('/loan/还款导入');
break;
case 2:
$this->load->view('/loan/还款批量导入');
break;
case 3:
$this->load->view('/loan/催收导入');
break;
case 4:
$this->load->view('/loan/数据库导入');
break;
}
$this->load->driver('enum');
$this->load->driver('configure');
$this->load->driver('LoanAfter');
$ret = new stdClass();
$ret->enumRepayStatus = $this->enum->repaymentPlan->status();
$ret->enumSource = $this->enum->repaymentPlan->source();
$ret->prosecuteStatus = $state - 1;
$this->load->view('/loan/导入', $ret);
}
public function edit($id = null)
......@@ -60,9 +55,12 @@ class Loan extends CI_Controller {
$this->load->view('/loan/还款编辑', $ret);
}
public function move()
public function move($id)
{
$this->load->view('/loan/资料移交');
$this->load->driver('order');
$sources = $this->order->ordersource($id);
$this->load->view('/loan/资料移交', compact('sources', 'id'));
}
public function data($format = 'days')
......
application/libraries/LoanAfter/LoanAfter.php 0 → 100644
<?php
class LoanAfter extends CI_Driver_Library {
public function __construct () {
$this->valid_drivers = ['enum'];
}
}
application/libraries/LoanAfter/drivers/LoanAfter_enum.php 0 → 100644
<?php
class LoanAfter_enum extends CI_Driver
{
public $CI;
public function __construct () {
$this->CI = &get_instance();
}
public function prosecute () {
$url = $this->CI->config->item('apiBaseUrl') . 'loanAfter/enum/prosecute';
$result = file_get_contents($url);
$json = json_decode($result, true);
$ret = $json['data'];
return $ret;
}
}
application/libraries/Order/Order.php 0 → 100644
<?php
class Order extends CI_Driver_Library {
public function __construct () {
$this->valid_drivers = ['ordersource'];
}
public function ordersource($id)
{
return $this->ordersource->all($id);
}
}
application/libraries/Order/drivers/Order_ordersource.php 0 → 100644
<?php
class Order_ordersource extends CI_Driver
{
public $CI;
public function __construct () {
$this->CI = &get_instance();
}
public function all ($id) {
$url = $this->CI->config->item('apiBaseUrl') . 'order/ordersource/'.$id;
$result = file_get_contents($url);
$json = json_decode($result);
$ret = $json->data;
return $ret;
}
}
application/views/common/footer.php
......@@ -117,6 +117,7 @@
aoData.modifyUser = $('[name="modifyUser"]').val() || '';
aoData.proposerName = $('[name="proposerName"]').val() || '';
aoData.phoneNumber = $('[name="phoneNumber"]').val() || '';
aoData.role = $('[name="role"]').val() || '';
},
});
......@@ -132,7 +133,7 @@
$('#table').DataTable().draw();
}
function ajax(url, method = 'GET', data = {}) {
function ajax(url, method = 'GET', data = {}, msg = '操作成功', callback = function (){}) {
$.ajax({
type: method,
url: apiBaseUrl + url,
......@@ -146,7 +147,7 @@
} else if(data.code != 0){
layer.alert('操作失败');
} else {
layer.alert('操作成功');
layer.alert(msg, callback);
}
},
error:function(){
......
application/views/loan/prosecuted.php
......@@ -8,7 +8,7 @@
<button class="btn btn-primary radius" type="button" onclick="$('#table').DataTable().draw()">搜索</button>
<input class="btn btn-warning radius" type="reset" value="重置">
<button class="btn btn-primary radius" type="button" onclick="layer_show('导入', '<?=site_url('loan/import/3')?>')">导入</button>
<button class="btn btn-primary radius" type="button" onclick="layer_show('导入', '<?=site_url('loan/import/4')?>')">导入</button>
<button class="btn btn-success radius r" type="button" onclick="excel()">导出</button>
</div>
</form>
......
application/views/loan/reminder.php
......@@ -79,27 +79,12 @@
]
});
$('.table_search').on('change', function () {
search = $(this).val();
column = $(this).attr('column');
$('#table').DataTable().column(column).search(search).draw();
});
$('#min, #max').on('keyup', function () {
$('#table').DataTable().draw();
});
function resetHandler() {
$('#table').DataTable().columns().search("").draw();
}
function edit(id) {
layer_show('编辑', '<?=site_url('/loan/edit/')?>/'+id);
}
function move(id) {
layer_show('资料移交', '<?=site_url('/loan/move')?>');
layer_show('资料移交', '<?=site_url('/loan/move')?>/'+id);
}
function reload() {
......
application/views/loan/search2.php
<div class="date mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" column="17" name="code">
<option value=""></option>
<option value="0" >进件时间</option>
<option value="1" >放款时间</option>
<option value="2" >计划还款日期</option>
</select>
</span>
</div>
<input type="text"
onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
id="min" class="input-text Wdate"> -
onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'enterMaxDate\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
id="enterMinDate" class="input-text Wdate"> -
<input type="text"
onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })"
id="max" class="input-text Wdate">
onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'enterMinDate\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })"
id="enterMaxDate" class="input-text Wdate">
</div>
<div class="row cl mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" column="17">
<select class="select table_search" column="17" name="repayStatus">
<option value="" selected>还款状态</option>
<?php foreach ($this->session->repayStatus as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php foreach ($this->session->repaymentPlans as $k=>$v):?>
<option value="<?=$k?>"><?=$v?></option>
<?php endforeach;?>
</select>
</span>
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1" column="7">
<select class="select table_search" size="1" column="7" name="branchName">
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
......@@ -32,25 +44,25 @@
</select>
</span>
</div>
<div class="col-xs-2">
<!--<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" column="16">
<option value="" selected>是否逾期</option>
<option>是</option>
<option>否</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</span>
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" column="2">
<select class="select table_search" column="2" name="source">
<option value="" selected>来源</option>
<?php foreach ($this->session->source as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php endforeach;?>
<?php /*foreach ($this->session->source as $k=>$v):*/?>
<option value="<?/*=$v->id*/?>"><?/*=$v->name*/?></option>
<?php /*endforeach;*/?>
</select>
</span>
</div>
</div>-->
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3" name="proposerName">
</div>
......
application/views/loan/导入.php 0 → 100644
<?php $this->load->view('common/header'); ?>
<body>
<div class="panel panel-default mb-20">
<form>
<input type="hidden" name="source" value="1">
<input type="hidden" name="prosecuteStatus" value="<?=$prosecuteStatus?>">
<div class="panel-body cl">
<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=""name="orderNumber">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>申请人</label>
<input type="text" class="form-control input-text" value=""name="proposerName">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>身份证</label>
<input type="text" class="form-control input-text" value=""name="idNumber">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>手机号</label>
<input type="text" class="form-control input-text" value=""name="phoneNumber">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>客户经理</label>
<input type="text" class="form-control input-text" value=""name="clientManager">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>网点</label>
<span class="form-control select-box">
<select class="select" size="1" name="branchName">
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php if($v->children && !empty($v->children)):?>
<?php foreach ($v->children as $kk=>$vv):?>
<option value="<?=$vv->id?>"><?=$vv->name?></option>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</select>
</span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>产品名称</label>
<span class="form-control select-box">
<select class="select" size="1" name="productName">
<?php foreach ($this->session->products as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->productName?></option>
<?php endforeach;?>
</select>
</span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>借款金额</label>
<input type="text" class="form-control input-text" value=""name="applyAmount">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>审批金额</label>
<input type="text" class="form-control input-text" value=""name="ratifyAmount">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>进件时间</label>
<input type="text" class="form-control input-text Wdate" onfocus="WdatePicker()" value="" name="enterDate">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>当月应还金额</label>
<input type="text" class="form-control input-text" value=""name="currentBalance">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>已还金额</label>
<input type="text" class="form-control input-text" value="">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>罚息</label>
<input type="text" class="form-control input-text" value="">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>滞纳金</label>
<input type="text" class="form-control input-text" value=""name="overdueFine">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>放款日期</label>
<input type="text" class="form-control input-text Wdate" onfocus="WdatePicker()" value="" name="loanDate">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>总期数</label>
<input type="text" class="form-control input-text" value=""name="totalPeriods">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>当前期数</label>
<input type="text" class="form-control input-text" value=""name="currentPeriods">
</div>
<!-- 需求调整先去了-->
<!--<div class="form-group col-sm-4 col-md-2">
<label>还款方式</label>
<span class="form-control select-box">
<select class="select" size="1">
<option>请选择</option>
<?php /*foreach ($this->session->repayments as $k=>$v):*/?>
<option <?/*=$v == $repaymentMode ? 'selected' : '' */?> value="<?/*=$k*/?>"><?/*=$v*/?></option>
<?php /*endforeach;*/?>
</select>
</span>
</div>-->
<div class="form-group col-sm-4 col-md-2">
<label>计划还款日期</label>
<input type="text" class="form-control input-text Wdate" onfocus="WdatePicker()" value="" name="planRepaymentDate">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>实际还款日</label>
<input type="text" class="form-control input-text Wdate" onfocus="WdatePicker()" value="" name="realRepaymentDate">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>是否逾期</label>
<span class="form-control select-box">
<select class="select" size="1" name="hasDue">
<option value="1">是</option>
<option value="0">否</option>
</select>
</span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>逾期天数</label>
<input type="text" class="form-control input-text" value=""name="dueDay">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>还款状态</label>
<span class="form-control select-box">
<select class="select" size="1" name="repayStatus">
<?php foreach($enumRepayStatus as $k => $v) : ?>
<option value="<?=$k?>"><?=$v?></option>
<?php endforeach ?>
</select>
</span>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>是否结清</label>
<span class="form-control select-box">
<select class="select" size="1" name="hasClean">
<option value="1">是</option>
<option value="0">否</option>
</select>
</span>
</div>
</div>
</div>
</form>
</div>
<div class="row cl col-sm-12 pb-20">
<div class="col-sm-2">
<button class="btn btn-primary btn-block" onclick="save();">保存</button>
</div>
<div class="col-sm-2">
<button class="btn btn-warning btn-block" onclick="layer_close();">取消</button>
</div>
</div>
<?php $this->load->view('common/footer'); ?>
<script>
function save() {
var data = $("form").serializeJson();
ajax('loanAfter/repaymentPlan', 'POST', data, '添加成功', function () {
window.parent.reload();
layer_close();
});
}
</script>
</body>
</html>
application/views/loan/资料移交.php
......@@ -24,22 +24,22 @@
<a href="">处理日志.xls</a>
</td>
</tr>
<?php foreach($sources as $sourceTypeDesc => $source) : ?>
<tr data-id="2">
<td class="text-c"><input type="checkbox"></td>
<td class="text-c">身份证复印件</td>
<td class="text-c"><?=$sourceTypeDesc?></td>
<td>
<div class="filelist">
<?php foreach($source as $data): ?>
<label class="radio">
<input type="checkbox" name="1"/>
<img src="holder.js/100x100">
</label>
<label class="radio">
<input type="checkbox" name="1"/>
<img src="holder.js/100x100">
<input type="checkbox" name="" value=""/>
<img src="<?=$data->url?>" width="100">
</label>
<?php endforeach; ?>
</div>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
......@@ -53,7 +53,7 @@
<button class="btn btn-warning btn-block" onclick="layer_close()">关闭</button>
</div>
<div class="col-sm-2">
<button class="btn btn-primary btn-block" onclick="submit()">确认移交</button>
<button class="btn btn-primary btn-block" onclick="submit(<?=$id?>)">确认移交</button>
</div>
</div>
......@@ -70,11 +70,11 @@
$(this).parents('tr').find('input:checkbox').prop('checked', checked);
});
function submit() {
layer.alert('已进入【起诉管理】列表', function () {
function submit(id) {
ajax('loanAfter/chaseDebt/prosecute/'+id, 'patch', {}, '已进入【起诉管理】列表', function () {
window.parent.reload();
layer_close();
});
})
}
</script>
</body>
......
application/views/loan/还款编辑.php
......@@ -128,7 +128,7 @@
<span class="form-control select-box">
<select class="select" size="1" name="hasDue">
<option value="1" <?=$hasDue == 1?'selected':''?>>是</option>
<option>否</option>
<option value="0">否</option>
</select>
</span>
</div>
......@@ -151,7 +151,7 @@
<span class="form-control select-box">
<select class="select" size="1" name="hasClean">
<option value="1" <?=$hasClean == 1?'selected':''?>>是</option>
<option>否</option>
<option value="0">否</option>
</select>
</span>
</div>
......
application/views/perm/staff.php
......@@ -7,11 +7,11 @@
<div class="row cl mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1" column="1">
<select class="select table_search" size="1" name="departments">
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php if($v->children && !empty($v->children)):?>
<?php if($v->children && !empty($v->children)):?>
<?php foreach ($v->children as $kk=>$vv):?>
<option value="<?=$vv->id?>">&nbsp;&nbsp;<?=$vv->name?></option>
<?php endforeach;?>
......@@ -22,7 +22,7 @@
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1" column="2">
<select class="select table_search" size="1" column="2" name="role">
<option value="" selected>角色</option>
<?php foreach ($this->session->role as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->nameZh?></option>
......@@ -32,13 +32,14 @@
</div>
</div>
<div>
<button class="btn btn-primary radius" type="button" onclick="$('#table').DataTable().draw()">搜索</button>
<input class="btn btn-warning radius" type="reset" value="重置搜索">
<button class="btn btn-primary radius" type="button" onclick="add()">添加员工</button>
</div>
</form>
<div class="body mt-20">
<table class="table table-border table-bordered table-bg" id="table">
<table class="table table-border table-bordered table-bg" id="table" url="system/user/getAllHr">
<thead class="text-c">
<tr>
<th width="68px">操作</th>
......@@ -61,36 +62,6 @@
<script>
var table = $('#table').dataTable({
aaSorting: [[1, "desc"]],
serverSide: true,
processing: true,
bSort: false,
searching: false,//是否显示搜索
iDisplayLength: 6,
bLengthChange: false,
ajax: {
url: apiBaseUrl + 'system/user/getAllHr',
dataFilter: function (json) {
var ret = {}, json = jQuery.parseJSON(json);
ret.data = json.data || [];
var draw = getUrlParam('draw');
if(draw) {
ret.draw = draw;
}
ret.recordsTotal = 0;
ret.recordsFiltered = 0;
if (json.page) {
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
}
return JSON.stringify(ret);
},
data: function (data) {
data.pageSize = data.length;
data.currentPage = parseFloat(data.start / data.length) + 1;
return data;
}
},
columns: [
{
data: "id", render: function (data, type, full) {
......@@ -118,39 +89,6 @@
{data: "remark"},//备注
]
});
$.fn.dataTableExt.afnFiltering.push(
function (oSettings, aData, iDataIndex) {
var min = document.getElementById('min').value;
var max = document.getElementById('max').value;
var iDateCol = 12;
var dateMin = new Date(aData[iDateCol]);
var dateMax = new Date(aData[iDateCol]);
if (min === '' && max === '')
return true;
else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
return true;
else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
return true;
return false;
}
);
$('.table_search').on('change', function () {
search = $(this).val();
column = $(this).attr('column');
$('#table').DataTable().column(column).search(search).draw();
});
$('#min, #max').on('keyup', function () {
$('#table').DataTable().draw();
});
function resetHandler() {
$('#table').DataTable().columns().search("").draw();
}
function add() {
layer_show('添加员工', '<?=site_url('perm/staffAdd');?>');
......@@ -258,7 +196,8 @@
title: '注销账号',
icon: 3
}, function(){
layer.msg('注销成功');
ajax('/system/user/delete/'+id, 'delete');
this.reload();
});
}
</script>
......
application/views/perm/staffAdd.php
......@@ -28,7 +28,7 @@
<input type="text" class="form-control input-text" value="" name="password" id="password">
</div>
<div class="form-group col-sm-4 col-md-2 pt-25">
<button class="btn btn-primary" onclick="random()">随机生成密码</button>
<button class="btn btn-primary" onclick="random()" type="button">随机生成密码</button>
</div>
</div>
<div class="row cl">
......
application/views/work/审批/录入信用报告.php
......@@ -3,8 +3,8 @@
<body>
<div class="cl pd-5 bg-1">
<span class="r">
<button class="btn btn-primary radius">保存</button>
<button class="btn btn-primary radius">预览信用报告</button>
<!-- <button class="btn btn-primary radius">保存</button>-->
<!-- <button class="btn btn-primary radius">预览信用报告</button>-->
</span>
</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!