39bdc4ed by wang

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

2 parents 83765395 eb22278f
......@@ -58,8 +58,11 @@
}, function () {
var targetUrl = 'dueDiligence';
var dueDiligenceSurveyAddressVO = $("#dueDiligenceSurveyAddressVO").serializeJson();
var dueDiligenceWorkConditionVO = $("#dueDiligenceWorkConditionVO").serializeJson();
var data = {
dueDiligenceSurveyAddressVO: dueDiligenceSurveyAddressVO
dueDiligenceSurveyAddressVO: dueDiligenceSurveyAddressVO,
dueDiligenceWorkConditionVO: dueDiligenceWorkConditionVO
};
$.ajax({
type: 'post',
......
......@@ -98,6 +98,9 @@
</div>
</div>
</div>
<form action="" id="dueDiligenceWorkConditionVO">
</form>
<div class="panel panel-default mb-20">
<div class="panel-header">工作情况</div>
<div class="panel-body">
......@@ -105,7 +108,7 @@
<div class="form-group col-sm-4 col-md-2">
<label>提供公司地址是否属实</label>
<span class="form-control select-box">
<select class="select" size="1">
<select class="select" name="companyAddressHasReal" size="1">
<option value="">是否真实</option>
<option value="1">真实</option>
<option value="0">不真实</option>
......@@ -117,18 +120,18 @@
<div class="row cl">
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>工作/经营时间</label>
<input type="text" class="form-control input-text" value="">
<input type="text" class="form-control input-text" name="workingTime" value="">
<span class="glyphicon glyphicon-month form-control-feedback" aria-hidden="true"></span>
</div>
<div class="form-group col-sm-3 col-md-2">
<label>所属行业</label>
<span class="form-control select-box">
<select class="select" size="1">
<select class="select" name="industry" size="1">
<option value="">请选择</option>
<option value="">制造业</option>
<option value="">销售业</option>
<option value="">服务业</option>
<option value="">其他</option>
<option value="0">制造业</option>
<option value="1">销售业</option>
<option value="2">服务业</option>
<option value="3">其他</option>
</select>
</span>
</div>
......@@ -137,7 +140,7 @@
<div class="row cl">
<div class="form-group has-feedback col-sm-3 col-md-2">
<label>员工人数</label>
<input type="text" class="form-control input-text" value="">
<input type="text" name="employeeNumber" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
<div class="form-group col-sm-3 col-md-2">
......@@ -145,10 +148,10 @@
<span class="form-control select-box">
<select class="select" size="1">
<option value="">请选择</option>
<option value="">制造业</option>
<option value="">销售业</option>
<option value="">服务业</option>
<option value="">其他</option>
<option value="0">制造业</option>
<option value="1">销售业</option>
<option value="2">服务业</option>
<option value="3">其他</option>
</select>
</span>
</div>
......@@ -654,26 +657,28 @@
</div>
<div class="panel panel-default mb-20">
<form id="dueDiligenceSurveyAddressVO">
<input type="hidden" name="orderId" value="<?=$id?>">
<div class="panel panel-default mb-20">
<div class="panel-header">住址考察</div>
<div class="panel-body">
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<div class="form-group col-sm-3 col-md-2">
<label>住址是否属实</label>
<span class="form-control select-box">
<select class="select" size="1">
<option value="">属实</option>
<option value="">不属实</option>
<select class="select" name="addressHasReal" size="1">
<option value="1">属实</option>
<option value="0">不属实</option>
</select>
</span>
</div>
<div class="form-group col-sm-3 col-md-1">
<div class="form-group col-sm-3 col-md-2">
<label>居住环境</label>
<span class="form-control select-box">
<select class="select" size="1">
<option value="">良好</option>
<option value="">一般</option>
<option value="">较差</option>
<select class="select" name="dwellingEnvironment" size="1">
<option value="0">良好</option>
<option value="1">一般</option>
<option value="2">较差</option>
</select>
</span>
</div>
......@@ -682,16 +687,17 @@
<div class="row cl">
<div class="form-group has-feedback col-sm-3 col-md-1">
<label>常住人口</label>
<input type="text" class="form-control input-text" value="">
<input type="text" name="inhabitantNumber" class="form-control input-text" value="">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
<div class="form-group col-sm-6 col-md-4">
<label>&nbsp;</label>
<input type="text" class="form-control input-text" value="">
<input type="text" class="form-control input-text" name="inhabitant" value="">
</div>
</div>
</div>
</div>
</div>
</form>
<div class="panel panel-default mb-20">
<div class="panel-header">综合评价</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!