Merge branch 'master' of gitee.com:hainatravel/information-system

hotfix/远程访问多媒体中心
lyt 6 years ago
commit 5b60746eaa

@ -111,7 +111,7 @@ class Confirm extends CI_Controller {
if ($MEI_SN && $this->input->post('emergency_person_name') != '') {
$add_emergency_res = $this->Order_model->add_customer_info(
'', '', $this->input->post('emergency_person_name'), '', '', '', '', $this->input->post('emergency_relationship'), '', $this->input->post('emergency_email'), $this->input->post('emergency_telephone'), 1, $COLI_SN, $visitor_link
'', '', '', $this->input->post('emergency_person_name'), '', '', '', '', $this->input->post('emergency_relationship'), '', $this->input->post('emergency_email'), $this->input->post('emergency_telephone'), 1, $COLI_SN, $visitor_link
,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime
);
}

@ -400,24 +400,24 @@
<label class="visible-xs-block">Occupation</label>
<select class="form-control input-sm nopadding select_occupation" name="occupation[]" placeholder="Occupation" >
<option value="None">None</option>
<option value="Retired">Retired</option>
<option value="Agriculture, Food & Natural Resources">Agriculture, Food & Natural Resources</option>
<option value="Architecture & Construction">Architecture & Construction</option>
<option value="Arts, Audio/Video Technology & Communications">Arts, Audio/Video Technology & Communications</option>
<option value="Business Management & Administration">Business Management & Administration</option>
<option value="Education & Training">Education & Training</option>
<option value="Finance">Finance</option>
<option value="Government & Public Administration">Government & Public Administration</option>
<option value="Health Science">Health Science</option>
<option value="Hospitality & Tourism">Hospitality & Tourism</option>
<option value="Human Services">Human Services</option>
<option value="Information Technology">Information Technology</option>
<option value="Law, Public Safety, Corrections & Security">Law, Public Safety, Corrections & Security</option>
<option value="Manufacturing">Manufacturing</option>
<option value="Marketing, Sales & Service">Marketing, Sales & Service</option>
<option value="Science, Technology, Engineering & Mathematics">Science, Technology, Engineering & Mathematics</option>
<option value="Transportation, Distribution & Logistics">Transportation, Distribution & Logistics</option>
<option value="Housewife">Housewife</option>
<option value="128142">Retired</option>
<option value="128143">Agriculture, Food & Natural Resources</option>
<option value="128144">Architecture & Construction</option>
<option value="128145">Arts, Audio/Video Technology & Communications</option>
<option value="128146">Business Management & Administration</option>
<option value="128147">Education & Training</option>
<option value="128148">Finance</option>
<option value="128149">Government & Public Administration</option>
<option value="128150">Health Science</option>
<option value="128151">Hospitality & Tourism</option>
<option value="128152">Human Services</option>
<option value="128153">Information Technology</option>
<option value="128154">Law, Public Safety, Corrections & Security</option>
<option value="128155">Manufacturing</option>
<option value="128156">Marketing, Sales & Service</option>
<option value="128157">Science, Technology, Engineering & Mathematics</option>
<option value="128158">Transportation, Distribution & Logistics</option>
<option value="128159">Housewife</option>
</select>
<span class="input-group-addon" style="background:#fff;border:none;padding:2px 3px;">

Loading…
Cancel
Save