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

@@ -349,4 +349,9 @@ class Work extends CI_Controller
         $data['draw'] = $draw + 1;
         $this->output->set_content_type('application/json')->set_output(json_encode($data));
     }
+
+    public function inquiry ($id)
+    {
+        $this->load->view('/work/尽调报告/index', compact('id'));
+    }
 }

@@ -37,7 +37,7 @@
                     </span>
                 </div>
                 <div class="form-group col-sm-12">
-                    <textarea class="textarea" placeholder="" name="dueDiligencePurpose"></textarea>
+                    <textarea class="textarea" placeholder="" name="diligencePurpose"></textarea>
                 </div>
             </div>
         </div>
@@ -64,32 +64,62 @@
                 icon: 3
             }, function(){
                 var data = $('#form').serializeJson();
-                data.status = 1;
-                $.ajax({
-                    type: 'post',
-                    url: apiBaseUrl + 'flow/saveFirstCheck',
-                    cache: false,
-                    data: JSON.stringify(data),
-                    dataType: 'json',
-                    contentType: "application/json; charset=UTF-8",
-                    success: function (data) {
-                        if (data.msg) {
-                            layer.alert(data.msg);
-                        } else if (data.code != 0) {
-                            layer.alert('操作失败');
-                        } else {
-                            layer.alert('操作成功');
+                //发起尽调
+                if(data.dueDiligence){
+                    $.ajax({
+                        type: 'post',
+                        url: apiBaseUrl + 'flow/firstDueDiligence',
+                        cache: false,
+                        data: JSON.stringify(data),
+                        dataType: 'json',
+                        contentType: "application/json; charset=UTF-8",
+                        success: function (data) {
+                            if (data.msg) {
+                                layer.alert(data.msg);
+                            } else if (data.code != 0) {
+                                layer.alert('操作失败');
+                            } else {
+                                layer.alert('操作成功');
+                            }
+                            if(!data.code){
+                                setTimeout(function () {
+                                    loadIframe('<?=site_url('/work/check/12/'.$id);?>', '审核意见');
+                                }, 500)
+                            }
+                        },
+                        error: function () {
+                            layer.alert("操作失败")
                         }
-                        if(!data.code){
-                            setTimeout(function () {
-                                loadIframe('<?=site_url('/work/check/12/'.$id);?>', '审核意见');
-                            }, 500)
+                    })
+                }else{
+                    data.status = 1;
+                    var orderStatus = "<?=$applyOrderVO->status?>";
+                    $.ajax({
+                        type: 'post',
+                        url: apiBaseUrl + 'flow/saveFirstCheck',
+                        cache: false,
+                        data: JSON.stringify(data),
+                        dataType: 'json',
+                        contentType: "application/json; charset=UTF-8",
+                        success: function (data) {
+                            if (data.msg) {
+                                layer.alert(data.msg);
+                            } else if (data.code != 0) {
+                                layer.alert('操作失败');
+                            } else {
+                                layer.alert('操作成功');
+                            }
+                            if(!data.code){
+                                setTimeout(function () {
+                                    loadIframe('<?=site_url('/work/check/12/'.$id);?>', '审核意见');
+                                }, 500)
+                            }
+                        },
+                        error: function () {
+                            layer.alert("操作失败")
                         }
-                    },
-                    error: function () {
-                        layer.alert("操作失败")
-                    }
-                })
+                    })
+                }
             });
         }
     </script>

+<?php $this->load->view('common/header'); ?>
+
+<body>
+    <div id="tab" class="HuiTab">
+        <div class="tabBar clearfix" style="background-color:#e8e8e8">
+            <span>尽调报告</span>
+            <span>资料清单</span>
+        </div>
+
+        <div class="tabCon">
+            <?php $this->load->view('work/尽调报告/打工'); ?>
+            <!-- <?php $this->load->view('work/尽调报告/法人'); ?> -->
+        </div>
+
+        <div class="tabCon">
+            <?php $this->load->view('work/图片上传'); ?>
+        </div>
+
+    </div>
+
+    <?php $this->load->view('common/footer'); ?>
+
+    <script>
+        function getQueryString(name) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+            var r = window.location.search.substr(1).match(reg);
+            if (r != null) return unescape(r[2]); return null;
+        }
+
+        var index = getQueryString('tab');
+
+        $("#tab").Huitab({index: index});
+
+        uploadList();
+    </script>
+</body>
+</html>

@@ -67,7 +67,7 @@
                                 <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(\'订单详情\', \'/index.php/work/detail/' + data + '?tab=0\')">查看详细</a></li>\
-                                    <li><a href="javascript:;" onclick="layer_show(\'资料补录\', \'/index.php/work/record/' + data + '\')">马上尽调</a></li>\
+                                    <li><a href="javascript:;" onclick="layer_show(\'马上尽调\', \'/index.php/work/inquiry/' + data + '\')">马上尽调</a></li>\
                                     <li><a href="javascript:;" onclick="rollback(' + data + ')">驳回</a></li>\
                                     <li>\
                             <a href="#">退回订单<i class="arrow Hui-iconfont">&#xe6d7;</i></a>\