diff --git a/src/views/appSetting/room/Modal.vue b/src/views/appSetting/room/Modal.vue
index 797fb11..7761b6d 100644
--- a/src/views/appSetting/room/Modal.vue
+++ b/src/views/appSetting/room/Modal.vue
@@ -243,37 +243,44 @@
 								<!--end::Input-->
 							</div>
 							<div class="row mb-7">
-								<div class="col-md-5">
+								<div class="col-md-6 fv-row">
 									<label class="fs-5 fw-semobold mb-2"
 										>For Create Booking</label
 									>
-									<el-select
-										v-model="data.forCreateBooking"
-										placeholder="Select"
-										:disabled="!enableEdit"
-									>
-										<el-option
-											:key="0"
-											label="No"
-											:value="0"
-										/>
-										<el-option
-											:key="1"
-											label="Yes"
-											:value="1"
-											checked="true"
-										/>
-									</el-select>
+								<el-select
+									v-model="data.forCreateBooking"
+									placeholder="Select"
+									:disabled="!enableEdit"
+									:teleported="false"
+									placement="top"
+									:fallback-placements="['top']"
+									:popper-options="selectPopperOptions"
+								>
+									<el-option
+										:key="0"
+										label="No"
+										:value="0"
+									/>
+									<el-option
+										:key="1"
+										label="Yes"
+										:value="1"
+									/>
+								</el-select>
 								</div>
-								<div class="col-md-5">
+								<div class="col-md-6 fv-row">
 									<label class="fs-5 fw-semobold mb-2"
 										>For Create Waitlist</label
 									>
-									<el-select
-										v-model="data.forCreateWaitlist"
-										placeholder="Select"
-										:disabled="!enableEdit"
-									>
+								<el-select
+									v-model="data.forCreateWaitlist"
+									placeholder="Select"
+									:disabled="!enableEdit"
+									:teleported="false"
+									placement="top"
+									:fallback-placements="['top']"
+									:popper-options="selectPopperOptions"
+								>
 										<el-option
 											:key="0"
 											label="No"
@@ -458,6 +465,12 @@ export default defineComponent({
 			propertyId: null,
 			sharerLimit: 1
 		});
+		const selectPopperOptions = {
+			modifiers: [
+				{ name: "flip", enabled: false },
+				{ name: "preventOverflow", enabled: false },
+			],
+		};
 
 		const resetForm = () => {
 			if (formRef.value) {
@@ -736,6 +749,7 @@ export default defineComponent({
 		fetchPropertyList();
 		return {
 			data,
+			selectPopperOptions,
 			rules,
 			submit,
 			formRef,
diff --git a/src/views/approval/approvalRoutingLog/BookModal.vue b/src/views/approval/approvalRoutingLog/BookModal.vue
index 80467fd..1b11f25 100644
--- a/src/views/approval/approvalRoutingLog/BookModal.vue
+++ b/src/views/approval/approvalRoutingLog/BookModal.vue
@@ -354,7 +354,10 @@ export default defineComponent({
 		const data :any = ref({});
 
 		const fetchProperty = () => {
-			let reqParas = { 'searchCategory': '' }
+			let reqParas = {
+				searchCategory: '',
+				category: 'ALL',
+			}
 			ApiService.processPostRequest('/app/property/list', reqParas,
 				(resData: ResponseData) => {
 					propertyData.value = resData.data;
@@ -384,7 +387,10 @@ export default defineComponent({
 		fetchBookingType();
 
 		const fetchRoom = () => {
-			let reqParas = { 'searchPropertyId': data.value.propertyId!=undefined?data.value.propertyId:-1 }
+			let reqParas = {
+				searchPropertyId: data.value.propertyId!=undefined?data.value.propertyId:-1,
+				category: 'ALL',
+			}
 			ApiService.processPostRequest('/app/room/list', reqParas,
 				(resData: ResponseData) => {
 					roomData.value = resData.data;
@@ -403,7 +409,10 @@ export default defineComponent({
 		};
 
 		const fetchRoomType = () => {
-			let reqParas = { 'searchId': data.value.roomId }
+			let reqParas = {
+				searchId: data.value.roomId,
+				category: 'ALL',
+			}
 			roomTypeData.value = [];
 			ApiService.processPostRequest('/app/room/list', reqParas,
 				(resData: ResponseData) => {
diff --git a/src/views/approval/approvalRoutingLog/Index.vue b/src/views/approval/approvalRoutingLog/Index.vue
index 73c4603..9ba13ab 100644
--- a/src/views/approval/approvalRoutingLog/Index.vue
+++ b/src/views/approval/approvalRoutingLog/Index.vue
@@ -574,7 +574,8 @@
         const fetchProperty=()=>{
             let reqParas = {
                 searchCategory:'',
-				permissionId:'00401'
+				permissionId:'00401',
+                category: 'ALL'
             }
             ApiService.processPostRequest('/app/property/list',reqParas,
             (resData:ResponseData)=>{
@@ -592,6 +593,7 @@
         const fetchRoom=()=>{
             let reqParas = {
                 searchPropertyId:pageFilters.value.searchPropertyId!=undefined&&pageFilters.value.searchPropertyId!=0?pageFilters.value.searchPropertyId:null,
+                category: 'ALL',
             }
             ApiService.processPostRequest('/app/room/list',reqParas,
             (resData:ResponseData)=>{
diff --git a/src/views/daylightAppSetting/room/Modal.vue b/src/views/daylightAppSetting/room/Modal.vue
index 19b9915..4ff7b4c 100644
--- a/src/views/daylightAppSetting/room/Modal.vue
+++ b/src/views/daylightAppSetting/room/Modal.vue
@@ -244,7 +244,7 @@
 								<!--end::Input-->
 							</div>
 							<div class="row mb-7">
-								<div class="col-md-5">
+								<div class="col-md-6 fv-row">
 									<label class="fs-5 fw-semobold mb-2"
 										>For Create Booking</label
 									>
@@ -252,6 +252,10 @@
 										v-model="data.forCreateBooking"
 										placeholder="Select"
 										:disabled="!enableEdit"
+										:teleported="false"
+										placement="top"
+										:fallback-placements="['top']"
+										:popper-options="selectPopperOptions"
 									>
 										<el-option
 											:key="0"
@@ -262,11 +266,10 @@
 											:key="1"
 											label="Yes"
 											:value="1"
-											checked="true"
 										/>
 									</el-select>
 								</div>
-								<div class="col-md-5">
+								<div class="col-md-6 fv-row">
 									<label class="fs-5 fw-semobold mb-2"
 										>For Create Waitlist</label
 									>
@@ -274,6 +277,10 @@
 										v-model="data.forCreateWaitlist"
 										placeholder="Select"
 										:disabled="!enableEdit"
+										:teleported="false"
+										placement="top"
+										:fallback-placements="['top']"
+										:popper-options="selectPopperOptions"
 									>
 										<el-option
 											:key="0"
@@ -462,6 +469,12 @@ export default defineComponent({
 			propertyId: null,
 			sharerLimit: 1,
 		});
+		const selectPopperOptions = {
+			modifiers: [
+				{ name: "flip", enabled: false },
+				{ name: "preventOverflow", enabled: false },
+			],
+		};
 
 		const roomTypeOptionsByProperty = computed(() => {
 			const pid = data.value.propertyId;
@@ -806,6 +819,7 @@ export default defineComponent({
 		
 		return {
 			data,
+			selectPopperOptions,
 			rules,
 			submit,
 			formRef,