diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 602980cc..38e8cc33 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -75,51 +75,30 @@
                         <div class="col">
                             <div class="row m-b-15">
                                 <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
-                                    <validation-wrapper-component :validator="$v.parameters.phone"> <!-- Place holder -->
+                                    <validation-wrapper-component :validator="$v.parameters.pickup_time">
                                         <label>收货时间 Available Hours</label>
-                                        <input type="time" class="form-control" name="phone" v-model="parameters.phone"> <!-- Place holder -->
+                                        <input type="time" class="form-control" name="pickup_time" v-model="parameters.pickup_time">
                                     </validation-wrapper-component>
                                 </div>
                                 <div class="col-12 col-md pl-md-1">
-                                    <validation-wrapper-component :validator="$v.parameters.phone"> <!-- Place holder -->
+                                    <validation-wrapper-component :validator="$v.parameters.latest_pickup_time">
                                         <label>最晚收货时间 Latest Available Hours</label>
-                                        <input type="time" class="form-control" name="phone" v-model="parameters.phone"> <!-- Place holder -->
+                                        <input type="time" class="form-control" name="latest_pickup_time" v-model="parameters.latest_pickup_time">
                                     </validation-wrapper-component> 
                                 </div>
                             </div>
                             <div class="row m-b-15">
                                 <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
-                                    <label>房型 Receiver's Property Type</label>
-                                    <div class="dropdown">
-                                        <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <div class="mr-3">
-                                                <span id="dropdownMenuButtonText">Property Type</span>
-                                            </div>
-                                        </button>
-                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                                            <a class="dropdown-item" href="#">住家-Landed house</a>
-                                            <a class="dropdown-item" href="#">公寓-Condominium (Drop on lobby only)</a>
-                                            <a class="dropdown-item" href="#">工厂-Factory</a>
-                                            <a class="dropdown-item" href="#">店面-Shop</a>
-                                            <a class="dropdown-item" href="#">商场-Shopping Mall (Drop on loading bay only)</a>
-                                            <a class="dropdown-item" href="#">Others</a>
-                                        </div>
-                                    </div>
+                                    <validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.property_type">
+                                        <label class="text-primary">房型 Receiver's Property Type</label>
+                                        <select-component :options="propertyOptions" v-model="parameters.property_type"></select-component>
+                                    </validation-wrapper-component>
                                 </div>
                                 <div class="col-12 col-md pl-md-1">
-                                    <label>卸货工具 Tools required to unload goods</label>
-                                    <div class="dropdown">
-                                        <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <div class="mr-3">
-                                                <span id="dropdownMenuButtonText">Options</span>
-                                            </div>
-                                        </button>
-                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                                            <a class="dropdown-item" href="#">Manpower</a>
-                                            <a class="dropdown-item" href="#">Forklift</a>
-                                            <a class="dropdown-item" href="#">None of the above</a>
-                                        </div>
-                                    </div>
+                                    <validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.tools_required">
+                                        <label class="text-primary">卸货工具 Tools required to unload goods</label>
+                                        <select-component :options="[{'id': 1, 'text': 'Manpower'}, {'id': 2, 'text': 'Forklift'}, {'id': 3, 'text': 'None of the above'}]" v-model="parameters.tools_required"></select-component>
+                                    </validation-wrapper-component>
                                 </div>
                             </div>
                             <div class="col no-padding">
@@ -235,8 +214,19 @@
                     remark: '',
                     phone: '',
                     person_in_charge: '',
-				}
-
+                    pickup_time: '',
+                    latest_pickup_time: '',
+                    property_type: '',
+                    tools_required: '',
+				},
+                propertyOptions: [
+                { id: 1, text: '住家-Landed house' },
+                { id: 2, text: '公寓-Condominium (Drop on lobby only)' },
+                { id: 3, text: '工厂-Factory' },
+                { id: 4, text: '店面-Shop' },
+                { id: 5, text: '商场-Shopping Mall (Drop on loading bay only)' },
+                { id: 6, text: 'Others' },
+                ],
             }            
 		},
         created(){