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

@@ -5,7 +5,7 @@
 			<li><a data-href="<?=site_url('/loan/reminder')?>" data-title="催收管理" href="javascript:void(0)"><i class="Hui-iconfont">&#xe637;</i>&nbsp;催收管理</a></li>
 			<li><a data-href="<?=site_url('/loan/reminder')?>" data-title="催收管理" href="javascript:void(0)"><i class="Hui-iconfont">&#xe637;</i>&nbsp;催收管理</a></li>
 			<li><a data-href="<?=site_url('/loan/prosecute')?>" data-title="起诉管理" href="javascript:void(0)"><i class="Hui-iconfont">&#xe6e0;</i>&nbsp;起诉管理</a></li>
 			<li><a data-href="<?=site_url('/loan/prosecute')?>" data-title="起诉管理" href="javascript:void(0)"><i class="Hui-iconfont">&#xe6e0;</i>&nbsp;起诉管理</a></li>
 			<li><a data-href="<?=site_url('/loan/prosecuted')?>" data-title="已起诉" href="javascript:void(0)"><i class="Hui-iconfont">&#xe631;</i>&nbsp;已起诉</a></li>
 			<li><a data-href="<?=site_url('/loan/prosecuted')?>" data-title="已起诉" href="javascript:void(0)"><i class="Hui-iconfont">&#xe631;</i>&nbsp;已起诉</a></li>
-			<li><a data-href="<?=site_url('/loan/database')?>" data-title="数据库" href="javascript:void(0)"><i class="Hui-iconfont">&#xe6b5;</i>&nbsp;数据库</a></li>
+<!--			<li><a data-href="--><?//=site_url('/loan/database')?><!--" data-title="数据库" href="javascript:void(0)"><i class="Hui-iconfont">&#xe6b5;</i>&nbsp;数据库</a></li>-->
 		</ul>
 		</ul>
     </div>
     </div>
 </aside>
 </aside>

@@ -27,15 +27,15 @@
     <table class="table table-border table-bg">
     <table class="table table-border table-bg">
         <tbody class="text-c">
         <tbody class="text-c">
         <tr>
         <tr>
-            <td><i class="Hui-iconfont">&#xe60d;</i> 王小赞</td>
-            <td>女</td>
-            <td>20岁</td>
-            <td>博士</td>
-            <td>已婚</td>
-            <td>无子女</td>
-            <td><i class="Hui-iconfont">&#xe602;</i> 333333333333333333</td>
-            <td><i class="Hui-iconfont">&#xe63a;</i> ￥3000.00</td>
-            <td>14天</td>
+            <td><i class="Hui-iconfont">&#xe60d;</i> <?=$clientInfoOutputVO->userName?></td>
+            <td><?=$clientInfoOutputVO->gender?></td>
+<!--            <td>20岁</td>-->
+            <td><?=$clientInfoOutputVO->educationDegree?></td>
+            <td><?=$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>14天</td>-->
         </tr>
         </tr>
         </tbody>
         </tbody>
     </table>
     </table>

@@ -6,7 +6,7 @@
             <span>申请信息</span>
             <span>申请信息</span>
             <span>资料信息</span>
             <span>资料信息</span>
             <span>处理信息</span>
             <span>处理信息</span>
-            <span>订单进度</span>
+<!--            <span>订单进度</span>-->
         </div>
         </div>
 
 
         <!-- 申请信息 -->
         <!-- 申请信息 -->
@@ -49,7 +49,7 @@
         </div>
         </div>
         <!-- 订单进度 -->
         <!-- 订单进度 -->
         <div class="tabCon">
         <div class="tabCon">
-            <?php $this->load->view('work/订单进度'); ?>
+<!--            --><?php //$this->load->view('work/订单进度'); ?>
         </div>
         </div>
     </div>
     </div>
 
 

@@ -286,6 +286,19 @@
                             <input type="text" class="form-control input-text"
                             <input type="text" class="form-control input-text"
                                    value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->unitPhone : '' ?>">
                                    value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->unitPhone : '' ?>">
                         </div>
                         </div>
+
+                        <div class="form-group col-sm-3 col-md-2">
+                            <label>职称类型</label>
+                            <span class="form-control select-box">
+                                    <select class="select" size="1">
+                                        <?php foreach ($this->session->jobTypeEnum as $k => $v): ?>
+                                            <option <?= $clientUnitOutputVO && $clientUnitOutputVO->jobType == $k ? 'selected' : '' ?>
+                                                    value="<?= $k ?>"><?= $v ?></option>
+                                        <?php endforeach; ?>
+                                    </select>
+                                </span>
+                        </div>
+
                     </div>
                     </div>
 
 
                     <div class="row cl">
                     <div class="row cl">

@@ -125,18 +125,13 @@
                 title: '确认拒绝',
                 title: '确认拒绝',
                 icon: 3
                 icon: 3
             }, function(){
             }, function(){
-                var targetUrl = 'flow/confirm2NextStatus/' + id;
-                var data = {
-                    "destOrderStatus": 0,
-                    "opinion": "",
-                    "orderStatus": 1
-                }
+                var targetUrl = 'flow/refuseStatus/' + id;
                 $.ajax({
                 $.ajax({
                     type: 'put',
                     type: 'put',
                     url: apiBaseUrl + targetUrl,
                     url: apiBaseUrl + targetUrl,
                     cache: false,
                     cache: false,
                     dataType: 'json',
                     dataType: 'json',
-                    data: JSON.stringify(data),
+                    // data: JSON.stringify(data),
                     contentType: "application/json; charset=UTF-8",
                     contentType: "application/json; charset=UTF-8",
                     success: function (data) {
                     success: function (data) {
                         if (data.msg) {
                         if (data.msg) {