diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue
index 0799964..4f35316 100644
--- a/src/views/admin/meeting/RoomContentList.vue
+++ b/src/views/admin/meeting/RoomContentList.vue
@@ -76,8 +76,8 @@
           </a-col>
           <a-col :md='8' :sm='24'>
             <span class='table-page-search-submitButtons'>
-              <a-button type='primary' @click='$refs.table.refresh(true)'>查询</a-button>
-              <a-button style='margin-left: 8px' @click='() => (queryParam = {})'>重置</a-button>
+              <a-button type='primary' @click='handleSearch'>查询</a-button>
+              <a-button style='margin-left: 8px' @click='handleReset'>重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -122,25 +122,20 @@
     >
       <p>是否确认删除？</p>
     </a-modal>
-
-
     <roomContent-modal ref='modal' @ok='handleOk' />
-
-
     <a-modal v-model='visible' title='会议设备' width='500px' @ok='itemHandleOk()'>
       <div class='table-page-search-wrapper'>
         <a-form layout='inline'>
           <a-row :gutter='48'>
-            <!--            <a-col :md='8' :sm='15'>-->
-            <!--              <a-form-item label='关键词'>-->
-            <!--                <a-input placeholder='请输入关键词' v-model='itemQueryParam.itemName' />-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
+                        <a-col :md='15' :sm='15'>
+                          <a-form-item label='物品名称'>
+                            <a-input placeholder='请输入物品名称' v-model='NewitemQueryParam.itemName' />
+                          </a-form-item>
+                        </a-col>
             <a-col :md='8' :sm='24'>
             <span class='table-page-search-submitButtons'>
-<!--              查询有问题-->
-              <a-button type='primary' @click='$refs.table.refresh(true)'>查询</a-button>
-              <a-button style='margin-left: 8px' @click='() => (itemQueryParam = {})'>重置</a-button>
+              <a-button type='primary' @click="getNewitemQueryParam">查询</a-button>
+              <a-button style='margin-left: 8px' @click='handleReset'>重置</a-button>
             </span>
             </a-col>
           </a-row>
@@ -162,11 +157,6 @@
       <div class='table-page-search-wrapper'>
         <a-form layout='inline'>
           <a-row :gutter='48'>
-            <!--            <a-col :md='8' :sm='15'>-->
-            <!--              <a-form-item label='关键词'>-->
-            <!--                <a-input placeholder='请输入关键词' v-model='serveQueryParam.serveName' />-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
             <a-col :md='8' :sm='30'>
               <a-form-item label='服务类型'>
                 <a-select v-model='serveQueryParam.itemType' placeholder='请选择服务类型'>
@@ -181,9 +171,8 @@
             </a-col>
             <a-col :md='8' :sm='24'>
             <span class='table-page-search-submitButtons'>
-<!--              查询有问题-->
-              <a-button type='primary' @click='$refs.table.refresh(true)'>查询</a-button>
-              <a-button style='margin-left: 8px' @click='() => (serveQueryParam = {})'>重置</a-button>
+              <a-button type='primary' @click='handleServeSearch'>查询</a-button>
+              <a-button style='margin-left: 8px' @click='handleServeReset'>重置</a-button>
             </span>
             </a-col>
           </a-row>
@@ -254,6 +243,8 @@ export default {
       queryParam: {},
       itemQueryParam: {
       },
+      NewitemQueryParam: {
+      },
       serveQueryParam: {},
       capacityList: [],
       shapeList: [],
@@ -330,18 +321,22 @@ export default {
         return getRoomContentList(Object.assign(parameter, this.queryParam))
       },
       itemLoadData: (parameter) => {
-        console.log(this.parkId)
-        let param ={
-          parkId:this.parkId
+        const params = {
+          ...parameter,
+          parkId: this.parkId,
+          name: this.NewitemQueryParam.itemName ? `%${this.NewitemQueryParam.itemName}%` : '',
+          nameLike: !!this.NewitemQueryParam.itemName
         }
-
-        return getRoomItemList(Object.assign(parameter, param))
+        return getRoomItemList(params)
       },
       serveLoadData: (parameter) => {
-        let param ={
-          parkId:this.parkId
+        const params = {
+          ...parameter,
+          parkId: this.parkId,
+          serveType: this.serveQueryParam.itemType || '',
+          serveName: this.serveQueryParam.serveName || ''
         }
-        return getRoomServeList(Object.assign(parameter, param))
+        return getRoomServeList(params)
       },
       selectedRowKeys: [],
       selectedRows: [],
@@ -360,6 +355,8 @@ export default {
       deleteLoading: false,
       deleteIds : null,
     }
+
+
   },
   filters: {
     typeFilter(Type) {
@@ -386,6 +383,30 @@ export default {
     this.selectSearchInfoByCapacity()
   },
   methods: {
+    // 主表格查询
+    handleSearch() {
+      this.$refs.table.refresh(true)
+    },
+    //   查询设备
+    getNewitemQueryParam(){
+      this.$refs.itemTable.refresh(true)
+    },
+
+    handleReset() {
+      this.NewitemQueryParam = { itemName: '' }
+      // 重置后刷新子表格和主表格
+      this.$nextTick(() => {
+        if (this.$refs.itemTable) {
+          this.$refs.itemTable.refresh(true)
+        }
+        if (this.$refs.table) {
+          this.queryParam = {}
+          this.$refs.table.refresh(true)
+        }
+        this.$forceUpdate()
+      })
+    },
+
     itemHandleOk() {
       console.log(this.meetingId)
       let params = {
@@ -403,6 +424,22 @@ export default {
       })
     },
 
+    // 会议服务查询
+    handleServeSearch() {
+      this.$refs.serveTable.refresh(true)
+    },
+
+    handleServeReset() {
+      this.serveQueryParam = { itemType: '', serveName: '' }
+      // 确保完全重置并强制刷新
+      this.$nextTick(() => {
+        if (this.$refs.serveTable) {
+          this.$refs.serveTable.refresh(true)
+          this.$forceUpdate()
+        }
+      })
+    },
+
     serveHandleOk() {
       // 新增 物品跟会议室关联
       let params = {
@@ -419,7 +456,6 @@ export default {
         }
       })
 
-
     },
     onItemSelectChange(selectedRowKeys, selectedRows) {
       this.selectedItemRowKeys = selectedRowKeys