Merge remote-tracking branch 'origin/develop' into develop
Showing
2 changed files
with
51 additions
and
42 deletions
| ... | @@ -58,8 +58,11 @@ | ... | @@ -58,8 +58,11 @@ |
| 58 | }, function () { | 58 | }, function () { |
| 59 | var targetUrl = 'dueDiligence'; | 59 | var targetUrl = 'dueDiligence'; |
| 60 | var dueDiligenceSurveyAddressVO = $("#dueDiligenceSurveyAddressVO").serializeJson(); | 60 | var dueDiligenceSurveyAddressVO = $("#dueDiligenceSurveyAddressVO").serializeJson(); |
| 61 | var dueDiligenceWorkConditionVO = $("#dueDiligenceWorkConditionVO").serializeJson(); | ||
| 62 | |||
| 61 | var data = { | 63 | var data = { |
| 62 | dueDiligenceSurveyAddressVO: dueDiligenceSurveyAddressVO | 64 | dueDiligenceSurveyAddressVO: dueDiligenceSurveyAddressVO, |
| 65 | dueDiligenceWorkConditionVO: dueDiligenceWorkConditionVO | ||
| 63 | }; | 66 | }; |
| 64 | $.ajax({ | 67 | $.ajax({ |
| 65 | type: 'post', | 68 | type: 'post', | ... | ... |
| ... | @@ -98,6 +98,9 @@ | ... | @@ -98,6 +98,9 @@ |
| 98 | </div> | 98 | </div> |
| 99 | </div> | 99 | </div> |
| 100 | </div> | 100 | </div> |
| 101 | <form action="" id="dueDiligenceWorkConditionVO"> | ||
| 102 | |||
| 103 | </form> | ||
| 101 | <div class="panel panel-default mb-20"> | 104 | <div class="panel panel-default mb-20"> |
| 102 | <div class="panel-header">工作情况</div> | 105 | <div class="panel-header">工作情况</div> |
| 103 | <div class="panel-body"> | 106 | <div class="panel-body"> |
| ... | @@ -105,7 +108,7 @@ | ... | @@ -105,7 +108,7 @@ |
| 105 | <div class="form-group col-sm-4 col-md-2"> | 108 | <div class="form-group col-sm-4 col-md-2"> |
| 106 | <label>提供公司地址是否属实</label> | 109 | <label>提供公司地址是否属实</label> |
| 107 | <span class="form-control select-box"> | 110 | <span class="form-control select-box"> |
| 108 | <select class="select" size="1"> | 111 | <select class="select" name="companyAddressHasReal" size="1"> |
| 109 | <option value="">是否真实</option> | 112 | <option value="">是否真实</option> |
| 110 | <option value="1">真实</option> | 113 | <option value="1">真实</option> |
| 111 | <option value="0">不真实</option> | 114 | <option value="0">不真实</option> |
| ... | @@ -117,18 +120,18 @@ | ... | @@ -117,18 +120,18 @@ |
| 117 | <div class="row cl"> | 120 | <div class="row cl"> |
| 118 | <div class="form-group has-feedback col-sm-3 col-md-2"> | 121 | <div class="form-group has-feedback col-sm-3 col-md-2"> |
| 119 | <label>工作/经营时间</label> | 122 | <label>工作/经营时间</label> |
| 120 | <input type="text" class="form-control input-text" value=""> | 123 | <input type="text" class="form-control input-text" name="workingTime" value=""> |
| 121 | <span class="glyphicon glyphicon-month form-control-feedback" aria-hidden="true"></span> | 124 | <span class="glyphicon glyphicon-month form-control-feedback" aria-hidden="true"></span> |
| 122 | </div> | 125 | </div> |
| 123 | <div class="form-group col-sm-3 col-md-2"> | 126 | <div class="form-group col-sm-3 col-md-2"> |
| 124 | <label>所属行业</label> | 127 | <label>所属行业</label> |
| 125 | <span class="form-control select-box"> | 128 | <span class="form-control select-box"> |
| 126 | <select class="select" size="1"> | 129 | <select class="select" name="industry" size="1"> |
| 127 | <option value="">请选择</option> | 130 | <option value="">请选择</option> |
| 128 | <option value="">制造业</option> | 131 | <option value="0">制造业</option> |
| 129 | <option value="">销售业</option> | 132 | <option value="1">销售业</option> |
| 130 | <option value="">服务业</option> | 133 | <option value="2">服务业</option> |
| 131 | <option value="">其他</option> | 134 | <option value="3">其他</option> |
| 132 | </select> | 135 | </select> |
| 133 | </span> | 136 | </span> |
| 134 | </div> | 137 | </div> |
| ... | @@ -137,7 +140,7 @@ | ... | @@ -137,7 +140,7 @@ |
| 137 | <div class="row cl"> | 140 | <div class="row cl"> |
| 138 | <div class="form-group has-feedback col-sm-3 col-md-2"> | 141 | <div class="form-group has-feedback col-sm-3 col-md-2"> |
| 139 | <label>员工人数</label> | 142 | <label>员工人数</label> |
| 140 | <input type="text" class="form-control input-text" value=""> | 143 | <input type="text" name="employeeNumber" class="form-control input-text" value=""> |
| 141 | <span class="glyphicon form-control-feedback" aria-hidden="true">人</span> | 144 | <span class="glyphicon form-control-feedback" aria-hidden="true">人</span> |
| 142 | </div> | 145 | </div> |
| 143 | <div class="form-group col-sm-3 col-md-2"> | 146 | <div class="form-group col-sm-3 col-md-2"> |
| ... | @@ -145,10 +148,10 @@ | ... | @@ -145,10 +148,10 @@ |
| 145 | <span class="form-control select-box"> | 148 | <span class="form-control select-box"> |
| 146 | <select class="select" size="1"> | 149 | <select class="select" size="1"> |
| 147 | <option value="">请选择</option> | 150 | <option value="">请选择</option> |
| 148 | <option value="">制造业</option> | 151 | <option value="0">制造业</option> |
| 149 | <option value="">销售业</option> | 152 | <option value="1">销售业</option> |
| 150 | <option value="">服务业</option> | 153 | <option value="2">服务业</option> |
| 151 | <option value="">其他</option> | 154 | <option value="3">其他</option> |
| 152 | </select> | 155 | </select> |
| 153 | </span> | 156 | </span> |
| 154 | </div> | 157 | </div> |
| ... | @@ -654,44 +657,47 @@ | ... | @@ -654,44 +657,47 @@ |
| 654 | 657 | ||
| 655 | </div> | 658 | </div> |
| 656 | 659 | ||
| 657 | <div class="panel panel-default mb-20"> | 660 | <form id="dueDiligenceSurveyAddressVO"> |
| 658 | <div class="panel-header">住址考察</div> | 661 | <input type="hidden" name="orderId" value="<?=$id?>"> |
| 659 | <div class="panel-body"> | 662 | <div class="panel panel-default mb-20"> |
| 660 | <div class="row cl"> | 663 | <div class="panel-header">住址考察</div> |
| 661 | <div class="form-group col-sm-3 col-md-1"> | 664 | <div class="panel-body"> |
| 662 | <label>住址是否属实</label> | 665 | <div class="row cl"> |
| 663 | <span class="form-control select-box"> | 666 | <div class="form-group col-sm-3 col-md-2"> |
| 664 | <select class="select" size="1"> | 667 | <label>住址是否属实</label> |
| 665 | <option value="">属实</option> | 668 | <span class="form-control select-box"> |
| 666 | <option value="">不属实</option> | 669 | <select class="select" name="addressHasReal" size="1"> |
| 670 | <option value="1">属实</option> | ||
| 671 | <option value="0">不属实</option> | ||
| 667 | </select> | 672 | </select> |
| 668 | </span> | 673 | </span> |
| 669 | </div> | 674 | </div> |
| 670 | <div class="form-group col-sm-3 col-md-1"> | 675 | <div class="form-group col-sm-3 col-md-2"> |
| 671 | <label>居住环境</label> | 676 | <label>居住环境</label> |
| 672 | <span class="form-control select-box"> | 677 | <span class="form-control select-box"> |
| 673 | <select class="select" size="1"> | 678 | <select class="select" name="dwellingEnvironment" size="1"> |
| 674 | <option value="">良好</option> | 679 | <option value="0">良好</option> |
| 675 | <option value="">一般</option> | 680 | <option value="1">一般</option> |
| 676 | <option value="">较差</option> | 681 | <option value="2">较差</option> |
| 677 | </select> | 682 | </select> |
| 678 | </span> | 683 | </span> |
| 684 | </div> | ||
| 679 | </div> | 685 | </div> |
| 680 | </div> | ||
| 681 | 686 | ||
| 682 | <div class="row cl"> | 687 | <div class="row cl"> |
| 683 | <div class="form-group has-feedback col-sm-3 col-md-1"> | 688 | <div class="form-group has-feedback col-sm-3 col-md-1"> |
| 684 | <label>常住人口</label> | 689 | <label>常住人口</label> |
| 685 | <input type="text" class="form-control input-text" value=""> | 690 | <input type="text" name="inhabitantNumber" class="form-control input-text" value=""> |
| 686 | <span class="glyphicon form-control-feedback" aria-hidden="true">人</span> | 691 | <span class="glyphicon form-control-feedback" aria-hidden="true">人</span> |
| 687 | </div> | 692 | </div> |
| 688 | <div class="form-group col-sm-6 col-md-4"> | 693 | <div class="form-group col-sm-6 col-md-4"> |
| 689 | <label> </label> | 694 | <label> </label> |
| 690 | <input type="text" class="form-control input-text" value=""> | 695 | <input type="text" class="form-control input-text" name="inhabitant" value=""> |
| 696 | </div> | ||
| 691 | </div> | 697 | </div> |
| 692 | </div> | 698 | </div> |
| 693 | </div> | 699 | </div> |
| 694 | </div> | 700 | </form> |
| 695 | 701 | ||
| 696 | <div class="panel panel-default mb-20"> | 702 | <div class="panel panel-default mb-20"> |
| 697 | <div class="panel-header">综合评价</div> | 703 | <div class="panel-header">综合评价</div> | ... | ... |
-
Please register or sign in to post a comment