fix: 业主管理添加租户显示

admin/src/views/pm/pmowner/index.vue

@@ -4,27 +4,13 @@
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-            v-model="deptName"
+            style="margin-bottom: 20px" />
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
         </div>
         <div class="head-container">
-          <el-tree
+          <el-tree :data="deptTreeOptions" :props="defaultProps" :expand-on-click-node="false"
-            :data="deptTreeOptions"
+            :filter-node-method="filterNode" ref="tree" node-key="deptId" default-expand-all highlight-current
-            :props="defaultProps"
+            @node-click="handleNodeClick" />
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="deptId"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
         </div>
       </el-col>
       <!--业主数据-->
@@ -42,113 +28,59 @@
           <el-form-item>
             <el-button @click="getDataList()">查询</el-button>
             <el-button @click="resetForm()">重置</el-button>
-        <el-button v-hasPermi="['autogencode:pmowner:save']" type="primary" @click="addOrUpdateHandle()">新增数据</el-button>
+            <el-button v-hasPermi="['autogencode:pmowner:save']" type="primary"
-        <el-button v-hasPermi="['autogencode:pmowner:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
+              @click="addOrUpdateHandle()">新增数据</el-button>
+            <el-button v-hasPermi="['autogencode:pmowner:delete']" type="danger" @click="deleteHandle()"
+              :disabled="dataListSelections.length <= 0">批量删除</el-button>
           </el-form-item>
         </el-form>
-    <el-table
+        <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle"
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
           style="width: 100%;">
-      <el-table-column
+          <el-table-column type="selection" header-align="center" align="center" width="50">
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
           </el-table-column>
-      <el-table-column
+          <el-table-column type="expand" header-align="center" align="center">
-        prop="ownerName"
+            <template slot-scope="scope">
-        header-align="center"
+              <TenatList :owner-id="scope.row.id" :show-search="false" />
-        align="center"
+            </template>
-        label="业主姓名">
+          </el-table-column>
+          <el-table-column prop="ownerName" header-align="center" align="center" label="业主姓名">
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="ownerType" header-align="center" align="center" label="业主类型">
-        prop="ownerType"
-        header-align="center"
-        align="center"
-        label="业主类型">
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="ownerIdcard" header-align="center" align="center" label="业主身份证">
-        prop="ownerIdcard"
-        header-align="center"
-        align="center"
-        label="业主身份证">
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="phone" header-align="center" align="center" label="联系电话">
-        prop="phone"
-        header-align="center"
-        align="center"
-        label="联系电话">
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="email" header-align="center" align="center" label="电子邮箱">
-        prop="email"
-        header-align="center"
-        align="center"
-        label="电子邮箱">
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="emergencyContact" header-align="center" align="center" label="紧急联系人">
-        prop="emergencyContact"
-        header-align="center"
-        align="center"
-        label="紧急联系人">
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="emergencyPhone" header-align="center" align="center" label="紧急联系电话">
-        prop="emergencyPhone"
-        header-align="center"
-        align="center"
-        label="紧急联系电话">
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="deptId" header-align="center" align="center" label="所属部门">
-        prop="deptId"
-        header-align="center"
-        align="center"
-        label="所属部门">
             <template slot-scope="scope">
               {{ getDeptName(scope.row.deptId) }}
             </template>
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="houseId" header-align="center" align="center" label="所属房屋">
-        prop="houseId"
-        header-align="center"
-        align="center"
-        label="所属房屋">
             <template slot-scope="scope">
               {{ getHouseName(scope.row.houseId) }}
             </template>
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="status" header-align="center" align="center" label="业主状态">
-        prop="status"
-        header-align="center"
-        align="center"
-        label="业主状态">
           </el-table-column>
-      <el-table-column
+          <el-table-column prop="remark" header-align="center" align="center" label="备注">
-        prop="remark"
-        header-align="center"
-        align="center"
-        label="备注">
           </el-table-column>
-      <el-table-column
+          <el-table-column header-align="center" align="center" width="150" label="操作">
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
             <template slot-scope="scope">
               <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ '修改' }}</el-button>
-          <el-button v-hasPermi="['autogencode:pmowner:delete']" type="text" size="small" @click="deleteHandle(scope.row.id)" style="color: #f56c6c;">删除</el-button>
+              <el-button v-hasPermi="['autogencode:pmowner:delete']" type="text" size="small"
+                @click="deleteHandle(scope.row.id)" style="color: #f56c6c;">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
-    <el-pagination
+        <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
-      @size-change="sizeChangeHandle"
+          :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
           layout="total, sizes, prev, pager, next, jumper">
         </el-pagination>
         <!-- 表单弹窗, 新增数据和修改数据 -->
@@ -163,7 +95,13 @@
 import * as api from '@/api/pmowner.js'
 import * as deptApi from '@/api/sysdept.js'
 import * as houseApi from '@/api/pmhouse.js'
