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

wang
Showing 4 changed files with 30 additions and 3 deletions
application/controllers/Work.php
application/views/work/审批/录入信用报告.php
application/views/work/尽调报告/index.php
application/views/work/资料/资料补录.php
--- a/application/controllers/Work.php
View file @ac57faf
+++ b/application/controllers/Work.php
View file @ac57faf
@@ -352,6 +352,24 @@ class Work extends CI_Controller
    public function inquiry ($id)
    {
+        $url = $this->config->item('apiBaseUrl') . 'order/detail/' . $id;
+        $result = file_get_contents($url);
+        $json = json_decode($result);
+        $ret = $json->data;
+        if (!$ret->clientUnitOutputVO) {
+            $ret->clientUnitOutputVO = array();
+        }
+        if (!$ret->clientContactOutputVOS) {
+            $ret->clientContactOutputVOS = array();
+        }
+        $data = array(
+            'clientInfoOutputVO' => $ret->clientInfoOutputVO,
+            'clientUnitOutputVO' => $ret->clientUnitOutputVO,
+            'clientContactOutputVOS' => $ret->clientContactOutputVOS,
+            'applyOrderVO' => $ret->applyOrderVO
+        );
        $this->load->view('/work/尽调报告/index', compact('id'));
    }
 }
--- a/application/views/work/审批/录入信用报告.php
View file @ac57faf
+++ b/application/views/work/审批/录入信用报告.php
View file @ac57faf
@@ -3,9 +3,13 @@
 <body>
    <div class="cl pd-5 bg-1">
        <span class="l">
+            <?php if($applyOrderVO->status == 4): ?>
            <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/6/'.$id)?>', '录入信用报告');">录入信用报告</button>
            <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/7/'.$id)?>', '网查筛查');">网查筛查</button>
            <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/8/'.$id)?>', '电核');">电核</button>
+            <?php endif;?>
            <button class="btn btn-primary radius" onclick="loadIframe('<?=site_url('work/check/9/'.$id)?>', '受理意见');">受理意见</button>
        </span>
        <span class="r">
--- a/application/views/work/尽调报告/index.php
View file @ac57faf
+++ b/application/views/work/尽调报告/index.php
View file @ac57faf
@@ -8,8 +8,13 @@
        </div>
        <div class="tabCon">
-            <?php $this->load->view('work/尽调报告/打工'); ?>
+            <?php
-            <!-- <?php $this->load->view('work/尽调报告/法人'); ?> -->
+               if($clientUnitInputVO->jobType == 1){ //打工类
+                   $this->load->view('work/尽调报告/打工');
+               } else { // 经营类
+                   $this->load->view('work/尽调报告/法人');
+               }
+             ?>
        </div>
        <div class="tabCon">
--- a/application/views/work/资料/资料补录.php
View file @ac57faf
+++ b/application/views/work/资料/资料补录.php
View file @ac57faf
@@ -215,7 +215,7 @@
                <div class="panel-header">单位信息</div>
                <div class="panel-body">
                    <div class="row cl">
-                        <input type="hidden" class="form-control input-text" name="clientInfoInputVO.userId" value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->id: '' ?>">
+                        <input type="hidden" class="form-control input-text" name="clientInfoInputVO.id" value="<?= $clientInfoOutputVO ? $clientInfoOutputVO->id: '' ?>">
                        <div class="form-group col-sm-3 col-md-2">
                            <label>单位名称</label>
                            <input type="text" class="form-control input-text" name="clientUnitInputVO.unitName"