Skip to content

杨建斌 / page

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

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

2 parents 20612be2 bc1a381a
Expand all
Inline Side-by-side
Showing 9 changed files with 69 additions and 29 deletions
application/controllers/User.php
...@@ -19,7 +19,8 @@ class User extends CI_Controller { ...@@ -19,7 +19,8 @@ class User extends CI_Controller {
19 'clientInfoOutputVO'=>$data->clientInfoOutputVO, 19 'clientInfoOutputVO'=>$data->clientInfoOutputVO,
20 'clientUnitOutputVO'=>$data->clientUnitOutputVO, 20 'clientUnitOutputVO'=>$data->clientUnitOutputVO,
21 'clientContactOutputVOS'=>$data->clientContactOutputVOS, 21 'clientContactOutputVOS'=>$data->clientContactOutputVOS,
22 'applyOrderVO'=>$data->applyOrderVO 22 'applyOrderVO'=>$data->applyOrderVO,
23 'id'=>$data->applyOrderVo->id
23 ); 24 );
24 switch ($state) { 25 switch ($state) {
25 case '1': 26 case '1':
......
application/controllers/Work.php
...@@ -146,7 +146,7 @@ class Work extends CI_Controller ...@@ -146,7 +146,7 @@ class Work extends CI_Controller
146 $recordUrl = $this->config->item('apiBaseUrl') . 'order/orderOperatorRecord/' . $id; 146 $recordUrl = $this->config->item('apiBaseUrl') . 'order/orderOperatorRecord/' . $id;
147 $result2 = file_get_contents($recordUrl); 147 $result2 = file_get_contents($recordUrl);
148 $json2 = json_decode($result2); 148 $json2 = json_decode($result2);
149 $ret2 = $json2->data; 149 $ret2 = isset($json2->data) ? $json2 : array();
150 150
151 $data = array( 151 $data = array(
152 'clientInfoOutputVO' => $ret->clientInfoOutputVO, 152 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
......
application/views/common/footer.php
...@@ -42,8 +42,10 @@ ...@@ -42,8 +42,10 @@
42 return null; //返回参数值 42 return null; //返回参数值
43 } 43 }
44 44
45 function getNowFormatDate() { 45 function getNowFormatDate(date) {
46 var date = new Date(); 46 if(!date){
47 date = new Date();
48 }
47 var seperator1 = "-"; 49 var seperator1 = "-";
48 var year = date.getFullYear(); 50 var year = date.getFullYear();
49 var month = date.getMonth() + 1; 51 var month = date.getMonth() + 1;
...@@ -141,6 +143,7 @@ ...@@ -141,6 +143,7 @@
141 url: apiBaseUrl + url, 143 url: apiBaseUrl + url,
142 cache: false, 144 cache: false,
143 data:JSON.stringify(data), 145 data:JSON.stringify(data),
146 // data:data,
144 dataType:'json', 147 dataType:'json',
145 contentType: "application/json; charset=UTF-8", 148 contentType: "application/json; charset=UTF-8",
146 success:function(data){ 149 success:function(data){
......
application/views/user/index.php
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <table class="table table-border table-bordered table-bg" id="table"> 13 <table class="table table-border table-bordered table-bg" id="table">
14 <thead class="text-c"> 14 <thead class="text-c">
15 <tr> 15 <tr>
16 <!-- <th width="68px">操作</th>--> 16 <th width="68px">操作</th>
17 <th>客户编号</th> 17 <th>客户编号</th>
18 <th>姓名</th> 18 <th>姓名</th>
19 <th>身份证</th> 19 <th>身份证</th>
...@@ -60,10 +60,9 @@ ...@@ -60,10 +60,9 @@
60 } 60 }
61 }, 61 },
62 columns: [ 62 columns: [
63 /*{ 63 {
64 data: "id", render: function (data, type, full) { 64 data: "id", render: function (data, type, full) {
65 65 var url = "<?=site_url('/user/info')?>";
66 var url = "< ?=site_url('/user/info')?>";
67 url += '/' + data; 66 url += '/' + data;
68 return '<span class="dropDown dropDown_hover">\ 67 return '<span class="dropDown dropDown_hover">\
69 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\ 68 <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
...@@ -71,7 +70,7 @@ ...@@ -71,7 +70,7 @@
71 <li><a href="javascript:;" onclick="creatIframe(\''+url+'\', \'查看详细\')">查看详细</a></li>\ 70 <li><a href="javascript:;" onclick="creatIframe(\''+url+'\', \'查看详细\')">查看详细</a></li>\
72 </ul></span>'; 71 </ul></span>';
73 } 72 }
74 },*/ 73 },
75 {data: "id"},//客户编号 74 {data: "id"},//客户编号
76 {data: "userName"},//姓名 75 {data: "userName"},//姓名
77 {data: "idCard"},//身份证 76 {data: "idCard"},//身份证
......
application/views/work/index.php
...@@ -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 });
......
application/views/work/审批/终审意见.php
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 <div class="panel-header">初审意见</div> 23 <div class="panel-header">初审意见</div>
24 <div class="panel-body cl"> 24 <div class="panel-body cl">
25 <div class="row cl"> 25 <div class="row cl">
26 <div class="form-group col-sm-3 col-md-1"> 26 <div class="form-group col-sm-3 col-md-2">
27 <label>拟批</label> 27 <label>拟批</label>
28 <input type="text" class="form-control input-text" 28 <input type="text" class="form-control input-text"
29 value="<?= $getFirstCheck ? $getFirstCheck->mockMoney : '' ?>" disabled> 29 value="<?= $getFirstCheck ? $getFirstCheck->mockMoney : '' ?>" disabled>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 <div class="panel-header">复审意见</div> 44 <div class="panel-header">复审意见</div>
45 <div class="panel-body cl"> 45 <div class="panel-body cl">
46 <div class="row cl"> 46 <div class="row cl">
47 <div class="form-group col-sm-3 col-md-1"> 47 <div class="form-group col-sm-3 col-md-2">
48 <label>拟批</label> 48 <label>拟批</label>
49 <input type="text" class="form-control input-text" 49 <input type="text" class="form-control input-text"
50 value="<?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?>" disabled> 50 value="<?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?>" disabled>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 <div class="form-group col-sm-12 col-md-12"> 55 <div class="form-group col-sm-12 col-md-12">
56 <label>拟批备注</label> 56 <label>拟批备注</label>
57 <textarea class="textarea" 57 <textarea class="textarea"
58 disabled><?= $getSecondCheck ? $getSecondCheck->mockMoney : '' ?></textarea> 58 disabled><?= $getSecondCheck ? $getSecondCheck->description : '' ?></textarea>
59 </div> 59 </div>
60 </div> 60 </div>
61 </div> 61 </div>
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
89 <div class="form-group col-sm-3 col-md-1"> 89 <div class="form-group col-sm-3 col-md-1">
90 <label>借款利率</label> 90 <label>借款利率</label>
91 <input type="text" class="form-control input-text" name="annualInterestRate" value=""> 91 <input type="text" class="form-control input-text" name="annualInterestRate" value="">
92 <span class="glyphicon form-control-feedback">%</span>
92 </div> 93 </div>
93 <div class="form-group col-sm-4 col-md-2"> 94 <div class="form-group col-sm-4 col-md-2">
94 <label>每月还款金额</label> 95 <label>每月还款金额</label>
...@@ -103,7 +104,7 @@ ...@@ -103,7 +104,7 @@
103 <select class="select" size="1" name="productId"> 104 <select class="select" size="1" name="productId">
104 <option value="">贷款产品</option> 105 <option value="">贷款产品</option>
105 <?php foreach ($this->session->products as $k => $v): ?> 106 <?php foreach ($this->session->products as $k => $v): ?>
106 <option value="<?= $v->id ?>"><?= $v->productName ?></option> 107 <option <?=$applyOrderVO->productId == $v->id ? 'selected' : ''?> value="<?= $v->id ?>"><?= $v->productName ?></option>
107 <?php endforeach; ?> 108 <?php endforeach; ?>
108 </select> 109 </select>
109 </span> 110 </span>
...@@ -149,6 +150,7 @@ ...@@ -149,6 +150,7 @@
149 } else if (orderStatus == 6) { 150 } else if (orderStatus == 6) {
150 url = 'flow/saveLastCheck'; 151 url = 'flow/saveLastCheck';
151 } 152 }
153 data.annualInterestRate = parseFloat(data.annualInterestRate) /100;
152 $.ajax({ 154 $.ajax({
153 type: 'post', 155 type: 'post',
154 url: apiBaseUrl + url, 156 url: apiBaseUrl + url,
......
application/views/work/资料/资料补录.php
...@@ -273,17 +273,17 @@ ...@@ -273,17 +273,17 @@
273 value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->unitPhone : '' ?>"> 273 value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->unitPhone : '' ?>">
274 </div> 274 </div>
275 275
276 <div class="form-group col-sm-3 col-md-2"> 276 <!--<div class="form-group col-sm-3 col-md-2">
277 <label>职称类型</label> 277 <label>职称类型</label>
278 <span class="form-control select-box"> 278 <span class="form-control select-box">
279 <select class="select" size="1" name="clientUnitInputVO.jobType"> 279 <select class="select" size="1" name="clientUnitInputVO.jobType">
280 <?php foreach ($this->session->jobTypeEnum as $k => $v): ?> 280 <?php /*foreach ($this->session->jobTypeEnum as $k => $v): */?>
281 <option <?= $clientUnitOutputVO && $clientUnitOutputVO->jobType == $k ? 'selected' : '' ?> 281 <option <?/*= $clientUnitOutputVO && $clientUnitOutputVO->jobType == $k ? 'selected' : '' */?>
282 value="<?= $k ?>"><?= $v ?></option> 282 value="<?/*= $k */?>"><?/*= $v */?></option>
283 <?php endforeach; ?> 283 <?php /*endforeach; */?>
284 </select> 284 </select>
285 </span> 285 </span>
286 </div> 286 </div>-->
287 287
288 </div> 288 </div>
289 289
...@@ -532,7 +532,7 @@ ...@@ -532,7 +532,7 @@
532 } 532 }
533 reader.readAsDataURL(file[0]); 533 reader.readAsDataURL(file[0]);
534 } else { 534 } else {
535 alert(file[0].name + " is not a valid image file."); 535 alert(file[0].name + " is not a valid image file.");;
536 dvPreview.html(""); 536 dvPreview.html("");
537 return false; 537 return false;
538 } 538 }
...@@ -546,7 +546,8 @@ ...@@ -546,7 +546,8 @@
546 var data = $("form").serializeJson(); 546 var data = $("form").serializeJson();
547 data = json(data); 547 data = json(data);
548 data.clientContactInputVOS = Object.values(data.clientContactInputVOS); 548 data.clientContactInputVOS = Object.values(data.clientContactInputVOS);
549 549 var dwellDetail = $('[name=clientInfoInputVO\\.dwellState]:checked').parent().find('input[type=text]').val();
550 data.clientInfoInputVO.dwellDetail = dwellDetail;
550 ajax('client/collection', 'post', data, '操作成功', function () { 551 ajax('client/collection', 'post', data, '操作成功', function () {
551 window.parent.reload(); 552 window.parent.reload();
552 layer_close(); 553 layer_close();
......
application/views/work/资料补录.php
...@@ -72,13 +72,39 @@ ...@@ -72,13 +72,39 @@
72 </script> 72 </script>
73 73
74 <script> 74 <script>
75
75 function cancel(id) { 76 function cancel(id) {
76 layer.confirm('取消之后, 将立即进入【已取消】列表', { 77 layer.confirm('确定取消？', {
77 btn: ['确认', '取消'], 78 btn: ['是','否'],
78 title: '客户取消', 79 title: '确认',
79 icon: 2 80 icon: 3
80 }, function () { 81 }, function(){
81 layer.msg('取消'); 82 var targetUrl = 'flow/cancelOrder/' + id;
83 $.ajax({
84 type: 'put',
85 url: apiBaseUrl + targetUrl,
86 cache: false,
87 dataType: 'json',
88 contentType: "application/json; charset=UTF-8",
89 success: function (data) {
90 if (data.msg) {
91 layer.alert(data.msg);
92 } else if (data.code != 0) {
93 layer.alert('操作失败');
94 } else {
95 layer.alert('操作成功');
96 }
97 setTimeout(function () {
98 if(!data.code) {
99 table.fnDraw();
100 layer_close();
101 }
102 },500);
103 },
104 error: function () {
105 layer.alert("操作失败")
106 }
107 })
82 }); 108 });
83 } 109 }
84 </script> 110 </script>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!