Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
71fd7709 by Zelig
Options

Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

2 parents 2840f7f4 b528e7d7
Inline Side-by-side
Showing 3 changed files with 88 additions and 27 deletions
application/hooks/CheckLogin.php
......@@ -36,6 +36,9 @@ class CheckLogin
$session->repaymentPlans = $this->getRepaymentPlans();
}
if(!$session->repaymentPlanSource){
$session->repaymentPlanSource = $this->getRepaymentPlanSource();
}
/*if (preg_match("/admin|base/i", uri_string())) {
......@@ -128,4 +131,15 @@ class CheckLogin
}
}
private function getRepaymentPlanSource(){
try {
$url = $this->CI->config->item('apiBaseUrl') . 'enum/repaymentPlan/source';
$res = json_decode(file_get_contents($url));
$products = $res->data;
return $products;
} catch (Exception $e) {
return array();
}
}
}
\ No newline at end of file
......
application/views/finance/checkTheAccount.php
......@@ -3,7 +3,65 @@
<body>
<div class="page-container">
<form class="" onreset="resetHandler()">
<<<<<<< HEAD
<?php $this->load->view('work/search2'); ?>
=======
<div class="date mb-20">
<input type="text"
onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
id="min" 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">
</div>
<div class="row cl mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1">
<option value="" selected>还款状态</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" name="departmentId" size="1" column="6">
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k => $v): ?>
<option value="<?= $v->id ?>"><?= $v->name ?></option>
<?php endforeach; ?>
</select>
</span>
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1">
<option value="" selected>是否逾期</option>
<option value="0">否</option>
<option value="1">是</option>
</select>
</span>
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1">
<option value="" selected>来源</option>
<?php foreach ($this->session->repaymentPlanSource as $k => $v): ?>
<option value="<?= $k ?>"><?= $v ?></option>
<?php endforeach; ?>
</select>
</span>
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="2">
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="4">
</div>
</div>
>>>>>>> b528e7d7be87ddca09c05b5be0d74417e77abf3a
<div>
<input class="btn btn-warning radius" type="reset" value="重置">
</div>
......
application/views/finance/makeLoan.php
......@@ -23,25 +23,11 @@
<th>申请金额</th>
<th>审批金额</th>
<th>客户经理</th>
<th>期数</th>
<th>当月应还(元)</th>
<!-- <th>期数</th>-->
<!-- <th>当月应还(元)</th>-->
</tr>
</thead>
<tbody class="text-c">
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
</div>
......@@ -58,7 +44,7 @@
iDisplayLength: 6,
bLengthChange: false,
ajax: {
url: apiBaseUrl + '/order/into/getAllApplyOrder',
url: apiBaseUrl + '/order/getStatus14',
dataFilter: function (json) {
var ret = {}, json = jQuery.parseJSON(json);
ret.data = json.data;
......@@ -66,9 +52,12 @@
if(draw) {
ret.draw = draw;
}
// ret.draw = parseInt(json.page.currentPage);
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) {
......@@ -78,18 +67,18 @@
}
},
columns: [
{data: "orderId"},//订单编号
{data: "createUser"},//申请人
{data: "orderNo"},//订单编号
{data: "userName"},//申请人
{data: "idCard"},//身份证
{data: "phoneNumber"},//手机号
{data: "createTime"},//进件时间
{data: "createTime"},//网点
{data: "createTime"},//产品名称
{data: "createTime"},//申请金额
{data: "createTime"},//审批金额
{data: "createTime"},//客户经理
{data: "createTime"},//期数
{data: "createTime"},//当月应还
{data: "departmentName"},//网点
{data: "productName"},//产品名称
{data: "applyMoney"},//申请金额
{data: "agreeMoney"},//审批金额
{data: "createUser"}//客户经理
// {data: "statusDesc"},//期数
// {data: "modifyTime"}//当月应还
]
});
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!