95327550 by Zelig

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

2 parents c8c0470f 7cc939af
...@@ -104,8 +104,6 @@ class Work extends CI_Controller ...@@ -104,8 +104,6 @@ class Work extends CI_Controller
104 $result = file_get_contents($url); 104 $result = file_get_contents($url);
105 $json = json_decode($result); 105 $json = json_decode($result);
106 $ret = $json->data; 106 $ret = $json->data;
107 // print_r($ret);exit;
108 // var_dump($ret);exit;
109 if (!$ret->clientUnitOutputVO) { 107 if (!$ret->clientUnitOutputVO) {
110 $ret->clientUnitOutputVO = array(); 108 $ret->clientUnitOutputVO = array();
111 } 109 }
...@@ -133,7 +131,31 @@ class Work extends CI_Controller ...@@ -133,7 +131,31 @@ class Work extends CI_Controller
133 */ 131 */
134 public function record($id = null) 132 public function record($id = null)
135 { 133 {
136 $this->load->view('work/资料/资料补录'); 134 $url = $this->config->item('apiBaseUrl') . 'order/detail/'.$id;
135 $result = file_get_contents($url);
136 $json = json_decode($result);
137 $ret = $json->data;
138 if (!$ret->clientUnitOutputVO) {
139 $ret->clientUnitOutputVO = array();
140 }
141 if (!$ret->clientContactOutputVOS) {
142 $ret->clientContactOutputVOS = array();
143 }
144
145 $recordUrl = $this->config->item('apiBaseUrl') . 'order/orderOperatorRecord/'.$id;
146 $result2 = file_get_contents($recordUrl);
147 $json2 = json_decode($result2);
148 $ret2 = $json2->data;
149
150 $data = array(
151 'clientInfoOutputVO'=>$ret->clientInfoOutputVO,
152 'clientUnitOutputVO'=>$ret->clientUnitOutputVO,
153 'clientContactOutputVOS'=>$ret->clientContactOutputVOS,
154 'applyOrderVO'=>$ret->applyOrderVO,
155 'operatorRecord'=>$ret2
156 );
157
158 $this->load->view('work/资料/资料补录', $data);
137 } 159 }
138 160
139 public function recorded($id = null) 161 public function recorded($id = null)
......
...@@ -79,6 +79,13 @@ class CheckLogin ...@@ -79,6 +79,13 @@ class CheckLogin
79 if (!$session->genderEnum) { 79 if (!$session->genderEnum) {
80 $session->genderEnum = $this->getGenderEnum(); 80 $session->genderEnum = $this->getGenderEnum();
81 } 81 }
82
83 if (!$session->loanUseEnum) {
84 $session->loanUseEnum = $this->getLoanUseEnum();
85 }
86 if (!$session->loanNatureEnum) {
87 $session->loanNatureEnum = $this->getLoanNatureEnum();
88 }
82 /*if (preg_match("/admin|base/i", uri_string())) { 89 /*if (preg_match("/admin|base/i", uri_string())) {
83 if(!$this->CI->session->isadmin){ 90 if(!$this->CI->session->isadmin){
84 redirect('login'); 91 redirect('login');
...@@ -302,4 +309,28 @@ class CheckLogin ...@@ -302,4 +309,28 @@ class CheckLogin
302 } 309 }
303 } 310 }
304 311
312 private function getLoanUseEnum()
313 {
314 try {
315 $url = $this->CI->config->item('apiBaseUrl') . 'enum/loan/use';
316 $res = json_decode(file_get_contents($url));
317 $products = $res->data;
318 return $products;
319 } catch (Exception $e) {
320 return array();
321 }
322 }
323
324 private function getLoanNatureEnum()
325 {
326 try {
327 $url = $this->CI->config->item('apiBaseUrl') . 'enum/loan/nature';
328 $res = json_decode(file_get_contents($url));
329 $products = $res->data;
330 return $products;
331 } catch (Exception $e) {
332 return array();
333 }
334 }
335
305 } 336 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -67,14 +67,14 @@ ...@@ -67,14 +67,14 @@
67 <div class="row cl"> 67 <div class="row cl">
68 <div class="form-group col-sm-3 col-md-2"> 68 <div class="form-group col-sm-3 col-md-2">
69 <label>姓名</label> 69 <label>姓名</label>
70 <input type="text" class="form-control input-text" value="张三"> 70 <input type="text" class="form-control input-text" value="<?=$clientInfoOutputVO->userName?>">
71 </div> 71 </div>
72 <div class="form-group col-sm-3 col-md-2"> 72 <div class="form-group col-sm-3 col-md-2">
73 <label>性别</label> 73 <label>性别</label>
74 <span class="form-control select-box"> 74 <span class="form-control select-box">
75 <select class="select" size="1"> 75 <select class="select" size="1">
76 <?php foreach ($this->session->genderEnum as $k=>$v):?> 76 <?php foreach ($this->session->genderEnum as $k=>$v):?>
77 <option value="<?=$k?>"><?=$v?></option> 77 <option <?=$clientInfoOutputVO->gender == $k ? 'selected' : ''?> value="<?=$k?>"><?=$v?></option>
78 <?php endforeach;?> 78 <?php endforeach;?>
79 </select> 79 </select>
80 </span> 80 </span>
...@@ -84,14 +84,14 @@ ...@@ -84,14 +84,14 @@
84 <span class="form-control select-box"> 84 <span class="form-control select-box">
85 <select class="select" size="1"> 85 <select class="select" size="1">
86 <?php foreach ($this->session->marryEnum as $k=>$v):?> 86 <?php foreach ($this->session->marryEnum as $k=>$v):?>
87 <option value="<?=$k?>"><?=$v?></option> 87 <option <?=$clientInfoOutputVO->marriageState == $k ? 'selected' : ''?> value="<?=$k?>"><?=$v?></option>
88 <?php endforeach;?> 88 <?php endforeach;?>
89 </select> 89 </select>
90 </span> 90 </span>
91 </div> 91 </div>
92 <div class="form-group col-sm-3 col-md-2"> 92 <div class="form-group col-sm-3 col-md-2">
93 <label>出生日期</label> 93 <label>出生日期</label>
94 <input type="text" class="form-control input-text Wdate" value="2018-01-01"> 94 <input type="text" class="form-control input-text Wdate" value="<?=$clientInfoOutputVO->birthDate?>">
95 </div> 95 </div>
96 </div> 96 </div>
97 97
...@@ -101,29 +101,29 @@ ...@@ -101,29 +101,29 @@
101 <span class="form-control select-box"> 101 <span class="form-control select-box">
102 <select class="select" size="1"> 102 <select class="select" size="1">
103 <?php foreach ($this->session->educationEnum as $k=>$v):?> 103 <?php foreach ($this->session->educationEnum as $k=>$v):?>
104 <option value="<?=$k?>"><?=$v?></option> 104 <option <?=$clientInfoOutputVO->educationDegree == $k ? 'selected' : ''?> value="<?=$k?>"><?=$v?></option>
105 <?php endforeach;?> 105 <?php endforeach;?>
106 </select> 106 </select>
107 </span> 107 </span>
108 </div> 108 </div>
109 <div class="form-group col-sm-3 col-md-2"> 109 <div class="form-group col-sm-3 col-md-2">
110 <label>身份证</label> 110 <label>身份证</label>
111 <input type="text" class="form-control input-text" value=""> 111 <input type="text" class="form-control input-text" value="<?=$clientInfoOutputVO->idCard?>">
112 </div> 112 </div>
113 </div> 113 </div>
114 114
115 <div class="row cl"> 115 <div class="row cl">
116 <div class="form-group has-feedback col-sm-3 col-md-2"> 116 <div class="form-group has-feedback col-sm-3 col-md-2">
117 <label>月收入</label> 117 <label>月收入</label>
118 <input type="text" class="form-control input-text" value=""> 118 <input type="text" class="form-control input-text" value="<?=$clientInfoOutputVO->monthlyIncome?>">
119 <span class="glyphicon glyphicon-rmb form-control-feedback" aria-hidden="true"></span> 119 <span class="glyphicon glyphicon-rmb form-control-feedback" aria-hidden="true"></span>
120 </div> 120 </div>
121 <div class="form-group col-sm-3 col-md-2"> 121 <div class="form-group col-sm-3 col-md-2">
122 <label>有无本地房产</label> 122 <label>有无本地房产</label>
123 <span class="form-control select-box"> 123 <span class="form-control select-box">
124 <select class="select" size="1"> 124 <select class="select" size="1">
125 <option value="0"></option> 125 <option <?=$clientInfoOutputVO->localHouse == $k ? 'selected' : ''?> value="0"></option>
126 <option value="1"></option> 126 <option <?=$clientInfoOutputVO->localHouse == $k ? 'selected' : ''?> value="1"></option>
127 </select> 127 </select>
128 </span> 128 </span>
129 </div> 129 </div>
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
348 <div class="form-group col-sm-3 col-md-2"> 348 <div class="form-group col-sm-3 col-md-2">
349 <label>还款方式</label> 349 <label>还款方式</label>
350 <span class="form-control select-box"> 350 <span class="form-control select-box">
351 <select class="select" size="1"> 351 <select class="select" size=c"">
352 <option value="1"></option> 352 <option value="1"></option>
353 </select> 353 </select>
354 </span> 354 </span>
...@@ -357,7 +357,9 @@ ...@@ -357,7 +357,9 @@
357 <label>贷款用途</label> 357 <label>贷款用途</label>
358 <span class="form-control select-box"> 358 <span class="form-control select-box">
359 <select class="select" size="1"> 359 <select class="select" size="1">
360 <option value="1"></option> 360 <?php foreach ($this->session->loanUseEnum as $k=>$v):?>
361 <option value="<?=$k?>"><?=$v?></option>
362 <?php endforeach;?>
361 </select> 363 </select>
362 </span> 364 </span>
363 </div> 365 </div>
...@@ -381,7 +383,9 @@ ...@@ -381,7 +383,9 @@
381 <label>贷款用途性质</label> 383 <label>贷款用途性质</label>
382 <span class="form-control select-box"> 384 <span class="form-control select-box">
383 <select class="select" size="1"> 385 <select class="select" size="1">
384 <option value="1"></option> 386 <?php foreach ($this->session->loanNatureEnum as $k=>$v):?>
387 <option value="<?=$k?>"><?=$v?></option>
388 <?php endforeach;?>
385 </select> 389 </select>
386 </span> 390 </span>
387 </div> 391 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!