+import TenatList from '@/views/pm/tenant/index';
+
 export default {
+  components: {
+    TenatList,
+    AddOrUpdate
+  },
   data() {
     return {
       deptTreeOptions: [],
@@ -185,20 +123,6 @@
         status: '',
         remark: '',
       },
-      // 重置表单
-      resetForm() {
-        this.dataForm = {
-          ownerName: '',
-          ownerType: '',
-          ownerIdcard: '',
-          phone: '',
-          email: '',
-          emergencyContact: '',
-          emergencyPhone: '',
-          status: '',
-          remark: '',
-        }
-      },
       dataList: [],
       pageIndex: 1,
       pageSize: 10,
@@ -207,18 +131,15 @@
       dataListSelections: [],
       addOrUpdateVisible: false
     }
-    },
-      components: {
-        AddOrUpdate
   },
   watch: {
     deptName(val) {
       this.$refs.tree.filter(val);
     }
   },
-    activated () {
+  // activated () {
-      this.getDataList()
+  //   this.getDataList()
-    },
+  // },
   mounted() {
     // 确保页面加载时自动查询
     this.getDataList()
@@ -226,6 +147,20 @@
     this.handleGetHouseList()
   },
   methods: {
+    // 重置表单
+    resetForm() {
+      this.dataForm = {
+        ownerName: '',
+        ownerType: '',
+        ownerIdcard: '',
+        phone: '',
+        email: '',
+        emergencyContact: '',
+        emergencyPhone: '',
+        status: '',
+        remark: '',
+      }
+    },
     handleGetDeptList() {
       deptApi.deptTreeSelect().then(res => {
         this.deptTreeOptions = res
@@ -345,3 +280,8 @@
   }
 }
 </script>
+<style lang="scss" scoped>
+  ::v-deep .el-table__expanded-cell {
+    padding: 0 !important;
+  }
+</style>

admin/src/views/pm/tenant/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="divBox">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form v-if="showSearch" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item label="租户姓名">
         <el-input v-model="dataForm.tenantName" placeholder="请输入租户姓名" clearable></el-input>
       </el-form-item>
@@ -36,17 +36,12 @@
       @selection-change="selectionChangeHandle"
       style="width: 100%;">
       <el-table-column
+        v-if="showSearch"
         type="selection"
         header-align="center"
         align="center"
         width="50">
       </el-table-column>
-      <el-table-column
-        prop="id"
-        header-align="center"
-        align="center"
-        label="id">
-      </el-table-column>
       <el-table-column
         prop="tenantName"
         header-align="center"
@@ -83,56 +78,49 @@
         align="center"
         label="状态">
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="remark"
         header-align="center"
         align="center"
         label="备注">
-      </el-table-column>
+      </el-table-column> -->
-      <el-table-column
+      <!-- <el-table-column
         prop="delFlag"
         header-align="center"
         align="center"
         label="删除标志（0代表存在 2代表删除）">
-      </el-table-column>
+      </el-table-column> -->
-      <el-table-column
+      <!-- <el-table-column
         prop="createDept"
         header-align="center"
         align="center"
         label="创建部门">
-      </el-table-column>
+      </el-table-column> -->
-      <el-table-column
+      <!-- <el-table-column
         prop="createBy"
         header-align="center"
         align="center"
         label="创建人">
-      </el-table-column>
+      </el-table-column> -->
-      <el-table-column
+      <!-- <el-table-column
         prop="createTime"
         header-align="center"
         align="center"
         label="创建时间">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="updateBy"
         header-align="center"
         align="center"
         label="修改人">
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="updateTime"
         header-align="center"
         align="center"
         label="修改时间">
-      </el-table-column>
+      </el-table-column> -->
-      <el-table-column
-        prop="tenantId"
-        header-align="center"
-        align="center"
-        label="租户ID">
-      </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         width="150"
@@ -144,6 +132,7 @@
       </el-table-column>
     </el-table>
     <el-pagination
+      hide-on-single-page
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
@@ -161,9 +150,22 @@
   import AddOrUpdate from './pmtenant-add-and-update'
   import * as api from '@/api/pmtenant.js'
   export default {
+    props: {
+      // 业主ID
+      ownerId: {
+        type: String,
+        default: ''
+      },
+      showSearch: {
+        type: Boolean,
+        default: true
+      }
+    },
     data () {
       return {
         dataForm: {
+          // 业主ID
+          ownerId: this.ownerId,
           tenantName: '',
           tenantType: '',
           idCard: '',
@@ -185,6 +187,13 @@
     components: {
       AddOrUpdate
     },
+    watch: {
+      // 监听业主ID变化
+      ownerId(newVal) {
+        this.dataForm.ownerId = newVal;
+        this.getDataList();
+      }
+    },
     activated () {
       this.getDataList()
     },
@@ -196,6 +205,8 @@
       // 重置表单
       resetForm() {
         this.dataForm = {
+          // 业主ID
+          ownerId: this.ownerId,
           tenantName: '',
           tenantType: '',
           idCard: '',
@@ -223,6 +234,7 @@
         if (this.dataForm.company) params.company = this.dataForm.company;
         if (this.dataForm.status) params.status = this.dataForm.status;
         if (this.dataForm.remark) params.remark = this.dataForm.remark;
+        if (this.dataForm.ownerId) params.ownerId = this.dataForm.ownerId;
 
         api.pmtenantListApi(params).then(res => {
           this.dataListLoading = false