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

@@ -521,4 +521,4 @@ $config['rewrite_short_tags'] = FALSE;
 | Array:		array('10.0.1.200', '192.168.5.0/24')
 */
 $config['proxy_ips'] = '';
-$config['apiBaseUrl'] = 'http://151.28ms.com:8088/';
\ No newline at end of file
+$config['apiBaseUrl'] = 'http://151.28ms.com:8088/';

+<?php
+
+class api extends CI_Controller
+{
+    public function dueDiligence($id)
+    {
+        $order = api('order/detail/'.$id);
+        $dueDiligence = api('dueDiligence/'.$id);
+        $type = api('dueDiligence/type/'.$id);
+
+        $to = [
+            ['dueDiligenceBasicInformationVO.companyAddress', 'clientUnitOutputVO.currentUnitAddress'],
+            ['dueDiligenceBasicInformationVO.companyName', 'clientUnitOutputVO.unitName'],
+            ['dueDiligenceBasicInformationVO.idNumber', 'clientInfoOutputVO.idCard'],
+            ['dueDiligenceBasicInformationVO.maritalCondition', 'clientInfoOutputVO.marriageState'],
+            ['dueDiligenceBasicInformationVO.nowAddress', 'clientInfoOutputVO.currentAddress'],
+            ['dueDiligenceBasicInformationVO.unitPhone', 'clientUnitOutputVO.unitPhone'],
+            ['dueDiligenceBasicInformationVO.userName', 'clientInfoOutputVO.userName'],
+            ['dueDiligenceBasicInformationVO.userPhone', 'clientInfoOutputVO.phoneNumber'],
+
+            ['dueDiligenceWorkConditionVO.companyAddressHasReal', '.'],
+            ['dueDiligenceAssetsLiabilitiesVO.houseNumber', '.'],
+
+            ['dueDiligenceAssetsLiabilitiesVO.loanPurpose', 'OrderVO.use'],
+            ['dueDiligenceCompanyReconnaissanceVO.workSiteNature', '.'],
+            ['dueDiligenceCompanyReconnaissanceVO.interviewTime', '.'],
+            ['dueDiligenceClientCompanyAssetConditionVO.houseNumber', '.'],
+            ['dueDiligenceCompanyOperationConditionVO.mainManageProject', '.'],
+            ['dueDiligenceComprehensiveAssessmentVO.loanPurposeHasReal', '.'],
+            ['dueDiligenceSurveyAddressVO.addressHasReal', '.'],
+
+            ['dueDiligenceAssetsLiabilitiesVO.orderId', 'clientInfoOutputVO.id'],
+            ['dueDiligenceBasicInformationVO.orderId', 'clientInfoOutputVO.id'],
+            ['dueDiligenceWorkConditionVO.orderId', 'clientInfoOutputVO.id'],
+            ['dueDiligenceClientCompanyAssetConditionVO.orderId', 'clientInfoOutputVO.id'],
+            ['dueDiligenceCompanyOperationConditionVO.orderId', 'clientInfoOutputVO.id'],
+            ['dueDiligenceCompanyReconnaissanceVO.orderId', 'clientInfoOutputVO.id'],
+            ['dueDiligenceComprehensiveAssessmentVO.orderId', 'clientInfoOutputVO.id'],
+            ['dueDiligenceSurveyAddressVO.orderId', 'clientInfoOutputVO.id'],
+            ['dueDiligenceWorkConditionVO.orderId', 'clientInfoOutputVO.id'],
+        ];
+
+        $this->to($dueDiligence, $order, $to);
+
+        $dueDiligence->orderStatus = $order->orderVO->status;
+
+        $this->output
+            ->set_content_type('application/json')
+            ->set_output(json_encode($dueDiligence));
+    }
+
+    private function To($x, $y, $z)
+    {
+        foreach($z as $v) {
+            $v[0] = explode('.', $v[0]);
+            $a = $v[0][0];
+            $b = $v[0][1];
+
+            if(isset($x->$a) && isset($x->$a->$b) && $x->$a->$b != '') {
+                continue;
+            } else {
+                $v[1] = explode('.', $v[1]);
+                $c = $v[1][0];
+                $d = $v[1][1];
+
+                @$x->$a->$b = $y->$c->$d;
+            }
+        }
+
+        return $x;
+    }
+}

