228166b3 by wang

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

2 parents 9fbbb6e5 d275a69c
......@@ -176,8 +176,12 @@ class Perm extends CI_Controller {
$this->output->set_content_type('application/json')->set_output(json_encode($arr));
}
public function menu()
public function menu($id)
{
$role = json_decode(file_get_contents($this->config->item('apiBaseUrl') . 'system/role/get/'.$id));
$role = $role->data->menuOutputVOS;
// echo $this->config->item('apiBaseUrl') . 'system/menu/getAllMenu';
$res = json_decode(file_get_contents($this->config->item('apiBaseUrl') . 'system/menu/getAllMenuTree'));
// var_dump($res->data);
......@@ -279,6 +283,40 @@ class Perm extends CI_Controller {
// $data = '[{"id":1,"pId":0,"name":"父节点1 (5人)","open":true},{"id":11,"pId":1,"name":"叶子节点 1-1"},{"id":12,"pId":1,"name":"叶子节点 1-2"},{"id":13,"pId":1,"name":"叶子节点 1-3"},{"id":2,"pId":0,"name":"父节点 2","open":true},{"id":21,"pId":2,"name":"叶子节点 2-1"},{"id":22,"pId":2,"name":"叶子节点 2-2"},{"id":23,"pId":2,"name":"叶子节点 2-3"},{"id":3,"pId":0,"name":"父节点 3","open":true},{"id":31,"pId":3,"name":"叶子节点 3-1"},{"id":32,"pId":3,"name":"叶子节点 3-2"},{"id":33,"pId":3,"name":"叶子节点 3-3"}]';
// $data = json_decode($data, true);
// $arr2 = array();
foreach ($role as $rolek => $rolev) {
$r = array();
$r['id'] = $rolev->id;
$r['name'] = $rolev->name;
$r['pId'] = 0;
$r['checked'] = $rolev->checked;
$arr2[] = $r;
if (!$rolev->children || empty($rolev->children)) {
continue;
}
foreach ($rolev->children as $rolek2 => $rolev2) {
$r2 = array();
$r2['id'] = $rolev2->id;
$r2['name'] = $rolev2->name;
$r2['pId'] = $rolev->id;
$r2['checked'] = $rolev2->checked;
$arr2[] = $r2;
}
}
// var_dump($arr2);exit;
foreach ($arr as $k => $v) {
foreach ($arr2 as $k2 => $v2) {
if($v2['checked'] == true){
$arr[$k]['checked'] = true;
$v['checked'] = true;
break;
}
}
}
$this->output->set_content_type('application/json')->set_output(json_encode($arr));
}
......
......@@ -179,6 +179,9 @@ class Work extends CI_Controller
if (!$ret->clientContactOutputVOS) {
$ret->clientContactOutputVOS = array();
}
if (!$ret->clientInfoOutputVO) {
$ret->clientInfoOutputVO = array();
}
if (!$ret->orderVO) {
$ret->orderVO = array();
}
......@@ -209,6 +212,7 @@ class Work extends CI_Controller
);
}
// var_dump($ret);exit;
switch ($state) {
case 1:
......
......@@ -13,9 +13,23 @@ class CheckLogin
public function check()
{
$session = $this->CI->session;
if (!$session->products) {
$session->products = $this->getProduct();
/*if (preg_match("/admin|base/i", uri_string())) {
if(!$this->CI->session->isadmin){
redirect('login');
return;
}
}*/
if (preg_match("/work|config|data|finance|loan|perm|tool|user/i", uri_string())) {
if (!$session->islogin) {
// redirect('login');
// return;
}
}
// if (!$session->products) {
$session->products = $this->getProduct();
// }
if (!$session->orderStatus) {
$session->orderStatus = $this->getOrderStatus();
}
......@@ -89,18 +103,7 @@ class CheckLogin
if (!$session->sourceBaseType) {
$session->sourceBaseType = $this->getSourceBaseType();
}
/*if (preg_match("/admin|base/i", uri_string())) {
if(!$this->CI->session->isadmin){
redirect('login');
return;
}
}
if (preg_match('/ucenter/i', uri_string())) {
if (!$this->CI->session->islogin) {
redirect('login/app');
return;
}
}*/
}
private function getProduct()
......
......@@ -121,6 +121,7 @@
aoData.phoneNumber = $('[name="phoneNumber"]').val() || '';
aoData.role = $('[name="role"]').val() || '';
aoData.code = $('[name="code"]').val() || '';
aoData.keyword = $('[name="keyword"]').val() || '';
aoData.repayStatus = $('[name="repayStatus"]').val() || '';
},
});
......
......@@ -6,10 +6,10 @@
<div class="row cl mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select" name="code" size="1" id="file">
<select class="select table_search" name="code" size="1">
<option value="" selected>选择字段</option>
<option value="productName">产品名称</option>
<option value="repaymentMode">还款方式</option>
<option value="0">产品名称</option>
<option value="1">还款方式</option>
</select>
</span>
</div>
......@@ -51,13 +51,13 @@
<script>
var table = $('#table').dataTable({
fnServerParams: function (aoData) {
delete aoData.columns;
file = $('#file').val();
if(file)
aoData[file] = $('#keywork').val();
},
// fnServerParams: function (aoData) {
// delete aoData.columns;
//
// file = $('#file').val();
// if(file)
// aoData[file] = $('#keywork').val();
// },
columns: [
{
data: "id", render: function (data, type, full) {
......
<?php
$this->load->view('common/header', ['styles' => [
'/resource/login.css'
]]);
$this->load->view('common/header', array('styles' => array(
'/resource/login.css')
));
?>
<body xmlns="http://www.w3.org/1999/html">
<div class="login_box">
<div class="login">
<div class="login_logo">
<img src="/resource/logo.png">
</div>
<div class="login_name">
<p>后台管理系统</p>
</div>
<form action=" " id="edit">
<input name="username" type="text" placeholder="用户名">
<input name="password" type="password" placeholder="密码">
</form>
<!-- <input value="登录" type="submit">-->
<button type="button" style="width: 100%" class="btn btn-primary full-width m-b btn-xs" onclick="save()">登录</button>
<div class="login_box">
<div class="login">
<div class="login_logo">
<img src="/resource/logo.png">
</div>
<div class="copyright">
版权所有©2018 杭州XX网络有限公司
<br />
(推荐IE10以上浏览器或谷歌浏览器或firefox浏览器, 获得更快响应速度)
<div class="login_name">
<p>后台管理系统</p>
</div>
<form action="login" id="edit">
<input name="username" type="text" placeholder="用户名">
<input name="password" type="password" placeholder="密码">
</form>
<!-- <input value="登录" type="submit">-->
<button type="button" style="width: 100%" class="btn btn-primary full-width m-b btn-xs" onclick="save()">登录
</button>
</div>
<div class="copyright">
版权所有©2018 杭州XX网络有限公司
<br/>
(推荐IE10以上浏览器或谷歌浏览器或firefox浏览器, 获得更快响应速度)
</div>
</div>
<?php $this->load->view('common/footer'); ?>
<?php $this->load->view('common/footer'); ?>
<script>
if (window != top) { // 判断当前的window对象是否是top对象
top.location.href = window.location.href; // 如果不是,将top对象的网址自动导向被嵌入网页的网址
}
function save() {
//获得款中的节点
var targetUrl = $("#edit").attr("action");//需要填写目的url
var data = $("#edit").serializeJson();
var newData = {
username:data['nameZh'],
password:data['id']
};
$.ajax({
type: 'post',
url: apiBaseUrl + targetUrl,
cache: false,
data: JSON.stringify(newData),
data: JSON.stringify(data),
dataType: 'json',
contentType: "application/json; charset=UTF-8",
success: function (data) {
......
......@@ -47,7 +47,7 @@
async: {
enable: true,
// url: '<?//=site_url('/perm/organization')?>//',
url: '<?=site_url('/perm/menu')?>',
url: '<?=site_url('/perm/menu/'.$id)?>',
autoParam:["id"]
},
check: {
......
......@@ -2,18 +2,41 @@
<body>
<div class="page-container">
<form class="" onreset="resetHandler()">
<?php $this->load->view('work/search'); ?>
<!--<form class="" onreset="resetHandler()">
<?php /*$this->load->view('work/search'); */?>
<div>
<button class="btn btn-primary radius" type="button" onclick="$('#table').DataTable().draw()">搜索</button>
<input class="btn btn-warning radius" type="reset" value="重置">
</div>
</form>-->
<form class="" onreset="resetHandler()">
<div class="row cl mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" name="code" size="1">
<option value="" selected>选择字段</option>
<option value="0">姓名</option>
<option value="1">身份证号</option>
<option value="2">手机号</option>
</select>
</span>
</div>
<div class="col-xs-2">
<input type="text" class="input-text" placeholder="" id="keywork" name="keyword">
</div>
<div>
<button class="btn btn-primary radius" type="button" onclick="$('#table').DataTable().draw()">搜索</button>
<input class="btn btn-warning radius" type="reset" value="重置">
</div>
<!--<div>
<button class="btn btn-primary radius" onclick="layer_show('添加', '<?/*= site_url('/config/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="client/clients">
<thead class="text-c">
<tr>
<th width="68px">操作</th>
<!-- <th width="68px">操作</th>-->
<th>客户编号</th>
<th>姓名</th>
<th>身份证</th>
......@@ -29,7 +52,7 @@
<?php $this->load->view('common/footer'); ?>
<script>
var table = $('#table').dataTable({
aaSorting: [[1, "desc"]],
/*aaSorting: [[1, "desc"]],
serverSide: true,
processing: true,
bSort: false,
......@@ -58,19 +81,19 @@
data.currentPage = parseFloat(data.start / data.length) + 1;
return data;
}
},
},*/
columns: [
{
data: "id", render: function (data, type, full) {
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>\
<ul class="dropDown-menu menu radius box-shadow">\
<li><a href="javascript:;" onclick="creatIframe(\''+url+'\', \'查看详细\')">查看详细</a></li>\
</ul></span>';
}
},
//{
// data: "id", render: function (data, type, full) {
// 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>\
// <ul class="dropDown-menu menu radius box-shadow">\
// <li><a href="javascript:;" onclick="creatIframe(\''+url+'\', \'查看详细\')">查看详细</a></li>\
// </ul></span>';
// }
//},
{data: "id"},//客户编号
{data: "userName"},//姓名
{data: "idCard"},//身份证
......@@ -79,7 +102,7 @@
]
});
$.fn.dataTableExt.afnFiltering.push(
/*$.fn.dataTableExt.afnFiltering.push(
function (oSettings, aData, iDataIndex) {
var min = document.getElementById('min').value;
var max = document.getElementById('max').value;
......@@ -111,7 +134,7 @@
function resetHandler() {
$('#table').DataTable().columns().search("").draw();
}
}*/
</script>
</body>
<html>
......
......@@ -74,14 +74,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"}, //处理人
]
});
......
......@@ -27,14 +27,14 @@
<table class="table table-border table-bg">
<tbody class="text-c">
<tr>
<td><i class="Hui-iconfont">&#xe60d;</i> <?=$clientInfoOutputVO->userName?></td>
<td><?=$clientInfoOutputVO->gender?></td>
<td><i class="Hui-iconfont">&#xe60d;</i> <?=$clientInfoOutputVO ? $clientInfoOutputVO->userName : ''?></td>
<td><?=$clientInfoOutputVO ? $clientInfoOutputVO->gender : ''?></td>
<!-- <td>20岁</td>-->
<td><?=$clientInfoOutputVO->educationDegree?></td>
<td><?=$clientInfoOutputVO->marriageState?></td>
<td><?=$clientInfoOutputVO ? $clientInfoOutputVO->educationDegree:''?></td>
<td><?=$clientInfoOutputVO ? $clientInfoOutputVO->marriageState : ''?></td>
<!-- <td>无子女</td>-->
<td><i class="Hui-iconfont">&#xe602;</i> <?=$clientInfoOutputVO->idCard?></td>
<td><i class="Hui-iconfont">&#xe63a;</i><?=$clientInfoOutputVO->monthlyIncome?></td>
<td><i class="Hui-iconfont">&#xe602;</i> <?=$clientInfoOutputVO ? $clientInfoOutputVO->idCard :''?></td>
<td><i class="Hui-iconfont">&#xe63a;</i><?=$clientInfoOutputVO ? $clientInfoOutputVO->monthlyIncome : ''?></td>
<!-- <td>14天</td>-->
</tr>
</tbody>
......
......@@ -6,6 +6,6 @@
<?php $this->load->view('work/申请信息/联系人信息'); ?>
<?php $this->load->view('common/footer'); ?>
<body>
</body>
</html>
......
......@@ -65,9 +65,10 @@
title: '通过',
icon: 3
}, function(){
var orderStatus = "<?=$applyOrderVO->status?>";
var data = $('#form').serializeJson();
//发起尽调
if(data.dueDiligence && data.dueDiligence == '1'){
if(data.dueDiligence && data.dueDiligence == '1' && false){
$.ajax({
type: 'post',
url: apiBaseUrl + 'flow/firstDueDiligence',
......@@ -95,7 +96,6 @@
})
}else{
data.status = 1;
var orderStatus = "<?=$applyOrderVO->status?>";
var url = 'flow/saveFirstCheck';
if(orderStatus == 4) {
url = url;
......
......@@ -64,14 +64,22 @@
{data: "userName"},//申请人
{data: "idCard"},//身份证
{data: "phoneNumber"},//手机号
{data: "createTime"},//进件时间
{data: function (data) {
if(!data.createTime)
return '';
return getNowFormatDate(new Date(parseInt(data.createTime)));
}},//进件时间
{data: "departmentName"},//网点
{data: "productName"},//产品名称
{data: "applyMoney"},//申请金额
{data: "agreeMoney"},//审批金额
{data: "createUser"},//客户经理
{data: "statusDesc"},//流程节点
{data: "modifyTime"},//流转时间
{data: function (data) {
if(!data.modifyTime)
return '';
return getNowFormatDate(new Date(parseInt(data.modifyTime)));
}},//流转时间
{data: "modifyUser"}//处理人
]
});
......
......@@ -84,14 +84,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"}, //处理人
]
});
......
......@@ -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"}, //处理人
]
});
......
......@@ -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"}, //处理人
]
});
......
......@@ -74,14 +74,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"}, //处理人
]
});
......
......@@ -94,14 +94,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"}, //处理人
]
});
......
......@@ -87,14 +87,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"}, //处理人
]
});
......
......@@ -62,14 +62,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"}, //处理人
]
});
......
......@@ -62,14 +62,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"}, //处理人
]
});
......
......@@ -73,14 +73,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"}, //处理人
]
});
......
......@@ -77,14 +77,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"}, //处理人
]
});
......
......@@ -62,14 +62,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"}, //处理人
]
});
......
......@@ -56,14 +56,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"}, //处理人
]
});
......
......@@ -68,14 +68,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"}, //处理人
]
});
......
......@@ -24,7 +24,7 @@
</div>
<div class="form-group col-sm-3 col-md-2">
<label>出生日期</label>
<input type="text" class="form-control input-text Wdate" value="<?=$clientInfoOutputVO->birthDate?>" onfocus="WdatePicker()">
<input type="text" class="form-control input-text Wdate" value="<?=date('Y-m-d',strtotime($clientInfoOutputVO->birthDate))?>" onfocus="WdatePicker()">
</div>
</div>
......@@ -63,10 +63,24 @@
<div class="form-group col-sm-12 col-md-12">
<label>居住情况</label>
<div class="info">
<div class="live-info">
<input type="checkbox" checked name="">
<span><?=$clientInfoOutputVO->dwellDetail?></span>
</div>
<?php foreach ($this->session->dwellEnum as $k => $v): ?>
<div class="live-info">
<input value="1" type="radio" <?= $clientInfoOutputVO && $clientInfoOutputVO->dwellState == $k ? 'checked' : '' ?>
name="clientInfoInputVO.dwellState">
<span><?= $v ?></span>
<?php if ($k == 0): ?>
<input type="text"
class="input-decoration w-50 text-c" name="clientInfoInputVO.dwellDetail" value="<?= $clientInfoOutputVO && $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?>">
<?php elseif ($k == 1): ?>
<input type="text" value="<?= $clientInfoOutputVO && $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?>"
name="clientInfoInputVO.dwellDetail" class="input-decoration w-50 text-c">
<?php elseif ($k == 2): ?>
<input type="text" value="<?= $clientInfoOutputVO && $clientInfoOutputVO->dwellState == $k ? $clientInfoOutputVO->dwellDetail : '' ?>"
name="clientInfoInputVO.dwellDetail" class="input-decoration w-50 text-c">
<?php endif; ?>
</div>
<?php endforeach; ?>
<!--<div class="live-info">
<input type="checkbox" name="" checked>
<span>自建</span>
......@@ -107,7 +121,8 @@
<label>户口所在地</label>
<span class="form-control select-box">
<select class="select" size="1">
<option><?=$clientInfoOutputVO->registerProvince?></option>
<option <?=$clientInfoOutputVO && $clientInfoOutputVO->registerProvince == 0 ? 'selected' : ''?> value="0">农村</option>
<option <?=$clientInfoOutputVO && $clientInfoOutputVO->registerProvince == 1 ? 'selected' : ''?> value="1">城镇</option>
</select>
</span>
</div>
......
......@@ -36,16 +36,16 @@
</div>
<div class="form-group col-sm-3 col-md-2">
<label>现单位电话</label>
<input type="text" class="form-control input-text" value="<?=$clientUnitOutputVO ? $clientUnitOutputVO->unitPhone : ''?>">
<input type="text" class="form-control input-text" value="<?=$clientUnitOutputVO && isset($clientUnitOutputVO->unitPhone) ? $clientUnitOutputVO->unitPhone : ''?>">
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-3 col-md-2">
<!--<div class="form-group col-sm-3 col-md-2">
<label>月收入</label>
<input type="text" class="form-control input-text" value="<?=$clientUnitOutputVO ? $clientUnitOutputVO->monthlyIncome : ''?>">
<input type="text" class="form-control input-text" value="<?/*=$clientUnitOutputVO ? $clientUnitOutputVO->monthlyIncome : ''*/?>">
<span class="glyphicon glyphicon-rmb form-control-feedback" aria-hidden="true"></span>
</div>
</div>-->
<div class="form-group col-sm-3 col-md-2">
<label>工资发放形式</label>
<span class="form-control select-box">
......
......@@ -19,7 +19,9 @@
<label>还款方式</label>
<span class="form-control select-box">
<select class="select" size="1" disabled>
<option><?=$applyOrderVO->payBackType?></option>
<?php foreach ($this->session->repayments as $k=>$v): ?>
<option <?=$v == $applyOrderVO->payBackType ? 'selected' : '' ?> value="<?=$k?>"><?=$v?></option>
<?php endforeach; ?>
</select>
</span>
</div>
......@@ -27,7 +29,9 @@
<label>贷款用途</label>
<span class="form-control select-box">
<select class="select" size="1" disabled>
<option><?=$applyOrderVO->use?></option>
<?php foreach ($this->session->loanUseEnum as $k => $v): ?>
<option <?=$applyOrderVO->use == $k ? 'selected' : '' ?> value="<?= $k ?>"><?= $v ?></option>
<?php endforeach; ?>
</select>
</span>
</div>
......
......@@ -77,14 +77,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"}, //处理人
]
});
......
......@@ -76,14 +76,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"}, //处理人
]
});
......
......@@ -76,14 +76,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"}, //处理人
]
});
......
......@@ -174,6 +174,10 @@
<label>户口所在地</label>
<span class="form-control select-box">
<select class="select" size="1" id="province" name="clientInfoInputVO.registerProvince">
<option value=""></option>
<option value="0">农村</option>
<option value="1">城镇</option>
</select>
</span>
</div>
......@@ -288,12 +292,12 @@
</div>
<div class="row cl">
<div class="form-group col-sm-3 col-md-2">
<!--<div class="form-group col-sm-3 col-md-2">
<label>月收入</label>
<input type="text" class="form-control input-text" name="clientUnitInputVO.monthlyIncome"
value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->monthlyIncome : '' ?>">
value="<?/*= $clientUnitOutputVO ? $clientUnitOutputVO->monthlyIncome : '' */?>">
<span class="glyphicon glyphicon-rmb form-control-feedback" aria-hidden="true"></span>
</div>
</div>-->
<div class="form-group col-sm-3 col-md-2">
<label>工资发放形式</label>
<span class="form-control select-box">
......
......@@ -58,14 +58,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"}, //处理人
]
});
......
......@@ -65,14 +65,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"}, //处理人
]
});
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!