diff --git a/src/components/contract/ChooseContract.vue b/src/components/contract/ChooseContract.vue
index e8c13dc44..810bf36e3 100644
--- a/src/components/contract/ChooseContract.vue
+++ b/src/components/contract/ChooseContract.vue
@@ -39,12 +39,7 @@ import { queryContract } from '@/api/contract/contractChangeDetailApi'
 
 export default {
   name: 'ChooseContract',
-  props: {
-    emitChooseContract: {
-      type: String,
-      default: ''
-    },
-  },
+
   data() {
     return {
       dialogVisible: false,
diff --git a/src/components/contract/ContractChangeAssets.vue b/src/components/contract/ContractChangeAssets.vue
index 228926244..aa810632e 100644
--- a/src/components/contract/ContractChangeAssets.vue
+++ b/src/components/contract/ContractChangeAssets.vue
@@ -2,7 +2,7 @@
   <el-card class="box-card">
     <div slot="header" class="flex justify-between">
       <span>{{ $t('contractChangeAssets.title') }}</span>
-      <el-button type="primary" size="small" style="float: right" @click="selectRoom">
+      <el-button type="primary" size="small" style="float: right" @click="openSeachRoom">
         <i class="el-icon-plus"></i>
         {{ $t('common.add') }}
       </el-button>
@@ -35,13 +35,19 @@
         </template>
       </el-table-column>
     </el-table>
+
+    <search-room ref="searchRoom" @chooseRoom="chooseRoom" />
   </el-card>
 </template>
 
 <script>
+import SearchRoom from '@/components/room/searchRoom'
+import { queryContractRoom } from '@/api/contract/addContractApi'
 export default {
   name: 'ContractChangeAssets',
-
+  components: {
+    SearchRoom
+  },
   data() {
     return {
       contractChangeAssetsInfo: {
@@ -60,8 +66,12 @@ export default {
     }
   },
   methods: {
-    selectRoom() {
-      this.$emit('openSearchRoom')
+    open(param) {
+      this.contractChangeAssetsInfo.contractId = param.contractId
+      this.loadContractRooms()
+    },
+    openSeachRoom() {
+      this.$refs.searchRoom.open()
     },
     openDelRoomModel(room) {
       this.$confirm(
@@ -81,33 +91,19 @@ export default {
         item => item.roomId !== room.roomId
       )
     },
-    loadContractRooms() {
-      // 这里应该调用API加载合同关联的房间数据
-      // 示例代码：
-      /*
-      getContractRooms({ contractId: this.contractChangeAssetsInfo.contractId })
-        .then(response => {
-          this.contractChangeAssetsInfo.rooms = response.data
-        })
-      */
-    }
-  },
-  created() {
-    this.$on('chooseRoom', room => {
-      // 检查是否已存在相同房间
+    async loadContractRooms() {
+      const res = await queryContractRoom({ contractId: this.contractChangeAssetsInfo.contractId, page: 1, row: 500 })
+      this.contractChangeAssetsInfo.rooms = res.data
+    },
+    chooseRoom(room) {
       const exists = this.contractChangeAssetsInfo.rooms.some(
         item => item.roomId === room.roomId
       )
       if (!exists) {
         this.contractChangeAssetsInfo.rooms.push(room)
       }
-    })
-
-    this.$on('contractInfo', param => {
-      this.contractChangeAssetsInfo.contractId = param.contractId
-      this.loadContractRooms()
-    })
-  }
+    }
+  },
 }
 </script>
 
diff --git a/src/views/contract/contractChangeDetailList.vue b/src/views/contract/contractChangeDetailList.vue
index 3a385a745..e2a975636 100644
--- a/src/views/contract/contractChangeDetailList.vue
+++ b/src/views/contract/contractChangeDetailList.vue
@@ -157,6 +157,8 @@ import ContractChangeAssets from '@/components/contract/ContractChangeAssets'
 import PurchaseApprovers from '@/components/contract/purchaseApprovers'
 import ChooseContract from '@/components/contract/ChooseContract'
 import { getCommunityId } from '@/api/community/communityApi'
+import { queryContractRoom } from '@/api/contract/addContractApi'
+
 
 export default {
   name: 'ContractChangeDetailList',
@@ -273,7 +275,15 @@ export default {
       this.contractChangeDetailInfo.startTime = contract.startTime
       this.contractChangeDetailInfo.endTime = contract.endTime
       this.contractChangeDetailInfo.signingTime = contract.signingTime
-    }
+      if(this.$refs.contractChangeAssets){
+        this.$refs.contractChangeAssets.open(this.contractChangeDetailInfo)
+      }
+      this.loadContractRooms()
+    },
+    async loadContractRooms() {
+      const res = await queryContractRoom({ contractId: this.contractChangeDetailInfo.contractId, page: 1, row: 500 })
+      this.contractChangeDetailInfo.rooms = res.data
+    },
   }
 }
 </script>
diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue
index 22a967158..981d0aeab 100644
--- a/src/views/user/login/Login.vue
+++ b/src/views/user/login/Login.vue
@@ -44,8 +44,8 @@ export default {
       logo: '',
       companyName:'',
       loginForm: {
-        username: '',
-        passwd: '',
+        username: 'wuxw',
+        passwd: 'admin',
         validateCode: ''
       },
       captchaUrl: '',