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

@@ -154,6 +154,7 @@ class Work extends CI_Controller
             'applyOrderVO'=>$ret->applyOrderVO,
             'operatorRecord'=>$ret2
         );
+        var_dump($data);exit;
 
         $this->load->view('work/资料/资料补录', $data);
     }

@@ -44,11 +44,12 @@
             {
                 data: "id", render: function (data, type, full) {
                     var url = "<?=site_url('/work/record')?>";
+                    url += '/' + data;
                     return '<span class="dropDown dropDown_hover">\
                                <button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
                                <ul class="dropDown-menu menu radius box-shadow">\
                                    <li><a href="javascript:;" onclick="layer_show(\'资料补录\',\'' + url + '\')">资料补录</a></li>\
-                                   <li><a href="javascript:cancel(1);">客户取消</a></li>\
+                                   <li><a href="javascript:cancel('+data+');">客户取消</a></li>\
                                </ul>\
                            </span>';
                 }