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
'clientUnitOutputVO' => $ret->clientUnitOutputVO,
'clientContactOutputVOS' => $ret->clientContactOutputVOS,
'applyOrderVO' => $ret->orderVO,
'plan'=>$ret2
'plan'=>$ret2,
'id'=>$id
);
$this->load->view('work/客户确认/客户确认', $data);
}
......@@ -341,7 +342,8 @@ class Work extends CI_Controller
'clientUnitOutputVO' => $ret->clientUnitOutputVO,
'clientContactOutputVOS' => $ret->clientContactOutputVOS,
'applyOrderVO' => $ret->orderVO,
'plan'=>$ret2
'plan'=>$ret2,
'id'=>$id
);
$this->load->view('work/资料/资料移交', $data);
}
......
application/views/work/客户确认/客户确认.php
......@@ -94,7 +94,7 @@
title: '客户已同意',
icon: 3
}, function(){
var targetUrl = 'flow/confirm2NextStatus';
var targetUrl = 'flow/confirm2NextStatus/' + "<?=$id?>";
var data = {
"opinion": "",
"orderStatus": "<?=$applyOrderVO->status?>"
......@@ -116,7 +116,6 @@
}
setTimeout(function () {
if (!data.code) {
table.fnDraw();
layer_close();
}
}, 500);
......
application/views/work/尽调报告/index.php
......@@ -62,7 +62,8 @@
var data = {
dueDiligenceSurveyAddressVO: dueDiligenceSurveyAddressVO,
dueDiligenceWorkConditionVO: dueDiligenceWorkConditionVO
dueDiligenceWorkConditionVO: dueDiligenceWorkConditionVO,
orderStatus: "<?=$applyOrderVO->status?>"
};
$.ajax({
type: 'post',
......
application/views/work/尽调报告/法人.php
......@@ -100,7 +100,6 @@
</div>
<form action="" id="dueDiligenceWorkConditionVO">
</form>
<div class="panel panel-default mb-20">
<div class="panel-header">工作情况</div>
<div class="panel-body">
......@@ -261,6 +260,7 @@
</div>
</div>
</form>
<div class="panel panel-default mb-20">
<div class="panel-header">资产负责及其他信息情况</div>
<div class="panel-body">
......@@ -599,50 +599,50 @@
</div>
<div class="row cl">
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;每月直接成本</label>
<label>&nbsp;每月直接成本(进货)</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元(进货)</span>
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
</div>
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;每月直接成本</label>
<label>&nbsp;每月直接成本(销售)</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元(销售)</span>
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;每月管理成本</label>
<label>&nbsp;每月管理成本(工资)</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元(工资)</span>
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
</div>
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;每月管理成本</label>
<label>&nbsp;每月管理成本(租金)</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元(租金)</span>
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
</div>
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;每月管理成本</label>
<label>&nbsp;每月管理成本(借款还款)</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元(借款还款)</span>
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
</div>
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;每月管理成本</label>
<label>&nbsp;每月管理成本(其他)</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元(其他)</span>
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;每月主要缴税项目及金额</label>
<div class="form-group col-sm-6 col-md-3">
<label>&nbsp;每月主要缴税项目及金额(增值税)</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元(增值税)</span>
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
</div>
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;每月主要缴税项目及金额</label>
<div class="form-group col-sm-6 col-md-3">
<label>&nbsp;每月主要缴税项目及金额(营业税)</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元(营业税)</span>
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
</div>
<div class="form-group col-sm-6 col-md-4">
<div class="form-group col-sm-6 col-md-3">
<label>&nbsp;每月税前利润</label>
<input type="text" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true">万元</span>
......
application/views/work/资料/资料移交.php
......@@ -146,7 +146,7 @@
title: '资料转移',
icon: 3
}, function(){
var targetUrl = 'flow/confirm2NextStatus';
var targetUrl = 'flow/confirm2NextStatus/' + "<?=$id?>";;
var data = {
"opinion": "",
"orderStatus": "<?=$applyOrderVO->status?>"
......@@ -168,7 +168,6 @@
}
setTimeout(function () {
if (!data.code) {
table.fnDraw();
layer_close();
}
}, 500);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!