From 9712c947bebeece9da709a8a07f7625e5c2d58cd Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 15 Feb 2023 16:27:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=B7=A6=E4=BE=A7?=
=?UTF-8?q?=E6=A0=91=E6=87=92=E5=8A=A0=E8=BD=BD=E4=B8=8E=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/resiForm.vue | 6 +-
.../modules/base/community/community.vue | 129 ++++++++++++++----
2 files changed, 102 insertions(+), 33 deletions(-)
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 288b75729..9f40b73b9 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1618,9 +1618,9 @@ export default {
this.getHouseList()
},
async handleClick (tab, event) {
- console.log(tab);
- console.log(event);
- console.log(tab._props.label );
+ // console.log(tab);
+ // console.log(event);
+ // console.log(tab._props.label );
if (tab._props.label == '教育') {
if (!this.form.resiId) {
this.newForm.eduInfoDto = this.form.eduInfoDto
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 59a6ae2da..17c6603fd 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -4,7 +4,7 @@
+ v-model="filterText" @keydown.native.enter="handleChangeSerch()">
@@ -15,10 +15,11 @@
:props="defaultProps"
:highlight-current="true"
node-key="id"
- :default-expanded-keys="openNodes"
:expand-on-click-node="false"
:filter-node-method="filterNode"
- @node-click="handleNodeClick">
+ @node-click="handleNodeClick"
+ lazy
+ :load="lazyLoadTree">
@@ -140,10 +141,19 @@
-
@@ -60,11 +60,11 @@
-
@@ -368,7 +368,7 @@ export default {
async loadMapData () {
const _that = this
// this.$refs.lineChart.showLoading()
- const url = "/gov/project/project/projectdistributionanalysisright";
+ const url = "/governance/project/projectdistributionanalysisright";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisright";
let params = {
orgId: this.orgId,
@@ -496,7 +496,7 @@ export default {
const _that = this
- const url = "/gov/project/project/projectdistributionanalysisleft";
+ const url = "/governance/project/projectdistributionanalysisleft";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft";
let params = {
orgId: this.orgId,
diff --git a/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue
index 7e260517e..cdd9e717a 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue
@@ -63,7 +63,7 @@ export default {
methods: {
async handleSearch () {
- const url = "/gov/project/icEvent/detail";
+ const url = "/governance/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
const { data, code, msg } = await requestPost(url, {
diff --git a/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue
index 2c84b082f..ad61ecff9 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue
@@ -61,7 +61,7 @@ export default {
methods: {
async handleSearch () {
- const url = "/gov/project/icEvent/detail";
+ const url = "/governance/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
const { data, code, msg } = await requestPost(url, {
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index ec8af55dc..7730e2e79 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
@@ -887,7 +887,7 @@ const vueGis = {
},
async loadEvent (info) {
- const url = "/gov/project/icEvent/detail";
+ const url = "/governance/icEvent/detail";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
const { data, code, msg } = await requestPost(url, {
@@ -1929,7 +1929,7 @@ export default vueGis;
.ol-overlaycontainer-stopevent {
display: none;
}
-
+
\ No newline at end of file
+
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index a113c259a..74cbe5d27 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
@@ -898,7 +898,7 @@ const vueGis = {
},
async loadEvent (info) {
- const url = "/gov/project/icEvent/detail";
+ const url = "/governance/icEvent/detail";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
const { data, code, msg } = await requestPost(url, {
@@ -1857,7 +1857,7 @@ export default vueGis;
.ol-overlaycontainer-stopevent {
display: none;
}
-
+
\ No newline at end of file
+
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 30210f532..50b9ca78d 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -890,7 +890,7 @@ const vueGis = {
},
async loadEvent (info) {
- const url = "/gov/project/icEvent/detail";
+ const url = "/governance/icEvent/detail";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
const { data, code, msg } = await requestPost(url, {
@@ -1937,7 +1937,7 @@ export default vueGis;
.ol-overlaycontainer-stopevent {
display: none;
}
-
+
\ No newline at end of file
+
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 1898a35c9..15a6a426c 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -897,7 +897,7 @@ const vueGis = {
},
async loadEvent (info) {
- const url = "/gov/project/icEvent/detail";
+ const url = "/governance/icEvent/detail";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
const { data, code, msg } = await requestPost(url, {
diff --git a/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue
index b35437118..f48b583c9 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue
@@ -72,7 +72,7 @@ export default {
methods: {
async handleSearch () {
- const url = "/gov/project/icEvent/detail";
+ const url = "/governance/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
const { data, code, msg } = await requestPost(url, {
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index 469b98d5b..10a3b49b7 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -434,7 +434,7 @@ export default {
console.log(feature)
const featureInfo = feature.values_.properties.info
let coordinate = [featureInfo.longitude, featureInfo.latitude]
- const url = "/gov/project/trace/projectdetail";
+ const url = "/governance/trace/projectdetail";
const { data, code, msg } = await requestPost(url, {
projectId: featureInfo.projectId,
@@ -464,17 +464,17 @@ export default {
内部备注:
`+ projectInfo.internalRemark + `
-
+
处理部门:
`+ projectInfo.departmentNameList + `
-
+
分类:
`+ projectInfo.projectCate + `
-
+
标签:
`+ projectInfo.projectTag + `
-
-
+
+
`
this.$refs.map.handleShowPopup(showData, coordinate)
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 6b3ea9c4b..1b139b3f5 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -275,7 +275,7 @@ export default {
this.$refs.pieChart.showLoading()
}
- const url = "/gov/issue/issue/resibuzz-leftpiechart";
+ const url = "/governance/issue/resibuzz-leftpiechart";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz-leftpiechart";
let params = {
orgId: this.orgId,
@@ -446,7 +446,7 @@ export default {
//加载组织数据
async getTable () {
- const url = "/gov/issue/issue/resibuzz";
+ const url = "/governance/issue/resibuzz";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz";
let params = {
status: this.status,
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index d558898e2..a6459c9d0 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -297,7 +297,7 @@ export default {
//加载组织数据
async getEventInfo () {
- const url = "/gov/project/icEvent/detail";
+ const url = "/governance/icEvent/detail";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
const { data, code, msg } = await requestPost(url, {
@@ -313,7 +313,7 @@ export default {
//加载处理进展
async getEventProcess () {
- const url = "/gov/project/icEvent/process";
+ const url = "/governance/icEvent/process";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processes/" + this.eventId;
const { data, code, msg } = await requestPost(url, {
@@ -335,7 +335,7 @@ export default {
//加载组织数据
async getYanPan () {
- const url = "/gov/project/icEvent/processAnalysis/analysis/" + this.eventId;
+ const url = "/governance/icEvent/processAnalysis/analysis/" + this.eventId;
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/analysis/" + this.eventId;
let param = {}
@@ -364,7 +364,7 @@ export default {
if (!this.yanPan.categoryPids) {
return false
}
- const url = "/gov/project/icEvent/processAnalysis/categoryEventList";
+ const url = "/governance/icEvent/processAnalysis/categoryEventList";
// const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/categoryEventList";
let param = {
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
index c73db8d08..31e4f4fad 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
@@ -389,7 +389,7 @@ export default {
this.$refs.pieChart.clear()
}
- const url = "/gov/project/icEvent/processAnalysis/processStatusRatio";
+ const url = "/governance/icEvent/processAnalysis/processStatusRatio";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processStatusRatio";
let params = {
orgId: this.orgId,
@@ -439,7 +439,7 @@ export default {
//加载组织数据
async getTable () {
- const url = "/gov/project/icEvent/processAnalysis/eventList";
+ const url = "/governance/icEvent/processAnalysis/eventList";
//const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/processAnalysis/eventList";
let params = {
processStatus: this.processStatus,
@@ -517,7 +517,7 @@ export default {
}
const _that = this
// this.$refs.pieChart.showLoading()
- const url = "/gov/project/icEvent/processAnalysis/monthlyIncrement";
+ const url = "/governance/icEvent/processAnalysis/monthlyIncrement";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/monthlyIncrement";
let params = {
orgId: this.orgId,
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index 964a673e5..b3b909fe5 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -396,7 +396,7 @@ export default {
this.$refs.pieChart.clear();
}
- const url = "/gov/project/icEvent/processAnalysis/processStatusRatio";
+ const url = "/governance/icEvent/processAnalysis/processStatusRatio";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processStatusRatio";
let params = {
orgId: this.orgId,
@@ -445,7 +445,7 @@ export default {
//加载组织数据
async getTable() {
- const url = "/gov/project/icEvent/processAnalysis/eventList";
+ const url = "/governance/icEvent/processAnalysis/eventList";
//const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/processAnalysis/eventList";
let params = {
processStatus: this.processStatus,
@@ -522,7 +522,7 @@ export default {
}
const _that = this;
// this.$refs.pieChart.showLoading()
- const url = "/gov/project/icEvent/processAnalysis/monthlyIncrement";
+ const url = "/governance/icEvent/processAnalysis/monthlyIncrement";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/monthlyIncrement";
let params = {
orgId: this.orgId,
diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
index 799fc1bc0..47fb8461d 100644
--- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -348,7 +348,7 @@ export default {
this.$refs.pieChart.clear()
}
- const url = "/gov/project/icEvent/category-analysis/total"
+ const url = "/governance/icEvent/category-analysis/total"
let params = {
orgId: this.orgId,
orgType: this.orgType,
@@ -385,7 +385,7 @@ export default {
this.$refs.gridPieChart.clear()
}
- const url = "/gov/project/icEvent/category-analysis/org-total"
+ const url = "/governance/icEvent/category-analysis/org-total"
let params = {
orgId: this.orgId,
orgType: this.orgType,
@@ -419,7 +419,7 @@ export default {
//加载组织数据
async getTable () {
- const url = '/gov/project/icEvent/processAnalysis/eventList'
+ const url = '/governance/icEvent/processAnalysis/eventList'
let params = {
orgId: this.tableOrgId ? this.tableOrgId : this.orgId,
orgType: this.tableOrgType ? this.tableOrgType : this.orgType,
From 9c7e667958d277b5e7316ca7b6b8761bc858ea91 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 15 Feb 2023 19:31:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=9F=A5=E7=9C=8B/?=
=?UTF-8?q?=E6=88=BF=E5=B1=8Bcopy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/resiInfo.vue | 496 ++++++----
src/views/components/resiSearch.vue | 5 -
.../modules/base/community/community copy.vue | 883 ++++++++++++++++++
src/views/modules/base/resi.vue | 23 +-
4 files changed, 1195 insertions(+), 212 deletions(-)
create mode 100644 src/views/modules/base/community/community copy.vue
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index 276a376be..30d13cac2 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -97,7 +97,7 @@
其他信息
-
+
文化程度:
{{educationText}}
@@ -107,7 +107,7 @@
{{eduInfoDto.eduRemark?eduInfoDto.eduRemark:'--'}}
-
+
兴趣分类 :
@@ -131,7 +131,7 @@
-
+
宗教:
{{residentReligionObj.religion?residentReligionObj.religion:'--'}}
@@ -141,7 +141,7 @@
{{residentReligionObj.religionRemark?residentReligionObj.religionRemark:'--'}}
-
+
@@ -268,7 +268,7 @@
-
+
@@ -350,7 +350,7 @@
-
+
@@ -407,7 +407,168 @@
-
+
+
+
+
+
+
出生地 :
+
{{residentBirthRecordObj?residentBirthRecordObj.birthplace?residentBirthRecordObj.birthplace:'--':'--'}}
+
+
+
+
+
父亲姓名 :
+
{{residentBirthRecordObj?residentBirthRecordObj.father ?residentBirthRecordObj.father :'--':'--'}}
+
+
+
+
+
母亲姓名 :
+
{{residentBirthRecordObj?residentBirthRecordObj.mother?residentBirthRecordObj.mother:'--':'--'}}
+
+
+
+
+
+
+
胎次 :
+
{{residentBirthRecordObj?residentBirthRecordObj.count?residentBirthRecordObj.count:'--':'--'}}
+
+
+
+
+
申报日期 :
+
{{residentBirthRecordObj?residentBirthRecordObj.reportDate ?residentBirthRecordObj.reportDate :'--':'--'}}
+
+
+
+
+
+
+
+
+
死亡时间 :
+
{{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}}
+
+
+
+
+
加入原因 :
+
{{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}}
+
+
+
+
+
移除时间 :
+
{{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}}
+
+
+
+
+
+
+
移除原因 :
+
{{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}}
+
+
+
+
+
+
+
+
+
迁出日期 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}}
+
+
+
+
+
迁出类型 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.type ?residentMoveOutRecordObj.type :'--':'--'}}
+
+
+
+
+
迁出原因 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.reason ?residentMoveOutRecordObj.reason:'--':'--'}}
+
+
+
+
+
+
+
迁出至组织 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}}
+
+
+
+
+
小区 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName ?residentMoveOutRecordObj.villageName :'--':'--'}}
+
+
+
+
+
楼号 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName ?residentMoveOutRecordObj.buildName:'--':'--'}}
+
+
+
+
+
+
+
单元 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName ?residentMoveOutRecordObj.unitName :'--':'--'}}
+
+
+
+
+
房屋 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName ?residentMoveOutRecordObj.homeName :'--':'--'}}
+
+
+
+
+
外迁地址 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.address ?residentMoveOutRecordObj.address:'--':'--'}}
+
+
+
+
+
+
+
+
+
+
+
+ {{ handleFilterSpan(scope.row, item) }}
+
+
+
+
+
+
@@ -464,7 +625,7 @@
-
+
@@ -501,7 +662,7 @@
-
+
@@ -563,7 +724,7 @@
-
+
@@ -634,7 +795,7 @@
-
+
@@ -650,7 +811,7 @@
-
+
志愿者类别 :
@@ -672,7 +833,7 @@
-
+
@@ -682,7 +843,7 @@
-
+
特殊人群类别 :
@@ -696,167 +857,6 @@
-
-
-
-
-
出生地 :
-
{{residentBirthRecordObj?residentBirthRecordObj.birthplace?residentBirthRecordObj.birthplace:'--':'--'}}
-
-
-
-
-
父亲姓名 :
-
{{residentBirthRecordObj?residentBirthRecordObj.father ?residentBirthRecordObj.father :'--':'--'}}
-
-
-
-
-
母亲姓名 :
-
{{residentBirthRecordObj?residentBirthRecordObj.mother?residentBirthRecordObj.mother:'--':'--'}}
-
-
-
-
-
-
-
胎次 :
-
{{residentBirthRecordObj?residentBirthRecordObj.count?residentBirthRecordObj.count:'--':'--'}}
-
-
-
-
-
申报日期 :
-
{{residentBirthRecordObj?residentBirthRecordObj.reportDate ?residentBirthRecordObj.reportDate :'--':'--'}}
-
-
-
-
-
-
-
-
-
死亡时间 :
-
{{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}}
-
-
-
-
-
加入原因 :
-
{{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}}
-
-
-
-
-
移除时间 :
-
{{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}}
-
-
-
-
-
-
-
移除原因 :
-
{{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}}
-
-
-
-
-
-
-
-
-
迁出日期 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}}
-
-
-
-
-
迁出类型 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.type ?residentMoveOutRecordObj.type :'--':'--'}}
-
-
-
-
-
迁出原因 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.reason ?residentMoveOutRecordObj.reason:'--':'--'}}
-
-
-
-
-
-
-
迁出至组织 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}}
-
-
-
-
-
小区 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName ?residentMoveOutRecordObj.villageName :'--':'--'}}
-
-
-
-
-
楼号 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName ?residentMoveOutRecordObj.buildName:'--':'--'}}
-
-
-
-
-
-
-
单元 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName ?residentMoveOutRecordObj.unitName :'--':'--'}}
-
-
-
-
-
房屋 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName ?residentMoveOutRecordObj.homeName :'--':'--'}}
-
-
-
-
-
外迁地址 :
-
{{residentMoveOutRecordObj?residentMoveOutRecordObj.address ?residentMoveOutRecordObj.address:'--':'--'}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ handleFilterSpan(scope.row, item) }}
-
-
-
-
-
@@ -865,6 +865,7 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 29f223fc7..c6d73f8c9 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -661,6 +661,7 @@ export default {
obj.agencyId = "";
}
this.currentPage = 1
+ console.log(obj);
this.getTableData(obj)
},
@@ -1033,17 +1034,17 @@ export default {
await this.residentBaseInfo();
},
// 获取详情
- residentBaseInfo () {
- this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg);
- } else {
- this.$refs.baseForm.old_from(res.data);
- }
- }).catch((err) => {
- return this.$message.error("网络错误");
- });
- },
+ // residentBaseInfo () {
+ // this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => {
+ // if (res.code !== 0) {
+ // return this.$message.error(res.msg);
+ // } else {
+ // this.$refs.baseForm.old_from(res.data);
+ // }
+ // }).catch((err) => {
+ // return this.$message.error("网络错误");
+ // });
+ // },
handlerReset() {
this.$refs.baseForm.resetForm();
},