From c1b109123989c3f765f2691b2c859f6904d2a4af Mon Sep 17 00:00:00 2001
From: bibi <541660090@qq.com>
Date: Thu, 10 Feb 2022 14:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/basic/resident/index.js | 24 +++
src/components/table/index.vue | 1 +
.../Basic/Authority/depend/permissions.vue | 36 ----
src/views/Basic/Authority/index.vue | 1 -
.../EstateInfo/_buildingManage/index.vue | 1 -
.../EstateInfo/_houseHoldAudit/index.vue | 1 +
.../_houseHoldInfo/depend/addForm.vue | 163 ++++++++++++++----
.../_houseHoldInfo/depend/config.js | 5 +
.../EstateInfo/_houseHoldInfo/depend/form.js | 2 +-
.../Basic/EstateInfo/_houseHoldInfo/index.vue | 152 ++++++++++++++--
.../Basic/EstateInfo/_houseManage/index.vue | 1 +
src/views/Basic/WorkOrder/index.vue | 1 +
12 files changed, 305 insertions(+), 83 deletions(-)
diff --git a/src/api/basic/resident/index.js b/src/api/basic/resident/index.js
index 02f22c5..6b34584 100644
--- a/src/api/basic/resident/index.js
+++ b/src/api/basic/resident/index.js
@@ -38,6 +38,30 @@ export function residentInfo(params) {
params: params,
})
}
+// 迁出
+export function moveOut(params) {
+ return httpService({
+ url: `/user/resident/moveOut`,
+ method: 'post',
+ data: params,
+ })
+}
+// 迁入
+export function moveIn(params) {
+ return httpService({
+ url: `/user/resident/moveIn`,
+ method: 'post',
+ data: params,
+ })
+}
+// 根据房屋查租户
+export function findTenantByEstateId(params) {
+ return httpService({
+ url: `/user/resident/findTenantByEstateId`,
+ method: 'get',
+ params: params,
+ })
+}
// 住户审核
// 审核列表
export function reviewList(params) {
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 2a60d42..321f3f3 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -29,6 +29,7 @@
:data-source="tableData"
:pagination="pagination"
:scroll="{ x: 1400 }"
+ @change="handleTableChange"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: selectionChoosed,
diff --git a/src/views/Basic/Authority/depend/permissions.vue b/src/views/Basic/Authority/depend/permissions.vue
index 3e2b098..4973417 100644
--- a/src/views/Basic/Authority/depend/permissions.vue
+++ b/src/views/Basic/Authority/depend/permissions.vue
@@ -80,7 +80,6 @@
+
\ No newline at end of file
diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js
index cfbdf70..cd5c628 100644
--- a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js
+++ b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js
@@ -74,4 +74,9 @@ export const pagination = {
showTotal: (total) => `共 ${total} 条`,
showSizeChanger: true,
showQuickJumper: true,
+}
+export const rules = {
+ estateId:[{required:true,message:'请选择房屋',trigger:'change'}],
+ identity:[{required:true,message:'请选择身份',trigger:'change'}],
+ linkUserId :[{required:true,message:'请输入姓名',trigger:'change'}],
}
\ No newline at end of file
diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/form.js b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/form.js
index 9a2b690..386efc3 100644
--- a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/form.js
+++ b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/form.js
@@ -1,5 +1,5 @@
export const form = {
- id:undefined,
+ id:null,
manageEstateId: undefined,
type:'',
identity:undefined,
diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
index 7a8b086..7f5e296 100644
--- a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
+++ b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
@@ -16,7 +16,7 @@
- 添加住户
+ 添加住户
@@ -49,6 +49,7 @@
:data-source="tableData"
:pagination="pagination"
:scroll="{ x: 1400 }"
+ @change="handleTableChange"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: selectionChoosed,
@@ -78,7 +79,8 @@
编辑
-
+ 迁入
+ 迁出
@@ -90,13 +92,50 @@
-
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ {{item.name}}
+
+
+
+
+