diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 85ba83230..ced7c2bf0 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1339,7 +1339,7 @@ export default { async getRoleList () { this.tableLoading = true; - const url = "/gov/access/govrole/list"; + const url = "/gov/access/govrole/roleListOfCustomer"; let params = {}; diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue index 31c77edfa..10ec1f5e7 100644 --- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue +++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue @@ -608,10 +608,10 @@ export default { }, // 下载模板 async handleExportModule () { - let url = ""; + let url = "/actual/base/resiCategorized/ensureHouse/downloadImportTemplate"; let params = {}; await this.$http({ - method: "POST", + method: "get", url, responseType: "blob", data: params, diff --git a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue index 52364c49c..80230c63b 100644 --- a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue +++ b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue @@ -198,7 +198,6 @@
-
新增 -
- - - +
+ - + @@ -29,7 +29,7 @@ label="党员姓名"> @@ -37,13 +37,12 @@ - + @@ -54,7 +53,7 @@ label="身份证号"> @@ -62,14 +61,14 @@ - + @@ -79,7 +78,7 @@ - + - + - + - + - + - - + + - + - - + + - + - + - + - + - - + + - + @@ -194,7 +193,7 @@ @@ -202,10 +201,10 @@ - + - + - + - + - - + + - + - + - + - + - - + + @@ -275,7 +274,7 @@ @@ -283,21 +282,27 @@ - + - - + + - - +
+ 取 消 + 确 定 +
+
diff --git a/src/views/modules/communityParty/members/memberList.vue b/src/views/modules/communityParty/members/memberList.vue index c3a081a7a..c5a4c3d49 100644 --- a/src/views/modules/communityParty/members/memberList.vue +++ b/src/views/modules/communityParty/members/memberList.vue @@ -104,161 +104,194 @@
- -
- 新增 - - - 导入 - - 导出 - - 下载模板 - - 批量删除 - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- +
+
+ 新增 + + + 导入 + + 导出 + + 下载模板 + + 批量删除 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+ + + + + + @@ -268,6 +301,7 @@ import { defineComponent } from 'vue' import { Loading } from 'element-ui'; +import { mapGetters } from "vuex"; import Create from './create' import Detail from './detail' import Update from './update' @@ -358,13 +392,17 @@ export default { label: 'partyOrgName', checkStrictly: true, multiple: false - } + }, + searchH: 160, } }, methods: { /** ● ==================事件================ **/ + handelCreateClose(){ + this.createDlgShow =false + }, handleMultiSelect(selectedRows) { this.multiSelectedRows = selectedRows; @@ -702,7 +740,15 @@ export default { this.searchForm.pageNo = pageNo; this.search(); }, - } + }, + computed: { + maxTableHeight() { + const h = this.clientHeight - this.searchH - 330 + this.iframeHeight; + const _h = this.clientHeight - 330 - this.searchH; + return this.$store.state.inIframe ? h : _h; + }, + ...mapGetters(["clientHeight", "iframeHeight"]), + }, } diff --git a/src/views/modules/communityParty/partyOrg/create.vue b/src/views/modules/communityParty/partyOrg/create.vue index 81337d21d..36bca0a26 100644 --- a/src/views/modules/communityParty/partyOrg/create.vue +++ b/src/views/modules/communityParty/partyOrg/create.vue @@ -120,7 +120,6 @@ -