diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 342ef30f..7eaef1f1 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -81,6 +81,10 @@ class="diy-button--reset" size="small" @click="handleExport">导出 + 批量删除
@@ -159,19 +163,6 @@
-
- 全选 - 删除 -
- @@ -209,16 +200,14 @@ export default { pageSize: 20, pageNo: 0, tableLoading: true, - selAllFlag: false, - isIndeterminate: false,//复选框的不确定状态 - // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 + agencyObj: {},//树所选的小区对象 ownerName: '', ownerPhone: '', validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 selection: [], - showDeletBtn: false, + //form相关 formShow: false, @@ -352,16 +341,7 @@ export default { this.$emit('refreshTree') }, - handleSelectAll (selectAllFlag) { - this.$refs.ref_table.clearSelection(); - if (selectAllFlag) { - this.tableData.forEach(row => { - if (row.showBtn) { - this.$refs.ref_table.toggleRowSelection(row); - } - }); - } - }, + deleteBatch () { if (this.selection.length > 0) { this.$confirm("确认删除选择的楼宇?", "提示", { @@ -388,23 +368,10 @@ export default { selectAll (selection) { this.selection = selection - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - } - }, selectionChange (selection) { this.selection = selection - this.isIndeterminate = false - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - - } else { - this.selAllFlag = false - } }, async handleDelete (row) { @@ -699,14 +666,7 @@ export default { } }, watch: { - selection (val) { - if (val.length > 0) { - this.showDeletBtn = true - } else { - this.showDeletBtn = false - } - } }, props: { staffAgencyId: { diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 27660e25..3d4785f9 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -108,6 +108,10 @@ class="diy-button--qrcode" size="small" @click="handleDownQr(agencyObj, 'community')">社区二维码 + 批量删除 @@ -203,18 +207,6 @@ -
- 全选 - 删除 -
@@ -254,8 +246,7 @@ export default { pageSize: 20, pageNo: 0, tableLoading: true, - selAllFlag: false, - isIndeterminate: false,//复选框的不确定状态 + showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 agencyObj: {},//树所选的组织对象 @@ -414,16 +405,7 @@ export default { this.$emit('refreshTree') }, - handleSelectAll (selectAllFlag) { - this.$refs.ref_table.clearSelection(); - if (selectAllFlag) { - this.tableData.forEach(row => { - if (row.showBtn) { - this.$refs.ref_table.toggleRowSelection(row); - } - }); - } - }, + deleteBatch () { if (this.selection.length > 0) { this.$confirm("确认删除选择的小区?", "提示", { @@ -451,23 +433,11 @@ export default { this.selection = selection - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - } }, selectionChange (selection) { this.selection = selection - this.isIndeterminate = false - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - - } }, async handleDelete (row) { diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 614159a9..bd612699 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -64,6 +64,10 @@ class="diy-button--reset" size="small" @click="handleExport">导出 + 批量删除
@@ -161,19 +165,6 @@
-
- 全选 - 删除 -
- @@ -210,8 +201,7 @@ export default { pageSize: 20, pageNo: 0, tableLoading: true, - selAllFlag: false, - isIndeterminate: false,//复选框的不确定状态 + // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 agencyObj: {},//树所选的小区对象 @@ -361,17 +351,7 @@ export default { this.loadTable() }, - handleSelectAll (selectAllFlag) { - this.$refs.ref_table.clearSelection(); - if (selectAllFlag) { - this.tableData.forEach(row => { - if (row.showBtn) { - this.$refs.ref_table.toggleRowSelection(row); - } - }); - } - }, deleteBatch () { if (this.selection.length > 0) { this.$confirm("确认删除选择的房屋?", "提示", { @@ -397,23 +377,11 @@ export default { }, selectAll (selection) { this.selection = selection - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - } }, selectionChange (selection) { this.selection = selection - this.isIndeterminate = false - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - - } }, async handleDelete (row) { diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index b7c209cf..365c6ecf 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -185,7 +185,7 @@ header-align="center" align="center" label="姓名" - width="100"> + width="120"> + min-width="180"> + width="180"> - + diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 2b7aa7e1..6d84fe0e 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -165,7 +165,7 @@ header-align="center" align="center" show-overflow-tooltip - label="检测机构" + label="检测地点" min-width="230"> +
+ + + + + + + + + + +
+
+ + + + + + + + + + + + + + +
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index d4168b30..99bd6f30 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -151,7 +151,7 @@ import { mapGetters } from "vuex"; import { Loading } from 'element-ui'; //引入Loading服务 import { requestPost } from "@/js/dai/request"; import BasicInfoCommunity from "./basicInfoCommunity"; -import PeopleSearch from "./peopleSearch"; + import People from "./people"; import cptCard from "@/views/modules/visual/cpts/card"; import ScreenLoading from "@/views/modules/visual/cpts/loading"; @@ -951,7 +951,7 @@ const vueGis = { ...mapGetters(["clientHeight"]) }, - components: { BasicInfoCommunity, PeopleSearch, People, cptCard, ScreenLoading }, + components: { BasicInfoCommunity, People, cptCard, ScreenLoading }, } export default vueGis; diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index 6198cc91..b5a1ca9a 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -7,42 +7,45 @@ 更多信息
-
+
-
+
-
+
所属网格： {{ gridName }}
-
+
所属小区： {{ xiaoquName }}
-
+
所属楼宇： {{ louName }}-{{ danyuanName }}
-
+
所属家庭： {{ homeName }}
-
+
{{ field.label }}： - {{ + ">{{ info[field.columnName] == null ? "--" : getOptionLabel( @@ -50,8 +53,7 @@ info[field.columnName], field.itemType ) - }} + }} {{ info[field.columnName] == null ? "--" : info[field.columnName] @@ -63,57 +65,43 @@
-
+
-
+
{{ item.label }}
-
+
-
+
-
-
+
+
{{ field.label }}： - {{ + ">{{ infoItem[field.columnName] == null ? "--" : getOptionLabel( @@ -121,8 +109,7 @@ infoItem[field.columnName], field.itemType ) - }} + }} {{ infoItem[field.columnName] == null @@ -132,21 +119,39 @@
-
-
+
+
+ + +
+ +
+
+
+ + +
+
+
+
{{ field.label }}： - {{ + ">{{ !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null ? "--" @@ -155,8 +160,7 @@ allInfo[group.tableName][0][field.columnName], field.itemType ) - }} + }} {{ !allInfo[group.tableName] || @@ -175,6 +179,7 @@ + + + +