@@ -19,35 +19,83 @@
             <?php $this->load->view('work/申请信息/联系人信息'); ?>
         </div>
 
-        <div class="tabCon">
-            <?php foreach($dueDiligence as $k => $v): ?>
-            <div class="panel panel-default mb-20">
-                <div class="panel-header">尽调报告<span class="r"><button class="btn btn-primary pannel-sh">显示/隐藏</button></span></div>
-                <div class="panel-body" style="display: none;">
-                    <?php $this->load->view('work/尽调报告/打工'); ?>
+        <div class="tabCon" id="disabled">
+            <div class="panel panel-default mb-20" v-for="(dueDiligenceVO, index, key) in dueDiligences">
+                <div class="panel-header">尽调报告{{index}}<span class="r"><button class="btn btn-primary pannel-sh">显示/隐藏</button></span></div>
+                <div class="panel-body" style="display: none">
+                    <?php $this->load->view('work/尽调报告/法人'); //打工\法人2合一?>
                 </div>
             </div>
-            <?php endforeach; ?>
         </div>
+    </div>
 
-        <!-- <div class="tabCon">
-            <?php $this->load->view('work/审批/信用报告'); ?>
-        </div> -->
+    <?php $this->load->view('common/footer'); ?>
 
-        <div class="tabCon">
-            <?php $this->load->view('work/审批/电核结果'); ?>
-        </div>
+    <script>
+        var vm = new Vue({
+            el: '#tab',
+            data: {
+                dueDiligences: '',
 
-        <div class="tabCon">
-            <?php $this->load->view('work/图片上传'); ?>
-        </div>
+                marry: {},
+                folkHasKnows: {},
+                type: {},
+            },
+            mounted () {
+                this.getDueDiligences();
+                this.getMarry();
+                this.getFolkHasKnow();
+                this.getType();
+                this.getCompanyNature();
+                this.getIndustry();
+            },
+            methods: {
+                async getDueDiligences () {
+                    await instance.get('/dueDiligence/<?=$id?>').then( ( {data} ) => {
+                        this.dueDiligences = data.data;
+                    });
 
-        <div class="tabCon">附件清单(图片)</div>
-    </div>
+                    $('.btn.btn-primary.pannel-sh').on('click', function () {
+                        $(this).parent().parent().siblings('.panel-body').toggle();
+                    });
 
-    <?php $this->load->view('common/footer'); ?>
+                    $('#disabled').find('input').each(function () {
+                        $(this).attr("readonly","readonly")
+                    })
+
+                    $('#disabled').find('select').each(function () {
+                        $(this).attr("disabled","disabled")
+                    })
+                },
+                getMarry () {
+                    instance.get('client/enum/marry').then( ( {data} ) => {
+                        this.marry = data.data;
+                    });
+                },
+                getFolkHasKnow () {
+                    instance.get('dueDiligence/enum/folkHasKnow').then( ( {data} ) => {
+                        this.folkHasKnows = data.data;
+                    });
+                },
+                getType () {
+                    instance.get('dueDiligence/type/<?=$id?>').then( ( {data} ) => {
+                        this.type = data.data;
+                    });
+                },
+                getIndustry () {
+                    instance.get('dueDiligence/enum/industry').then( ( {data} ) => {
+                        this.industry = data.data;
+                    });
+                },
+                getCompanyNature () {
+                    instance.get('dueDiligence/enum/companyNature').then( ( {data} ) => {
+                        console.log(data);
+                        this.companyNature = data.data;
+                    });
+                },
+            },
+        });
 
-    <script>
         function getQueryString(name) {
             var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
             var r = window.location.search.substr(1).match(reg);

@@ -10,9 +10,6 @@ function addContacts () {
     $('#contacts').append('<div class="row cl">'+html+'</div>');
 }
 
-$('.btn.btn-primary.pannel-sh').on('click', function () {
-    $(this).parent().parent().siblings('.panel-body').toggle();
-});
 
 function relation (e) {
     if($(e).data('num') < 3) {