diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue index 5098a7cf0..10ec1f5e7 100644 --- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue +++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue @@ -611,7 +611,7 @@ export default { 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 @@
-
新增 -
- -
- 新增 - - - 导入 - - 导出 - - 下载模板 - - 批量删除 - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
+
+
+ 新增 + + + 导入 + + 导出 + + 下载模板 + + 批量删除 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
@@ -268,6 +274,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,7 +365,8 @@ export default { label: 'partyOrgName', checkStrictly: true, multiple: false - } + }, + searchH: 160, } }, @@ -702,7 +710,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 @@ -