@@ -223,6 +228,8 @@ export default {
formShow: false,
formTitle: '新增楼栋',
+ yihuyidangDisabled: false,
+
}
},
components: {
@@ -582,6 +589,40 @@ export default {
);
},
+ //导出一户一档
+ handleExportYihuyidang () {
+ this.yihuyidangDisabled = true
+ let title = this.agencyObj.label
+ title = title + '-一户一档'
+ let url = "/gov/org/house/exportHouseUser"
+
+
+ let params = {
+ agencyId: '',
+ gridId: '',
+ ownerName: this.ownerName,
+ ownerPhone: this.ownerPhone,
+ rentFlag: this.rentFlag,
+ neighborHoodId: this.agencyObj.id
+
+ }
+
+
+ app.ajax.exportFilePost(
+ url,
+ params,
+ (data, rspMsg) => {
+
+ this.download(data, title + '.xls')
+ this.yihuyidangDisabled = false
+ },
+ (rspMsg, data) => {
+ this.$message.error(rspMsg);
+ this.yihuyidangDisabled = false
+ }
+ );
+ },
+
// 上传文件之前的钩子
beforeUpload (file, type) {
@@ -725,6 +766,18 @@ export default {
type: Boolean,
default: false,
},
+ ownerName: {
+ type: String,
+ default: '',
+ },
+ ownerPhone: {
+ type: String,
+ default: '',
+ },
+ rentFlag: {
+ type: String,
+ default: '',
+ },
}
}
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 156903b8..01f94046 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -62,7 +62,7 @@
@@ -92,18 +92,27 @@
ref="ref_neighTable"
:staffAgencyId="staffAgencyId"
:showImportBtn="showImportBtn"
+ :ownerName="ownerName"
+ :ownerPhone="ownerPhone"
+ :rentFlag="rentFlag"
@toNextLevel="toNextLevel"
@refreshTree="refreshTree">
@@ -156,7 +165,7 @@ export default {
],
ownerName: '',
ownerPhone: '',
- rentState: '',
+ rentFlag: '',
showRoomTable: false,
selObj: {},
}
@@ -197,11 +206,11 @@ export default {
methods: {
handleSearch () {
- if (this.ownerName || this.ownerPhone || this.rentState) {
+ if (this.ownerName || this.ownerPhone || this.rentFlag) {
this.showRoomTable = true
this.$nextTick(() => {
- this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
+ this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag)
})
} else {
this.$message.warning('请输入查询条件')
@@ -214,7 +223,7 @@ export default {
resetSearch () {
this.ownerName = ''
this.ownerPhone = ''
- this.rentState = ''
+ this.rentFlag = ''
this.pageSize = 10
this.pageNo = 1
@@ -285,7 +294,7 @@ export default {
handleNodeClick (obj) {
this.ownerName = ''
this.ownerPhone = ''
- this.rentState = ''
+ this.rentFlag = ''
this.showRoomTable = false
this.selObj = JSON.parse(JSON.stringify(obj))
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index e93868af..5eb4596f 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -61,6 +61,7 @@
size="small"
class="diy-button--delete">导入房屋数据
+
批量删除
+
导出一户一档
@@ -231,7 +236,9 @@ export default {
value: '0',
label: '自住'
},
- ]
+ ],
+
+ yihuyidangDisabled: false,
}
@@ -603,6 +610,39 @@ export default {
);
},
+ //导出一户一档
+ handleExportYihuyidang () {
+ this.yihuyidangDisabled = true
+ let title = this.agencyObj.label
+ title = title + '-一户一档'
+ let url = "/gov/org/house/exportHouseUser"
+
+
+ let params = {
+ agencyId: '',
+ gridId: '',
+ ownerName: this.ownerName,
+ ownerPhone: this.ownerPhone,
+ rentFlag: this.rentFlag,
+ buildingId: this.agencyObj.id
+ }
+
+
+
+ app.ajax.exportFilePost(
+ url,
+ params,
+ (data, rspMsg) => {
+
+ this.download(data, title + '.xls')
+ this.yihuyidangDisabled = false
+ },
+ (rspMsg, data) => {
+ this.$message.error(rspMsg);
+ this.yihuyidangDisabled = false
+ }
+ );
+ },
// 上传文件之前的钩子
beforeUpload (file) {
this.files = file;
@@ -730,6 +770,18 @@ export default {
type: Boolean,
default: false,
},
+ ownerName: {
+ type: String,
+ default: '',
+ },
+ ownerPhone: {
+ type: String,
+ default: '',
+ },
+ rentFlag: {
+ type: String,
+ default: '',
+ },
}
}
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
new file mode 100644
index 00000000..ccf2018e
--- /dev/null
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -0,0 +1,882 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 享受福利
+ 补充居民信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
new file mode 100644
index 00000000..99b9837f
--- /dev/null
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -0,0 +1,967 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 出生登记
+ 下载模板
+
+ {{ importBtnTitle }}
+
+
+ 导出
+
+
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/huji/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue
new file mode 100644
index 00000000..5ff47c77
--- /dev/null
+++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue
@@ -0,0 +1,489 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
new file mode 100644
index 00000000..8cf1a260
--- /dev/null
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -0,0 +1,918 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 享受福利
+ 补充居民信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
new file mode 100644
index 00000000..64134370
--- /dev/null
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -0,0 +1,1052 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 迁入登记
+ 下载模板
+
+ {{ importBtnTitle }}
+
+
+ 导出
+
+
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 7f2b7357..a76cfa99 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -126,10 +126,10 @@
type="text"
size="small"
class="btn-color-look">查看 -->
-
变动
+ class="div-table-button--detail">变动 -->
x.level !== 'grid')
+ newTree.forEach(x => x.subAgencyList && (x.subAgencyList = this.filterTree(x.subAgencyList)))
+ return newTree
+
+ },
+
+
+
//加载项目
async getProjectTotal () {
if (this.$refs.pieChart) {
@@ -370,12 +370,7 @@ export default {
if (code === 0) {
this.projectList = [...data]
- // if (this.status === 'closed') {
- // this.projectList = this.projectList1
- // } else {
- // this.projectList = this.projectList2
- // }
this.projectList.forEach(item => {
item.values_ = {
name: item.title
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index d5ec1516..32c4c41d 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -210,12 +210,14 @@ export default {
// 获取当前登录人员信息及组织信息
async getAgencylist () {
- const url = "/gov/org/customeragency/agencygridtree";
+ // const url = "/gov/org/customeragency/agencygridtree";
+ const url = '/gov/org/customeragency/agencylist'
let params = {};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
+
this.agencyInfo = data
this.agencyId = this.agencyInfo.agencyId
if (!this.agencyInfo.latitude) {
@@ -389,7 +391,7 @@ export default {
},
async handleChangeAgency (value) {
-
+ this.demand.list = []
this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
await this.getPieChart()