xiaozhan
/
crmeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
main
wx-jincw 2 weeks ago
parent 0fc483c7ac
commit fca31bb136
2 changed files with 292 additions and 340 deletions
Show Stats Download Patch File Download Diff File

206
admin/src/views/pm/pmowner/index.vue
Unescape View File

@ -4,27 +4,13 @@
<!--部门数据--> <!--部门数据-->
<el-col :span="4" :xs="24"> <el-col :span="4" :xs="24">
<div class="head-container"> <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>
<div class="head-container"> <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> </div>
</el-col> </el-col>
<!--业主数据--> <!--业主数据-->
@ -42,113 +28,59 @@
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">查询</el-button>
<el-button @click="resetForm()">重置</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-item>
</el-form> </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%;"> 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 <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 <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 <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 <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 <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 <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 <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 <el-table-column prop="deptId" header-align="center" align="center" label="所属部门">
prop="deptId"
header-align="center"
align="center"
label="所属部门">
<template slot-scope="scope"> <template slot-scope="scope">
{{ getDeptName(scope.row.deptId) }} {{ getDeptName(scope.row.deptId) }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ getHouseName(scope.row.houseId) }} {{ getHouseName(scope.row.houseId) }}
</template> </template>
</el-table-column> </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 <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 <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"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ '修改' }}</el-button> <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> </template>
</el-table-column> </el-table-column>
</el-table> </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"> layout="total, sizes, prev, pager, next, jumper">
</el-pagination> </el-pagination>
<!-- 表单弹窗, 新增数据和修改数据 --> <!-- 表单弹窗, 新增数据和修改数据 -->
@ -159,12 +91,18 @@
</template> </template>
<script> <script>
import AddOrUpdate from './pmowner-add-and-update' import AddOrUpdate from './pmowner-add-and-update'
import * as api from '@/api/pmowner.js' import * as api from '@/api/pmowner.js'
import * as deptApi from '@/api/sysdept.js' import * as deptApi from '@/api/sysdept.js'
import * as houseApi from '@/api/pmhouse.js' import * as houseApi from '@/api/pmhouse.js'
export default { import TenatList from '@/views/pm/tenant/index';
data () {
export default {
components: {
TenatList,
AddOrUpdate
},
data() {
return { return {
deptTreeOptions: [], deptTreeOptions: [],
deptMap: {}, deptMap: {},
@ -185,20 +123,6 @@
status: '', status: '',
remark: '', remark: '',
}, },
// 重置表单
resetForm() {
this.dataForm = {
ownerName: '',
ownerType: '',
ownerIdcard: '',
phone: '',
email: '',
emergencyContact: '',
emergencyPhone: '',
status: '',
remark: '',
}
},
dataList: [], dataList: [],
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
@ -207,18 +131,15 @@
dataListSelections: [], dataListSelections: [],
addOrUpdateVisible: false addOrUpdateVisible: false
} }
},
components: {
AddOrUpdate
}, },
watch: { watch: {
deptName(val) { deptName(val) {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
} }
}, },
activated () { // activated () {
this.getDataList() // this.getDataList()
}, // },
mounted() { mounted() {
// 确保页面加载时自动查询 // 确保页面加载时自动查询
this.getDataList() this.getDataList()
@ -226,6 +147,20 @@
this.handleGetHouseList() this.handleGetHouseList()
}, },
methods: { methods: {
// 重置表单
resetForm() {
this.dataForm = {
ownerName: '',
ownerType: '',
ownerIdcard: '',
phone: '',
email: '',
emergencyContact: '',
emergencyPhone: '',
status: '',
remark: '',
}
},
handleGetDeptList() { handleGetDeptList() {
deptApi.deptTreeSelect().then(res => { deptApi.deptTreeSelect().then(res => {
this.deptTreeOptions = res this.deptTreeOptions = res
@ -263,7 +198,7 @@
return this.houseMap[houseId] || '-' return this.houseMap[houseId] || '-'
}, },
// 获取数据列表 // 获取数据列表
getDataList () { getDataList() {
this.dataListLoading = true this.dataListLoading = true
// 根据后端PmOwnerController和PageParamRequest的期望格式构建参数 // 根据后端PmOwnerController和PageParamRequest的期望格式构建参数
const params = { const params = {
@ -292,29 +227,29 @@
}) })
}, },
// 每页数 // 每页数
sizeChangeHandle (val) { sizeChangeHandle(val) {
this.pageSize = val this.pageSize = val
this.pageIndex = 1 this.pageIndex = 1
this.getDataList() this.getDataList()
}, },
// 当前页 // 当前页
currentChangeHandle (val) { currentChangeHandle(val) {
this.pageIndex = val this.pageIndex = val
this.getDataList() this.getDataList()
}, },
// 多选 // 多选
selectionChangeHandle (val) { selectionChangeHandle(val) {
this.dataListSelections = val this.dataListSelections = val
}, },
// 新增 / 修改 // 新增 / 修改
addOrUpdateHandle (id) { addOrUpdateHandle(id) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init(id) this.$refs.addOrUpdate.init(id)
}) })
}, },
// 删除处理（支持单个删除和批量删除） // 删除处理（支持单个删除和批量删除）
deleteHandle (id) { deleteHandle(id) {
let ids = [] let ids = []
let idText = '' let idText = ''
@ -343,5 +278,10 @@
}) })
}, },
} }
} }
</script> </script>
<style lang="scss" scoped>
::v-deep .el-table__expanded-cell {
padding: 0 !important;
}
</style>

64
admin/src/views/pm/tenant/index.vue
Unescape View File

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

Write Preview
Loading…
Cancel
Save