From ad35c6e376c5747a7cd95bbee60609f1a7d992ba Mon Sep 17 00:00:00 2001
From: wx-jincw <jin.chenwei@iwhalecloud.com>
Date: Sun, 11 Jan 2026 17:35:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=9A=E4=B8=BB=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/pm/pmowner/index.vue          |  2 +-
 .../pm/pmowner/pmowner-add-and-update.vue     | 30 +++++++++----------
 .../pm/pmowner/tenant-add-and-update.vue      |  4 +--
 admin/src/views/pm/tenant/index.vue           | 30 +++++++++++++------
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/admin/src/views/pm/pmowner/index.vue b/admin/src/views/pm/pmowner/index.vue
index 5b484f1..8832670 100644
--- a/admin/src/views/pm/pmowner/index.vue
+++ b/admin/src/views/pm/pmowner/index.vue
@@ -43,7 +43,7 @@
             <el-button @click="getDataList()">查询</el-button>
             <el-button @click="resetForm()">重置</el-button>
             <el-button v-hasPermi="['autogencode:pmowner:save']" type="primary"
-                       @click="addOrUpdateHandle()">新增数据
+                       @click="addOrUpdateHandle()">新增业主
             </el-button>
             <el-button v-hasPermi="['autogencode:pmowner:delete']" type="danger" @click="deleteHandle()"
                        :disabled="dataListSelections.length <= 0">批量删除
diff --git a/admin/src/views/pm/pmowner/pmowner-add-and-update.vue b/admin/src/views/pm/pmowner/pmowner-add-and-update.vue
index 538ceea..29ffd30 100644
--- a/admin/src/views/pm/pmowner/pmowner-add-and-update.vue
+++ b/admin/src/views/pm/pmowner/pmowner-add-and-update.vue
@@ -103,17 +103,17 @@
       </el-col>
     </el-row>
     <!-- 显示添加租户按钮 -->
-    <el-row :gutter="20">
+    <!-- <el-row :gutter="20">
       <el-col :span="24">
         <el-form-item>
           <el-button type="success" @click="addTenant">添加租户</el-button>
         </el-form-item>
       </el-col>
-    </el-row>
+    </el-row> -->
     </el-form>
 
     <!-- 租户列表 -->
-    <div class="tenant-list-container">
+    <!-- <div class="tenant-list-container">
       <el-table :data="tenantList" style="width: 100%">
         <el-table-column prop="tenantName" label="租户姓名" width="120"></el-table-column>
         <el-table-column prop="phome" label="联系电话" width="120"></el-table-column>
@@ -137,7 +137,7 @@
           </template>
         </el-table-column>
       </el-table>
-    </div>
+    </div> -->
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" @click="dataSubmit()">确定</el-button>
@@ -215,17 +215,17 @@
       },
       // 获取租户列表
       getTenantList() {
-        if (!this.dataForm.id) return
-        tenantApi.pmtenantListByOwnerIdApi(this.dataForm.id, { page: 1, limit: 9999 }).then(res => {
-          try {
-            this.tenantList = Array.isArray(res) ? res : (res.list || [])
-            this.loadRentRecordsForTenants()
-          } catch (error) {
-            this.tenantList = []
-          }
-        }).catch(err => {
-          this.tenantList = []
-        })
+        // if (!this.dataForm.id) return
+        // tenantApi.pmtenantListByOwnerIdApi(this.dataForm.id, { page: 1, limit: 9999 }).then(res => {
+        //   try {
+        //     this.tenantList = Array.isArray(res) ? res : (res.list || [])
+        //     this.loadRentRecordsForTenants()
+        //   } catch (error) {
+        //     this.tenantList = []
+        //   }
+        // }).catch(err => {
+        //   this.tenantList = []
+        // })
       },
       // 加载租户的租赁记录
       loadRentRecordsForTenants() {
diff --git a/admin/src/views/pm/pmowner/tenant-add-and-update.vue b/admin/src/views/pm/pmowner/tenant-add-and-update.vue
index b1b20ad..2ee6d8c 100644
--- a/admin/src/views/pm/pmowner/tenant-add-and-update.vue
+++ b/admin/src/views/pm/pmowner/tenant-add-and-update.vue
@@ -47,13 +47,13 @@
       </el-form-item>
 
       <!-- 显示添加租赁记录按钮 -->
-      <el-form-item>
+      <el-form-item v-if="dataForm.id">
         <el-button type="success" @click="addRentRecord">添加租赁记录</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 租赁记录列表 -->
-    <div class="rent-records-container">
+    <div class="rent-records-container" v-if="dataForm.id">
       <el-table :data="rentRecords" style="width: 100%">
         <el-table-column prop="rentBeginTime" label="绑定时间" width="150"></el-table-column>
         <el-table-column prop="rentEndTime" label="解绑时间" width="150"></el-table-column>
diff --git a/admin/src/views/pm/tenant/index.vue b/admin/src/views/pm/tenant/index.vue
index 885f842..84f921e 100644
--- a/admin/src/views/pm/tenant/index.vue
+++ b/admin/src/views/pm/tenant/index.vue
@@ -25,10 +25,12 @@
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
         <el-button @click="resetForm()">重置</el-button>
-        <el-button v-hasPermi="['autogencode:pmtenant:save']" type="primary" @click="addOrUpdateHandle()">新增数据</el-button>
-        <el-button v-hasPermi="['autogencode:pmtenant:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>
     </el-form>
+    <div class="option-bth">
+      <el-button v-hasPermi="['autogencode:pmtenant:save']" plain size="small" type="primary" @click="addOrUpdateHandle()">新增租户</el-button>
+        <!-- <el-button v-hasPermi="['autogencode:pmtenant:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button> -->
+    </div>
     <el-table
       :data="dataList"
       border
@@ -142,12 +144,14 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <!-- 表单弹窗, 新增数据和修改数据 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
+    <tenant-add-and-update ref="tenantAddOrUpdate" :ownerId="dataForm.id" @refreshDataList="getDataList"></tenant-add-and-update>
   </div>
 </template>
 
 <script>
-  import AddOrUpdate from './pmtenant-add-and-update'
+  // import AddOrUpdate from './pmtenant-add-and-update'
+  import TenantAddAndUpdate from '@/views/pm/pmowner/tenant-add-and-update'
   import * as api from '@/api/pmtenant.js'
   export default {
     props: {
@@ -185,7 +189,8 @@
       }
     },
     components: {
-      AddOrUpdate
+      // AddOrUpdate,
+      TenantAddAndUpdate
     },
     watch: {
       // 监听业主ID变化
@@ -261,10 +266,9 @@
       },
       // 新增 / 修改
       addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id, this.dataForm.ownerId)
-        })
+        if (this.$refs.tenantAddOrUpdate) {
+          this.$refs.tenantAddOrUpdate.init(id, this.dataForm.id)
+        }
       },
       // 删除处理（支持单个删除和批量删除）
       deleteHandle (id) {
@@ -298,3 +302,11 @@
     }
   }
 </script>
+<style scoped>
+.option-bth {
+  margin-bottom: 10px;
+}
+.divBox {
+  background-color: #EEEEEE;
+}
+</style>
\ No newline at end of file