Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
7baace4d by wang
Options

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

2 parents 2eccfe00 e771d7d6
Inline Side-by-side
Showing 5 changed files with 28 additions and 27 deletions
application/controllers/Work.php
...@@ -312,7 +312,8 @@ class Work extends CI_Controller ...@@ -312,7 +312,8 @@ class Work extends CI_Controller
312 'clientUnitOutputVO' => $ret->clientUnitOutputVO, 312 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
313 'clientContactOutputVOS' => $ret->clientContactOutputVOS, 313 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
314 'applyOrderVO' => $ret->orderVO, 314 'applyOrderVO' => $ret->orderVO,
315 'plan'=>$ret2 315 'plan'=>$ret2,
316 'id'=>$id
316 ); 317 );
317 $this->load->view('work/客户确认/客户确认', $data); 318 $this->load->view('work/客户确认/客户确认', $data);
318 } 319 }
...@@ -341,7 +342,8 @@ class Work extends CI_Controller ...@@ -341,7 +342,8 @@ class Work extends CI_Controller
341 'clientUnitOutputVO' => $ret->clientUnitOutputVO, 342 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
342 'clientContactOutputVOS' => $ret->clientContactOutputVOS, 343 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
343 'applyOrderVO' => $ret->orderVO, 344 'applyOrderVO' => $ret->orderVO,
344 'plan'=>$ret2 345 'plan'=>$ret2,
346 'id'=>$id
345 ); 347 );
346 $this->load->view('work/资料/资料移交', $data); 348 $this->load->view('work/资料/资料移交', $data);
347 } 349 }
......
application/views/work/客户确认/客户确认.php
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 title: '客户已同意', 94 title: '客户已同意',
95 icon: 3 95 icon: 3
96 }, function(){ 96 }, function(){
97 var targetUrl = 'flow/confirm2NextStatus'; 97 var targetUrl = 'flow/confirm2NextStatus/' + "<?=$id?>";
98 var data = { 98 var data = {
99 "opinion": "", 99 "opinion": "",
100 "orderStatus": "<?=$applyOrderVO->status?>" 100 "orderStatus": "<?=$applyOrderVO->status?>"
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
116 } 116 }
117 setTimeout(function () { 117 setTimeout(function () {
118 if (!data.code) { 118 if (!data.code) {
119 table.fnDraw();
120 layer_close(); 119 layer_close();
121 } 120 }
122 }, 500); 121 }, 500);
......
application/views/work/尽调报告/index.php
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
62 62
63 var data = { 63 var data = {
64 dueDiligenceSurveyAddressVO: dueDiligenceSurveyAddressVO, 64 dueDiligenceSurveyAddressVO: dueDiligenceSurveyAddressVO,
65 dueDiligenceWorkConditionVO: dueDiligenceWorkConditionVO 65 dueDiligenceWorkConditionVO: dueDiligenceWorkConditionVO,
66 orderStatus: "<?=$applyOrderVO->status?>"
66 }; 67 };
67 $.ajax({ 68 $.ajax({
68 type: 'post', 69 type: 'post',
......
application/views/work/尽调报告/法人.php
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
100 </div> 100 </div>
101 <form action="" id="dueDiligenceWorkConditionVO"> 101 <form action="" id="dueDiligenceWorkConditionVO">
102 102
103 </form>
104 <div class="panel panel-default mb-20"> 103 <div class="panel panel-default mb-20">
105 <div class="panel-header">工作情况</div> 104 <div class="panel-header">工作情况</div>
106 <div class="panel-body"> 105 <div class="panel-body">
...@@ -261,6 +260,7 @@ ...@@ -261,6 +260,7 @@
261 </div> 260 </div>
262 </div> 261 </div>
263 262
263 </form>
264 <div class="panel panel-default mb-20"> 264 <div class="panel panel-default mb-20">
265 <div class="panel-header">资产负责及其他信息情况</div> 265 <div class="panel-header">资产负责及其他信息情况</div>
266 <div class="panel-body"> 266 <div class="panel-body">
...@@ -599,50 +599,50 @@ ...@@ -599,50 +599,50 @@
599 </div> 599 </div>
600 <div class="row cl"> 600 <div class="row cl">
601 <div class="form-group col-sm-6 col-md-4"> 601 <div class="form-group col-sm-6 col-md-4">
602 <label>&nbsp;每月直接成本</label> 602 <label>&nbsp;每月直接成本(进货)</label>
603 <input type="text" class="form-control input-text" value=""> 603 <input type="text" class="form-control input-text" value="">
604 <span class="glyphicon form-control-feedback" aria-hidden="true">万元(进货)</span> 604 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
605 </div> 605 </div>
606 <div class="form-group col-sm-6 col-md-4"> 606 <div class="form-group col-sm-6 col-md-4">
607 <label>&nbsp;每月直接成本</label> 607 <label>&nbsp;每月直接成本(销售)</label>
608 <input type="text" class="form-control input-text" value=""> 608 <input type="text" class="form-control input-text" value="">
609 <span class="glyphicon form-control-feedback" aria-hidden="true">万元(销售)</span> 609 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
610 </div> 610 </div>
611 </div> 611 </div>
612 <div class="row cl"> 612 <div class="row cl">
613 <div class="form-group col-sm-6 col-md-4"> 613 <div class="form-group col-sm-6 col-md-4">
614 <label>&nbsp;每月管理成本</label> 614 <label>&nbsp;每月管理成本(工资)</label>
615 <input type="text" class="form-control input-text" value=""> 615 <input type="text" class="form-control input-text" value="">
616 <span class="glyphicon form-control-feedback" aria-hidden="true">万元(工资)</span> 616 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
617 </div> 617 </div>
618 <div class="form-group col-sm-6 col-md-4"> 618 <div class="form-group col-sm-6 col-md-4">
619 <label>&nbsp;每月管理成本</label> 619 <label>&nbsp;每月管理成本(租金)</label>
620 <input type="text" class="form-control input-text" value=""> 620 <input type="text" class="form-control input-text" value="">
621 <span class="glyphicon form-control-feedback" aria-hidden="true">万元(租金)</span> 621 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
622 </div> 622 </div>
623 <div class="form-group col-sm-6 col-md-4"> 623 <div class="form-group col-sm-6 col-md-4">
624 <label>&nbsp;每月管理成本</label> 624 <label>&nbsp;每月管理成本(借款还款)</label>
625 <input type="text" class="form-control input-text" value=""> 625 <input type="text" class="form-control input-text" value="">
626 <span class="glyphicon form-control-feedback" aria-hidden="true">万元(借款还款)</span> 626 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
627 </div> 627 </div>
628 <div class="form-group col-sm-6 col-md-4"> 628 <div class="form-group col-sm-6 col-md-4">
629 <label>&nbsp;每月管理成本</label> 629 <label>&nbsp;每月管理成本(其他)</label>
630 <input type="text" class="form-control input-text" value=""> 630 <input type="text" class="form-control input-text" value="">
631 <span class="glyphicon form-control-feedback" aria-hidden="true">万元(其他)</span> 631 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
632 </div> 632 </div>
633 </div> 633 </div>
634 <div class="row cl"> 634 <div class="row cl">
635 <div class="form-group col-sm-6 col-md-4"> 635 <div class="form-group col-sm-6 col-md-3">
636 <label>&nbsp;每月主要缴税项目及金额</label> 636 <label>&nbsp;每月主要缴税项目及金额(增值税)</label>
637 <input type="text" class="form-control input-text" value=""> 637 <input type="text" class="form-control input-text" value="">
638 <span class="glyphicon form-control-feedback" aria-hidden="true">万元(增值税)</span> 638 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
639 </div> 639 </div>
640 <div class="form-group col-sm-6 col-md-4"> 640 <div class="form-group col-sm-6 col-md-3">
641 <label>&nbsp;每月主要缴税项目及金额</label> 641 <label>&nbsp;每月主要缴税项目及金额(营业税)</label>
642 <input type="text" class="form-control input-text" value=""> 642 <input type="text" class="form-control input-text" value="">
643 <span class="glyphicon form-control-feedback" aria-hidden="true">万元(营业税)</span> 643 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
644 </div> 644 </div>
645 <div class="form-group col-sm-6 col-md-4"> 645 <div class="form-group col-sm-6 col-md-3">
646 <label>&nbsp;每月税前利润</label> 646 <label>&nbsp;每月税前利润</label>
647 <input type="text" class="form-control input-text" value=""> 647 <input type="text" class="form-control input-text" value="">
648 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span> 648 <span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
......
application/views/work/资料/资料移交.php
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
146 title: '资料转移', 146 title: '资料转移',
147 icon: 3 147 icon: 3
148 }, function(){ 148 }, function(){
149 var targetUrl = 'flow/confirm2NextStatus'; 149 var targetUrl = 'flow/confirm2NextStatus/' + "<?=$id?>";;
150 var data = { 150 var data = {
151 "opinion": "", 151 "opinion": "",
152 "orderStatus": "<?=$applyOrderVO->status?>" 152 "orderStatus": "<?=$applyOrderVO->status?>"
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
168 } 168 }
169 setTimeout(function () { 169 setTimeout(function () {
170 if (!data.code) { 170 if (!data.code) {
171 table.fnDraw();
172 layer_close(); 171 layer_close();
173 } 172 }
174 }, 500); 173 }, 500);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!