228166b3 by wang

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

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