Skip to content

杨建斌 / page

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

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

2 parents ac055288 7a6bc679
Inline Side-by-side
Showing 10 changed files with 55 additions and 59 deletions
application/controllers/Loan.php
......@@ -45,28 +45,19 @@ class Loan extends CI_Controller {
}
}
public function edit($state = 1, $id = null)
public function edit($id = null)
{
$this->load->driver('enum');
$this->load->driver('configure');
switch ($state) {
case 1:
$url = $this->config->item('apiBaseUrl') . 'loanAfter/repaymentPlan/'.$id;
$result = file_get_contents($url);
$json = json_decode($result);
$ret = $json->data;
$ret->enumRepayStatus = $this->enum->repaymentPlan->status();
$ret->enumSource = $this->enum->repaymentPlan->source();
$this->load->view('/loan/还款编辑', $ret);
break;
case 2:
$this->load->view('/loan/催收编辑');
break;
case 3:
$this->load->view('/loan/数据编辑');
break;
}
}
public function move()
......
application/views/common/footer.php
......@@ -115,6 +115,8 @@
aoData.createUser = $('[name="createUser"]').val() || '';
aoData.status = $('[name="status"]').val() || '';
aoData.modifyUser = $('[name="modifyUser"]').val() || '';
aoData.proposerName = $('[name="proposerName"]').val() || '';
aoData.phoneNumber = $('[name="phoneNumber"]').val() || '';
},
});
......@@ -129,4 +131,27 @@
function resetHandler() {
$('#table').DataTable().draw();
}
function ajax(url, method = 'GET', data = {}) {
$.ajax({
type: method,
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('操作成功');
}
},
error:function(){
layer.alert("操作失败")
}
})
}
</script>
......
application/views/common/header.php
......@@ -25,8 +25,8 @@
<meta name="description" content="">
<title>标题</title>
<script>
// var apiBaseUrl = "http://151.28ms.com:8088/";
var apiBaseUrl = "http://192.168.11.60:8082/";
var apiBaseUrl = "http://151.28ms.com:8088/";
// var apiBaseUrl = "http://192.168.11.60:8082/";
</script>
</head>
......
application/views/loan/prosecute.php
......@@ -80,7 +80,7 @@
});
function edit(id) {
layer_show('编辑', '<?=site_url('/loan/edit/2')?>');
layer_show('编辑', '<?=site_url('/loan/edit/')?>/' + id);
}
function del(id) {
......@@ -89,7 +89,7 @@
title: '删除订单',
icon: 3
}, function(){
layer.msg('删除');
ajax('/loanAfter/repaymentPlan/'+id, 'delete')
});
}
......
application/views/loan/reminder.php
......@@ -29,7 +29,7 @@
<th>罚息</th>
<th>滞纳金</th>
<th>期数</th>
<th>还款方式</th>
<!-- <th>还款方式</th>-->
<th>本期应还款日</th>
<th>实际还款日</th>
<th>是否逾期</th>
......@@ -69,8 +69,8 @@
{data: "interestPenalty"},//罚息
{data: "overdueFine"},//滞纳金
{data: "totalPeriods"},//期数
{data: "createTime"},//还款方式
{data: "createTime"},//本期应还款日
// {data: "createTime"},//还款方式
{data: "planRepaymentDate"},//本期应还款日
{data: "realRepaymentDate"},//实际还款日
{data: "hasDue"},//是否逾期
{data: "dueDay"},//逾期天数
......@@ -95,7 +95,7 @@
}
function edit(id) {
layer_show('编辑', '<?=site_url('/loan/edit/2')?>');
layer_show('编辑', '<?=site_url('/loan/edit/')?>/'+id);
}
function move(id) {
......
application/views/loan/repayment.php
......@@ -79,38 +79,8 @@
]
});
$.fn.dataTableExt.afnFiltering.push(
function (oSettings, aData, iDataIndex) {
var min = document.getElementById('min').value;
var max = document.getElementById('max').value;
var iDateCol = 5; //进件时间
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 edit(id) {
layer_show('编辑', '<?=site_url('/loan/edit/1/')?>'+id);
layer_show('编辑', '<?=site_url('/loan/edit/')?>'+id);
}
function del(id) {
......@@ -118,8 +88,8 @@
btn: ['确认','取消'],
title: '删除订单',
icon: 3
}, function(){
layer.msg('删除');
}, function() {
ajax('/loanAfter/repaymentPlan/'+id, 'delete')
});
}
......
application/views/loan/search.php
......@@ -15,7 +15,7 @@
</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="departmentId">
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
......@@ -42,9 +42,9 @@
</span>
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3" name="proposerName">
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="5">
<input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="5" name="phoneNumber">
</div>
</div>
......
application/views/loan/search2.php
......@@ -52,9 +52,9 @@
</span>
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3" name="proposerName">
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="5">
<input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="5" name="phoneNumber">
</div>
</div>
......
application/views/loan/还款编辑.php
......@@ -28,6 +28,16 @@
<input type="text" class="form-control input-text" value="<?=$clientManager?>" 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="repayStatus">
<?php foreach($enumSource as $k => $v) : ?>
<option value="<?=$k?>" <?=$k == $source?'selected':''?>><?=$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="branchName">
......
application/views/work/search2.php
......@@ -48,9 +48,9 @@
</span>
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="2">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3" name="proposerName">
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="4">
<input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="5" name="phoneNumber">
</div>
</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!