Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop
Showing
8 changed files
with
141 additions
and
24 deletions
| ... | @@ -521,4 +521,4 @@ $config['rewrite_short_tags'] = FALSE; | ... | @@ -521,4 +521,4 @@ $config['rewrite_short_tags'] = FALSE; |
| 521 | | Array: array('10.0.1.200', '192.168.5.0/24') | 521 | | Array: array('10.0.1.200', '192.168.5.0/24') |
| 522 | */ | 522 | */ |
| 523 | $config['proxy_ips'] = ''; | 523 | $config['proxy_ips'] = ''; |
| 524 | $config['apiBaseUrl'] = 'http://151.28ms.com:8088/'; | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 524 | $config['apiBaseUrl'] = 'http://151.28ms.com:8088/'; | ... | ... |
application/controllers/api.php
0 → 100644
| 1 | <?php | ||
| 2 | |||
| 3 | class api extends CI_Controller | ||
| 4 | { | ||
| 5 | public function dueDiligence($id) | ||
| 6 | { | ||
| 7 | $order = api('order/detail/'.$id); | ||
| 8 | $dueDiligence = api('dueDiligence/'.$id); | ||
| 9 | $type = api('dueDiligence/type/'.$id); | ||
| 10 | |||
| 11 | $to = [ | ||
| 12 | ['dueDiligenceBasicInformationVO.companyAddress', 'clientUnitOutputVO.currentUnitAddress'], | ||
| 13 | ['dueDiligenceBasicInformationVO.companyName', 'clientUnitOutputVO.unitName'], | ||
| 14 | ['dueDiligenceBasicInformationVO.idNumber', 'clientInfoOutputVO.idCard'], | ||
| 15 | ['dueDiligenceBasicInformationVO.maritalCondition', 'clientInfoOutputVO.marriageState'], | ||
| 16 | ['dueDiligenceBasicInformationVO.nowAddress', 'clientInfoOutputVO.currentAddress'], | ||
| 17 | ['dueDiligenceBasicInformationVO.unitPhone', 'clientUnitOutputVO.unitPhone'], | ||
| 18 | ['dueDiligenceBasicInformationVO.userName', 'clientInfoOutputVO.userName'], | ||
| 19 | ['dueDiligenceBasicInformationVO.userPhone', 'clientInfoOutputVO.phoneNumber'], | ||
| 20 | |||
| 21 | ['dueDiligenceWorkConditionVO.companyAddressHasReal', '.'], | ||
| 22 | ['dueDiligenceAssetsLiabilitiesVO.houseNumber', '.'], | ||
| 23 | |||
| 24 | ['dueDiligenceAssetsLiabilitiesVO.loanPurpose', 'OrderVO.use'], | ||
| 25 | ['dueDiligenceCompanyReconnaissanceVO.workSiteNature', '.'], | ||
| 26 | ['dueDiligenceCompanyReconnaissanceVO.interviewTime', '.'], | ||
| 27 | ['dueDiligenceClientCompanyAssetConditionVO.houseNumber', '.'], | ||
| 28 | ['dueDiligenceCompanyOperationConditionVO.mainManageProject', '.'], | ||
| 29 | ['dueDiligenceComprehensiveAssessmentVO.loanPurposeHasReal', '.'], | ||
| 30 | ['dueDiligenceSurveyAddressVO.addressHasReal', '.'], | ||
| 31 | |||
| 32 | ['dueDiligenceAssetsLiabilitiesVO.orderId', 'clientInfoOutputVO.id'], | ||
| 33 | ['dueDiligenceBasicInformationVO.orderId', 'clientInfoOutputVO.id'], | ||
| 34 | ['dueDiligenceWorkConditionVO.orderId', 'clientInfoOutputVO.id'], | ||
| 35 | ['dueDiligenceClientCompanyAssetConditionVO.orderId', 'clientInfoOutputVO.id'], | ||
| 36 | ['dueDiligenceCompanyOperationConditionVO.orderId', 'clientInfoOutputVO.id'], | ||
| 37 | ['dueDiligenceCompanyReconnaissanceVO.orderId', 'clientInfoOutputVO.id'], | ||
| 38 | ['dueDiligenceComprehensiveAssessmentVO.orderId', 'clientInfoOutputVO.id'], | ||
| 39 | ['dueDiligenceSurveyAddressVO.orderId', 'clientInfoOutputVO.id'], | ||
| 40 | ['dueDiligenceWorkConditionVO.orderId', 'clientInfoOutputVO.id'], | ||
| 41 | ]; | ||
| 42 | |||
| 43 | $this->to($dueDiligence, $order, $to); | ||
| 44 | |||
| 45 | $dueDiligence->orderStatus = $order->orderVO->status; | ||
| 46 | |||
| 47 | $this->output | ||
| 48 | ->set_content_type('application/json') | ||
| 49 | ->set_output(json_encode($dueDiligence)); | ||
| 50 | } | ||
| 51 | |||
| 52 | private function To($x, $y, $z) | ||
| 53 | { | ||
| 54 | foreach($z as $v) { | ||
| 55 | $v[0] = explode('.', $v[0]); | ||
| 56 | $a = $v[0][0]; | ||
| 57 | $b = $v[0][1]; | ||
| 58 | |||
| 59 | if(isset($x->$a) && isset($x->$a->$b) && $x->$a->$b != '') { | ||
| 60 | continue; | ||
| 61 | } else { | ||
| 62 | $v[1] = explode('.', $v[1]); | ||
| 63 | $c = $v[1][0]; | ||
| 64 | $d = $v[1][1]; | ||
| 65 | |||
| 66 | @$x->$a->$b = $y->$c->$d; | ||
| 67 | } | ||
| 68 | } | ||
| 69 | |||
| 70 | return $x; | ||
| 71 | } | ||
| 72 | } |
This diff is collapsed.
Click to expand it.
| ... | @@ -19,35 +19,83 @@ | ... | @@ -19,35 +19,83 @@ |
| 19 | <?php $this->load->view('work/申请信息/联系人信息'); ?> | 19 | <?php $this->load->view('work/申请信息/联系人信息'); ?> |
| 20 | </div> | 20 | </div> |
| 21 | 21 | ||
| 22 | <div class="tabCon"> | 22 | <div class="tabCon" id="disabled"> |
| 23 | <?php foreach($dueDiligence as $k => $v): ?> | 23 | <div class="panel panel-default mb-20" v-for="(dueDiligenceVO, index, key) in dueDiligences"> |
| 24 | <div class="panel panel-default mb-20"> | 24 | <div class="panel-header">尽调报告{{index}}<span class="r"><button class="btn btn-primary pannel-sh">显示/隐藏</button></span></div> |
| 25 | <div class="panel-header">尽调报告<span class="r"><button class="btn btn-primary pannel-sh">显示/隐藏</button></span></div> | 25 | <div class="panel-body" style="display: none"> |
| 26 | <div class="panel-body" style="display: none;"> | 26 | <?php $this->load->view('work/尽调报告/法人'); //打工\法人2合一?> |
| 27 | <?php $this->load->view('work/尽调报告/打工'); ?> | ||
| 28 | </div> | 27 | </div> |
| 29 | </div> | 28 | </div> |
| 30 | <?php endforeach; ?> | ||
| 31 | </div> | 29 | </div> |
| 30 | </div> | ||
| 32 | 31 | ||
| 33 | <!-- <div class="tabCon"> | 32 | <?php $this->load->view('common/footer'); ?> |
| 34 | <?php $this->load->view('work/审批/信用报告'); ?> | ||
| 35 | </div> --> | ||
| 36 | 33 | ||
| 37 | <div class="tabCon"> | 34 | <script> |
| 38 | <?php $this->load->view('work/审批/电核结果'); ?> | 35 | var vm = new Vue({ |
| 39 | </div> | 36 | el: '#tab', |
| 37 | data: { | ||
| 38 | dueDiligences: '', | ||
| 40 | 39 | ||
| 41 | <div class="tabCon"> | 40 | marry: {}, |
| 42 | <?php $this->load->view('work/图片上传'); ?> | 41 | folkHasKnows: {}, |
| 43 | </div> | 42 | type: {}, |
| 43 | }, | ||
| 44 | mounted () { | ||
| 45 | this.getDueDiligences(); | ||
| 46 | this.getMarry(); | ||
| 47 | this.getFolkHasKnow(); | ||
| 48 | this.getType(); | ||
| 49 | this.getCompanyNature(); | ||
| 50 | this.getIndustry(); | ||
| 51 | }, | ||
| 52 | methods: { | ||
| 53 | async getDueDiligences () { | ||
| 54 | await instance.get('/dueDiligence/<?=$id?>').then( ( {data} ) => { | ||
| 55 | this.dueDiligences = data.data; | ||
| 56 | }); | ||
| 44 | 57 | ||
| 45 | <div class="tabCon">附件清单(图片)</div> | 58 | $('.btn.btn-primary.pannel-sh').on('click', function () { |
| 46 | </div> | 59 | $(this).parent().parent().siblings('.panel-body').toggle(); |
| 60 | }); | ||
| 47 | 61 | ||
| 48 | <?php $this->load->view('common/footer'); ?> | 62 | $('#disabled').find('input').each(function () { |
| 63 | $(this).attr("readonly","readonly") | ||
| 64 | }) | ||
| 65 | |||
| 66 | $('#disabled').find('select').each(function () { | ||
| 67 | $(this).attr("disabled","disabled") | ||
| 68 | }) | ||
| 69 | }, | ||
| 70 | getMarry () { | ||
| 71 | instance.get('client/enum/marry').then( ( {data} ) => { | ||
| 72 | this.marry = data.data; | ||
| 73 | }); | ||
| 74 | }, | ||
| 75 | getFolkHasKnow () { | ||
| 76 | instance.get('dueDiligence/enum/folkHasKnow').then( ( {data} ) => { | ||
| 77 | this.folkHasKnows = data.data; | ||
| 78 | }); | ||
| 79 | }, | ||
| 80 | getType () { | ||
| 81 | instance.get('dueDiligence/type/<?=$id?>').then( ( {data} ) => { | ||
| 82 | this.type = data.data; | ||
| 83 | }); | ||
| 84 | }, | ||
| 85 | getIndustry () { | ||
| 86 | instance.get('dueDiligence/enum/industry').then( ( {data} ) => { | ||
| 87 | this.industry = data.data; | ||
| 88 | }); | ||
| 89 | }, | ||
| 90 | getCompanyNature () { | ||
| 91 | instance.get('dueDiligence/enum/companyNature').then( ( {data} ) => { | ||
| 92 | console.log(data); | ||
| 93 | this.companyNature = data.data; | ||
| 94 | }); | ||
| 95 | }, | ||
| 96 | }, | ||
| 97 | }); | ||
| 49 | 98 | ||
| 50 | <script> | ||
| 51 | function getQueryString(name) { | 99 | function getQueryString(name) { |
| 52 | var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); | 100 | var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); |
| 53 | var r = window.location.search.substr(1).match(reg); | 101 | var r = window.location.search.substr(1).match(reg); | ... | ... |
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
| ... | @@ -10,9 +10,6 @@ function addContacts () { | ... | @@ -10,9 +10,6 @@ function addContacts () { |
| 10 | $('#contacts').append('<div class="row cl">'+html+'</div>'); | 10 | $('#contacts').append('<div class="row cl">'+html+'</div>'); |
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | $('.btn.btn-primary.pannel-sh').on('click', function () { | ||
| 14 | $(this).parent().parent().siblings('.panel-body').toggle(); | ||
| 15 | }); | ||
| 16 | 13 | ||
| 17 | function relation (e) { | 14 | function relation (e) { |
| 18 | if($(e).data('num') < 3) { | 15 | if($(e).data('num') < 3) { | ... | ... |
-
Please register or sign in to post a comment