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

@@ -214,6 +214,11 @@ class Work extends CI_Controller
                 $this->load->view('work/审批/网查筛选', $data);
                 break;
             case 8:
+                $url = $this->config->item('apiBaseUrl') . 'audit/phoneAudit/record/' . $id;
+                $result = file_get_contents($url);
+                $json = json_decode($result);
+                $ret = $json->data;
+                $data['record'] = $ret;
                 $this->load->view('work/审批/电核', $data);
                 break;
             case 9:
@@ -231,9 +236,10 @@ class Work extends CI_Controller
         }
     }
 
-    public function telAdd()
+    public function telAdd($id)
     {
-        $this->load->view('work/审批/电核添加');
+        $data = array('id'=>$id);
+        $this->load->view('work/审批/电核添加', $data);
     }
 
     public function telRefuse()

@@ -38,26 +38,29 @@
                         <th>是否拨通</th>
                         <th>电核人</th>
                         <th>备注</th>
-                        <th width="70px">操作</th>
+<!--                        <th width="70px">操作</th>-->
                     </tr>
                 </thead>
                 <tbody class="text-c">
-                    <tr>
-                        <td>1</td>
-                        <td>2018-01-01 00:00:00</td>
-                        <td>是</td>
-                        <td>张三</td>
-                        <td>备注</td>
-                        <td><a href="javascript:add();"><i class="Hui-iconfont">&#xe6df;</i> 编辑<a></td>
-                    </tr>
-                    <tr>
+                    <?php
+                    ?>
+                    <?php foreach ($record as $k=>$v):?>
+                        <tr>
+                            <td><?=$v->id?></td>
+                            <td><?=$v->phoneAuditTime?></td>
+                            <td><?=$v->hasPutThrough ? '是' : '否'?></td>
+                            <td><?=$v->phoneAuditEmployee?></td>
+                            <td><?=$v->remark?></td>
+                        </tr>
+                    <?php endforeach;?>
+                    <!--<tr>
                         <td>1</td>
                         <td>2018-01-01 00:00:00</td>
                         <td>是</td>
                         <td>张三</td>
                         <td>备注</td>
                         <td><a href="javascript:add();"><i class="Hui-iconfont">&#xe6df;</i> 编辑<a></td>
-                    </tr>
+                    </tr>-->
                 </tbody>
             </table>
         </div>
@@ -94,7 +97,7 @@
                 title: '电核记录',
                 shadeClose: true,
                 area: ['800px', '400px'],
-                content: '<?=site_url('work/telAdd')?>'
+                content: '<?=site_url('work/telAdd/'.$id)?>'
             });
         }
 
@@ -135,9 +138,7 @@
                 error: function () {
                     layer.alert("操作失败")
                 }
-
             })
-
         }
     </script>
 </body>