From 0324a529fea90786724b724856c0ced64593885a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 25 Mar 2022 11:14:21 +0800 Subject: [PATCH 001/579] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 10 ++++-- src/views/modules/base/community/roomForm.vue | 12 +++---- .../modules/base/community/roomTable.vue | 35 ++++++++++++------- .../regionalParty/activitys.vue | 8 ++--- .../communityParty/regionalParty/units.vue | 8 ++--- src/views/modules/visual/basicinfo/people.vue | 2 +- 6 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 1708c943d..ece5784a9 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -98,12 +98,16 @@ export default { }, computed: { rowHeight () { - return (this.clientHeight - 120) + 'px' + + return this.$store.state.inIframe ? this.clientHeight - 120 + this.iframeHeight + 'px' : this.clientHeight - 120 + 'px' + }, treeHeight () { - return (this.clientHeight - 200) + 'px' + return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px' + }, - ...mapGetters(['clientHeight']) + + ...mapGetters(['clientHeight', 'iframeHeight']) }, methods: { async loadTree (isRefresh) { diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index dfdda8440..b60fe6c61 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -11,7 +11,7 @@ - {{ agencyObj.communityName }}—{{agencyObj.label}} + {{ agencyObj.neighborHoodName }}—{{agencyObj.label}} - + min-width="160"> + min-width="150"> + label="所属楼栋" + width="80"> - + + label="门牌号" + width="70"> + label="类型" + width="50"> + label="用途" + width="50"> + label="是否出租" + width="80"> + label="房主姓名" + width="90"> { + item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName + item.unitNumShow = item.unitNum + '单元' if (item.agencyId === this.staffAgencyId) { item.showBtn = true this.validTableDataNum++ @@ -327,6 +337,7 @@ export default { }, handleAdd () { + this.formTitle = '新增房屋' this.formShow = true this.$nextTick(() => { diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue index 0fbdc0063..d98baa208 100644 --- a/src/views/modules/communityParty/regionalParty/activitys.vue +++ b/src/views/modules/communityParty/regionalParty/activitys.vue @@ -634,13 +634,11 @@ export default { computed: { tableHeight () { - return (this.clientHeight - 430) + return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430 }, - rowHeight () { - return (this.clientHeight - 200) + 'px' - }, - ...mapGetters(['clientHeight']) + + ...mapGetters(['clientHeight', 'iframeHeight']) }, watch: { diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index cb0696ce3..9c6d5b6b5 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -675,13 +675,11 @@ export default { computed: { tableHeight () { - return (this.clientHeight - 430) + return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430 }, - rowHeight () { - return (this.clientHeight - 200) + 'px' - }, - ...mapGetters(['clientHeight']) + + ...mapGetters(['clientHeight', 'iframeHeight']) }, watch: { diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index 74ed24d86..146a16d0d 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -126,7 +126,7 @@ src="@/assets/img/shuju/people/huzhu.png" /> -
{{ houseInfo.ownerName }}
+
{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}

（户主）

From 884d4f54871eab36a9486e4923da920c4d5027e9 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 25 Mar 2022 11:16:44 +0800 Subject: [PATCH 002/579] dd --- src/utils/index.js | 30 ++++++++++++++++ src/views/components/editResi.vue | 2 +- src/views/components/resiForm.vue | 55 +++++++---------------------- src/views/components/resiSearch.vue | 2 +- 4 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/utils/index.js b/src/utils/index.js index fe742c9ac..c2232ac77 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -115,3 +115,33 @@ export function dateFormats(fmt, date) { } return fmt } +// 根据身份证计算出生日期，性别，年龄 +export function computedCard(idCard) { + let sex = null; + let birth = null; + let myDate = new Date(); + let month = myDate.getMonth() + 1; + let day = myDate.getDate(); + let age = 0; + + if(idCard.length===18){ + age = myDate.getFullYear() - idCard.substring(6, 10) - 1; + sex = idCard.substring(16,17); + birth = idCard.substring(6,10)+"-"+idCard.substring(10,12)+"-"+idCard.substring(12,14); + if (idCard.substring(10, 12) < month || idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day) age++; + + } + if(idCard.length===15){ + age = myDate.getFullYear() - idCard.substring(6, 8) - 1901; + sex = idCard.substring(13,14); + birth = "19"+idCard.substring(6,8)+"-"+idCard.substring(8,10)+"-"+idCard.substring(10,12); + if (idCard.substring(8, 10) < month || idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day) age++; + } + + if(sex%2 === 0) + sex = '0'; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别 + else + sex = '1'; + return {age , sex, birth} +} + diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index d7afc877c..fba7172b6 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -33,7 +33,7 @@ - +
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 506c2265c..6ed432b42 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -32,7 +32,7 @@ - +
@@ -99,48 +99,7 @@
- + @@ -158,6 +117,7 @@ size="small" clearable placeholder="请输入内容" + @blur="handleValidBlur(n)" > import { isCard, isMobile } from '@/utils/validate' +import { computedCard } from '@/utils/index' export default { name: 'resiForm', @@ -525,6 +486,14 @@ export default { // } }) }, + handleValidBlur(n) { + console.log('n---', n) + if (n.columnName !== 'ID_CARD') return + if (!isCard(this.form.ID_CARD)) return + const { sex, birth } = computedCard(this.form.ID_CARD) + this.form.BIRTHDAY = birth + this.form.GENDER = sex == 1 ? '1' : '2' + }, handleOpenSearch () { this.openSearch = !this.openSearch }, diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 1c2cd5494..6cc4a41a7 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -28,7 +28,7 @@
-
所属小区
+
所属房屋
Date: Fri, 25 Mar 2022 13:50:40 +0800 Subject: [PATCH 003/579] =?UTF-8?q?ai=E5=AE=89=E9=98=B2=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=AE=89=E9=98=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index 9712a81a9..d0f37f371 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -315,7 +315,7 @@ router.beforeEach((to, from, next) => { { icon: "icon-setting", id: "44rq22222q2222", - name: "AI安防", + name: "智慧安防", // url: "visual/basicinfo/basicInfoMain", children: [ { From 36161bfd842c3e53e17165da273ba44f9c2a3721 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 25 Mar 2022 14:07:47 +0800 Subject: [PATCH 004/579] dd --- src/views/modules/base/collect.vue | 12 ++++++----- src/views/modules/base/resi.vue | 18 ++++++++++++++--- .../modules/communityParty/elegant/index.vue | 14 +++++++++++-- .../communityService/measure/index.vue | 13 ++++++++++-- .../modules/communityService/sqzzz/index.vue | 4 ++-- src/views/modules/importRecord/index.vue | 11 ++++++---- .../difficulty/difficultyList.vue | 12 ++++++----- .../secretaryLog/humanisticCare/careList.vue | 12 ++++++----- .../modules/secretaryLog/workLog/index.vue | 7 ++++--- .../serviceMatter/service.vue | 12 +++++------ .../modules/workPc/guidance/categoryList.vue | 11 +++++++--- .../modules/workPc/guidance/guidanceList.vue | 6 ++++-- src/views/modules/workSys/demandCate.vue | 14 +++++++++++-- src/views/modules/workSys/elegantCate.vue | 20 +++++++++++++------ src/views/modules/workSys/resiCate.vue | 14 +++++++++++-- 15 files changed, 127 insertions(+), 53 deletions(-) diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index 8f6c49af9..155f675eb 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -61,7 +61,7 @@ border style="width: 100%" class="resi-table" - :height="maxTableHeight" + :height="tableHeight" :span-method="arraySpanMethod" > @@ -189,10 +189,12 @@ export default { }; }, computed: { - maxTableHeight() { - return this.clientHeight - 360; - }, - ...mapGetters(["clientHeight"]), + ...mapGetters(['clientHeight', 'iframeHeight']), + tableHeight() { + const h = this.clientHeight - 360 + this.iframeHeigh + const _h = this.clientHeight - 360 + return this.$store.state.inIframe ? h : _h + } }, watch: { timeRange(val) { diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 9e35e8d64..95b645a5f 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -297,7 +297,7 @@ export default { currentPage: 1, pageSize: 20, total: null, - tableHeight: 0, + searchH: 0, conditions: [], activeName: '', tableData: [], @@ -336,6 +336,14 @@ export default { } }, + computed: { + ...mapGetters(['clientHeight', 'iframeHeight']), + tableHeight() { + const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh + const _h = this.clientHeight - 280 - this.searchH + return this.$store.state.inIframe ? h : _h + } + }, async created () { if (this.$route.query) { let query = this.$route.query @@ -352,12 +360,16 @@ export default { // this.handleSearch() // this.getTableData() this.pageLoading = true + this.searchH = this.$refs.resiSearch.$el.offsetHeight console.log('storeoooo----0000', this.$store) console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight) - this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px' + }, mounted () { - + + // this.$nextTick(() => { + // this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px' + // }) console.log('document.documentElement.clientWidth', document.documentElement.clientHeight) }, methods: { diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index 1366c6734..c1cce0edb 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -235,6 +235,7 @@ From e12336c496789b6efdcbd4b8d998dc61e6a23ae4 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Sat, 2 Apr 2022 13:34:48 +0800 Subject: [PATCH 015/579] dd --- src/views/modules/base/epidemic/antiInfo.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 4378dd86e..365c6ecf7 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"> Date: Sat, 2 Apr 2022 13:40:24 +0800 Subject: [PATCH 016/579] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/buildTable.vue | 54 +--- .../modules/base/community/communityTable.vue | 42 +-- .../modules/base/community/roomTable.vue | 42 +-- .../modules/base/epidemic/natInfo/natList.vue | 2 +- .../visual/basicinfo/basicInfoMain.vue | 93 ++---- .../visual/basicinfo/cpts/people-more.vue | 302 +++++++++++++----- .../modules/visual/basicinfo/peopleSearch.vue | 61 +++- 7 files changed, 319 insertions(+), 277 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 342ef30f3..7eaef1f1f 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 27660e257..3d4785f98 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 92710ca28..d7f2f6cd0 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">导出 + 批量删除
@@ -154,19 +158,6 @@
-
- 全选 - 删除 -
- @@ -203,8 +194,7 @@ export default { pageSize: 20, pageNo: 0, tableLoading: true, - selAllFlag: false, - isIndeterminate: false,//复选框的不确定状态 + // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 agencyObj: {},//树所选的小区对象 @@ -350,17 +340,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("确认删除选择的房屋?", "提示", { @@ -386,23 +366,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/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 2b7aa7e11..6d84fe0e9 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"> - - -
+
-
@@ -151,8 +146,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"; @@ -384,59 +378,46 @@ const vueGis = { this.toSubAgency('polygon', e) }, - //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 + //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） async toSubAgency (type, e, searchName) { //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图 - if (type === 'people') { - this.runNum++ - this.runAgencyArray.push(this.orgData) - this.orgLevel = 'people' - this.selUserId = e - this.orgId = '' - this.orgData = { - id: '', - level: 'people', - name: '人员档案' - } - this.searchName = searchName - } else { - if (!e) { - return false - } - if (!e.selected[0]) { - return false + if (!e) { + return false + } + if (!e.selected[0]) { + return false + } + this.runNum++ + this.orgData.center = map.getView().getCenter() + this.orgData.zoom = map.getView().getZoom() + console.log('center', map.getView().getCenter()) + console.log('zoom', map.getView().getZoom()) + + this.runAgencyArray.push(this.orgData) + + this.subAgencyArray.forEach(item => { + if (item.id === e.selected[0].values_.id) { + this.orgId = item.id + this.orgLevel = item.level + this.orgData = item } - this.runNum++ - this.orgData.center = map.getView().getCenter() - this.orgData.zoom = map.getView().getZoom() - console.log('center', map.getView().getCenter()) - console.log('zoom', map.getView().getZoom()) - - this.runAgencyArray.push(this.orgData) - - this.subAgencyArray.forEach(item => { - if (item.id === e.selected[0].values_.id) { - this.orgId = item.id - this.orgLevel = item.level - this.orgData = item - } + }); + + if (this.orgLevel === 'neighborHood') { + this.loadList() + this.$nextTick(() => { + // 小区id，小区名称 + this.$refs.ref_community.initData(this.orgData.id, this.orgData.name); }); - if (this.orgLevel === 'neighborHood') { - this.loadList() - this.$nextTick(() => { - // 小区id，小区名称 - this.$refs.ref_community.initData(this.orgData.id, this.orgData.name); - }); + } else { + this.refreshMap(true) + } - } else { - this.refreshMap(true) - } - } }, @@ -530,11 +511,7 @@ const vueGis = { this.center = this.orgData.center this.zoom = this.orgData.zoom - if (this.orgLevel === 'people') { - - } - - else if (this.orgLevel === 'neighborHood') {//显示小区 + if (this.orgLevel === 'neighborHood') {//显示小区 } else { @@ -951,7 +928,7 @@ const vueGis = { ...mapGetters(["clientHeight"]) }, - components: { BasicInfoCommunity, PeopleSearch, People, cptCard, ScreenLoading }, + components: { BasicInfoCommunity, 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 6198cc918..b5a1ca9a7 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 @@ + + + + + + + + + From 8a67dd573ff39d4a933d0f7f1cc1b420cb66a559 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 11 Apr 2022 09:23:17 +0800 Subject: [PATCH 042/579] dd --- src/views/modules/base/epidemic/travelForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue index ed662cab1..c6d1f6fcc 100644 --- a/src/views/modules/base/epidemic/travelForm.vue +++ b/src/views/modules/base/epidemic/travelForm.vue @@ -53,7 +53,7 @@ From bae5cb7a10c488ee67c7eff5534b0c6353f91c55 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 11 Apr 2022 14:33:10 +0800 Subject: [PATCH 043/579] dd --- src/views/components/editResi.vue | 8 ++++---- src/views/modules/communityService/sqzzz/index.vue | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index d7afc877c..cb71cda7e 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -137,7 +137,7 @@ - +
@@ -363,11 +363,11 @@ export default { if (item.required) { if (item.validType === 'mobile') { rules[item.columnName] = [ - { validator: checkMObile, trigger: 'blur' } + { required: true, validator: checkMObile, trigger: 'blur' } ] } else if (item.validType === 'id_card') { rules[item.columnName] = [ - { validator: checkIdCard, trigger: 'blur' } + { required: true, validator: checkIdCard, trigger: 'blur' } ] } else { rules[item.columnName] = [ @@ -501,7 +501,7 @@ export default { }, created () { this.initForm() - // console.log('formInfo---ggg', this.form) + console.log('formInfo---gggreg', this.rulesForm) if (this.supportAdd) { this.addList = [...this.mutiList] // console.log('addList----111', this.addList) diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index 9e347e835..940778b6a 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -95,7 +95,7 @@ align="center" > From 679793ae70e053ab08c3edd64eafb5b9dc35b0e3 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 11 Apr 2022 14:34:30 +0800 Subject: [PATCH 044/579] dd --- src/views/components/resiForm.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 506c2265c..d7b0587df 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -146,7 +146,7 @@ - +
@@ -355,11 +355,11 @@ export default { if (item.required) { if (item.validType === 'mobile') { rules[item.columnName] = [ - { validator: checkMObile, trigger: 'blur' } + { required: true, validator: checkMObile, trigger: 'blur' } ] } else if (item.validType === 'id_card') { rules[item.columnName] = [ - { validator: checkIdCard, trigger: 'blur' } + { required: true, validator: checkIdCard, trigger: 'blur' } ] } else { rules[item.columnName] = [ From 4528f1957c0d2f2741e2df88bece56f3410edd98 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 11 Apr 2022 14:36:22 +0800 Subject: [PATCH 045/579] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/people.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index 146a16d0d..2079e0d66 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -139,12 +139,8 @@ src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
- - {{ - houseInfo.userList[0].relation - }} - （{{ houseInfo.userList[0].userName }}） +
{{ houseInfo.userList[0].relation }}
+
{{ houseInfo.userList[0].userName }}
From 15c6ad8e7d8e141931488a84fd9fdafeea63a48f Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 12 Apr 2022 13:53:04 +0800 Subject: [PATCH 046/579] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/common.scss | 8 ++++++++ src/views/modules/shequ/cpts/bar-chart.vue | 3 ++- src/views/modules/shequ/index.vue | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 7acb699ea..794afa6f7 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -813,3 +813,11 @@ img { background-color: #fe6252; border-color: #fe6252; } + +// 修改表格不换行的问题 +div.el-table div.cell { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + word-wrap: normal; +} diff --git a/src/views/modules/shequ/cpts/bar-chart.vue b/src/views/modules/shequ/cpts/bar-chart.vue index 9e965b9cb..962ff6f82 100644 --- a/src/views/modules/shequ/cpts/bar-chart.vue +++ b/src/views/modules/shequ/cpts/bar-chart.vue @@ -18,6 +18,7 @@ let srcData = []; const iniChart = function (config, srcData, total, that) { chart = new F2.Chart({ id: "myChart", + pixelRatio: window.devicePixelRatio, ...config, }); @@ -91,7 +92,7 @@ const iniChart = function (config, srcData, total, that) { attrs: { x: point.x, y: point.y + offset, - text: obj.count + '人', + text: obj.count + "人", textAlign: "center", textBaseline: "bottom", fill: "#808080", diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 54e8a5756..3eed29d44 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -319,7 +319,8 @@ label="所属网格"> + label="姓名" + width="80"> @@ -328,7 +329,8 @@ + align="center" + width="60"> + + + + + + + + + + + + + + + @@ -95,6 +116,19 @@
+ + + 确认删除吗？ +
+ 取 消 + 确 定 +
+
@@ -103,8 +137,11 @@ import { requestPost } from "@/js/dai/request"; export default { data(){ return{ + // 删除标签 + delId:'', // 客户Id customerId:'', + agencyId:'', // 查询参数 queryParams:{ name:'' @@ -118,26 +155,35 @@ export default { agencyType:'', pid:'', categoryCode:'', - sort:0 + sort:'' }, // 树状结构列表 treeList:[], // 查询动力主轴机构标签 listSimple:[], - + // 绑定组织列表 + agencytree:[], + // 上级网格党支部列表 + GridPartyBranchList:[], // 重新渲染表格状态 refreshTable: true, // 是否展开，默认全部展开 isExpandAll: true, // 新增对话框 addDialogBox:false, + // 组织列表开关 + orgListSwitch:false, + // 确认删除弹窗 + delWindow:false, } }, created(){ - this.getTreeList() + // this.getTreeList() + this.getList4Tree() }, mounted(){ this.customerId = localStorage.getItem('customerId') + this.agencyId = localStorage.getItem('agencyId') }, methods:{ // 查询按钮操作 @@ -158,19 +204,19 @@ export default { }, // 获取树状列表数据 - async getTreeList(){ - const url = '/pli/power/axisStruct/getTreeList' + // async getTreeList(){ + // const url = '/pli/power/axisStruct/getTreeList' - let params = {} + // let params = {} - const { data,code,msg } = await requestPost(url) + // const { data,code,msg } = await requestPost(url) - if(code === 0){ - this.treeList = data - } else { - this.$message.error(msg) - } - }, + // if(code === 0){ + // this.treeList = data + // } else { + // this.$message.error(msg) + // } + // }, // 确定新增按钮 async submitAddNewOrg(){ const url = '/pli/power/axisStruct/addOrg' @@ -178,7 +224,11 @@ export default { let params = { name:this.addOrgForm.name, sort:this.addOrgForm.sort, - customerId:this.customerId + customerId:this.customerId, + agencyId:this.addOrgForm.agencyId, + agencyName:this.addOrgForm.agencyName, + agencyType:this.addOrgForm.agencyType, + categoryCode:this.addOrgForm.categoryCode } const { data, code, msg } = await requestPost(url,params) @@ -187,11 +237,12 @@ export default { this.$message.success("新增成功") this.addDialogBox = false this.addOrgFormRest() - this.getTreeList() + this.getList4Tree() } else { this.$message.error(msg) } }, + // 获取动力主轴标签 async getListSimple(){ const url = '/pli/power/axisTag/listSimple/struct' @@ -200,22 +251,63 @@ export default { const { data, code, msg } = await requestPost(url,params) if (code === 0) { - console.log(data) this.listSimple = data } else { this.$message.error(msg) } }, + // 获取组织列表 + async getAgencyTree(){ + const url = '/data/aggregator/org/agencytree' + + let params = { + agencyId:this.agencyId, + client:'gov' + } + + const { data, code, msg } = await requestPost(url,params) + + if (code === 0) { + this.agencytree = data[0].subOrgList + } else { + this.$message.error(msg) + } + }, + // 获取组织树 + async getList4Tree(){ + const url = '/pli/power/axisStruct/list4Tree' + + let params = {} + + const { data, code, msg } = await requestPost(url,params) + + if (code === 0) { + this.treeList = data + } else { + this.$message.error(msg) + + } + }, + // 获取上级网格党支部 + async getGridPartyBranchList(){ + const url = '/pli/power/axisStruct/GridPartyBranchList' + + let params = {} + + + }, + // 新增按钮 addNewOrg(){ this.addDialogBox = true this.getListSimple() + this.getAgencyTree() }, /** 重置按钮操作 */ resetQuery() { this.queryParams.name = '' - this.getTreeList() + this.getList4Tree() }, /** 展开/折叠操作 */ toggleExpandAll() { @@ -229,6 +321,7 @@ export default { handleClose(done) { this.$confirm('确认关闭？') .then(_ => { + this.addOrgFormRest() done(); }) .catch(_ => {}); @@ -236,6 +329,7 @@ export default { // 取消新增按钮 cancelAdd(){ this.addDialogBox = false + this.addOrgFormRest() }, // 清空新增表单 addOrgFormRest(){ @@ -246,13 +340,54 @@ export default { this.addOrgForm.agencyName = '', this.addOrgForm.agencyType = '', this.addOrgForm.pid = '' + this.addOrgForm.categoryCode = '' }, // 动力主轴选中后的操作 - handelChange(event){ - console.log(event) - } + handelChange(val){ + this.addOrgForm.categoryCode = val + if (val === 'community_party') { + this.orgListSwitch = true + } + if(val === 'grid_party') { + this.orgListSwitch = false + } + }, + handelAgencyTree(val){ + let obj = {} + obj = this.agencytree.find(item => { + return item.orgId === val + }) + this.addOrgForm.agencyName = obj.orgName + this.addOrgForm.agencyType = obj.orgType + this.addOrgForm.agencyId = val + }, + // 删除按钮 + del(row){ + this.delWindow = true + this.delId = row.row.id + }, + async submitDelete(){ + const url = '/pli/power/axisStruct/deleteById/'+this.delId + + let params = {} + const { data, code, msg } = await requestPost(url,params) + if (code === 0) { + this.$message.success("删除成功") + this.delWindow = false + this.getList4Tree() + } else { + this.$message.error(msg) + } + }, + // 取消删除按钮 + canceldelWindow(){ + this.delWindow = false + }, + + + } } From 91f66112800baee07570c3e2a80de6f5dbd2ad32 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 19 Apr 2022 16:43:43 +0800 Subject: [PATCH 084/579] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/dqfwzx/cpts/edit.vue | 104 +++++++++--------- .../modules/communityService/dqfwzx/index.vue | 2 +- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index 54551433d..874b1bea2 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -182,9 +182,33 @@ v-model="item.matterName" :disabled="item.matterId != undefined" /> + + + + +
（事项封面，图片小于1M）
+
+ +
-
-
- - - - - -
（事项封面，图片小于1M）
- 删除 .m-staffs { margin-left: auto; - width: 950px; + width: 520px; .item { - display: flex; + // display: flex; + // align-items: flex-start; + padding-bottom: 20px; + margin-bottom: 20px; + border-bottom: 4px dashed #f7f8f9; + .item-info { display: flex; - margin: 0 20px; - width: 65%; - justify-content: space-around; - align-items: center; - margin-bottom: 7px; - } - .item-pic { - display: flex; - width: 35%; - align-items: center; - .hint { - font-size: 14px; - color: #999999; - margin-left: 10px; - } + align-items: flex-start; + margin: 0 0; + // margin-bottom: 7px; + .avatar-uploader { + margin: 0 0 0 50px; + ::v-deep .el-upload { cursor: pointer; position: relative; @@ -671,8 +666,8 @@ export default { border-color: #409eff; } .avatar { - width: 50px; - height: 50px; + width: 36px; + height: 36px; display: block; } .avatar-uploader-icon { @@ -680,12 +675,23 @@ export default { border-radius: 6px; font-size: 28px; color: #8c939d; - width: 50px; - height: 50px; - line-height: 50px; + width: 36px; + height: 36px; + line-height: 36px; text-align: center; } } + .hint { + width: 75%; + font-size: 14px; + color: #999999; + margin-left: 0; + } + } + .item-pic { + display: flex; + align-items: center; + justify-content: space-around; } } } diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue index d486b8457..8173f6524 100644 --- a/src/views/modules/communityService/dqfwzx/index.vue +++ b/src/views/modules/communityService/dqfwzx/index.vue @@ -106,7 +106,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle" - width="1150px" + width="850px" top="5vh" class="dialog-h" @closed="handleClose" From 2c98d243cb11c883a0eea622d81d5e1c804afa87 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 19 Apr 2022 16:56:08 +0800 Subject: [PATCH 085/579] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityService/dqfwzx/cpts/edit.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index 874b1bea2..fb1e16b03 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -176,6 +176,7 @@
至 删除 Date: Tue, 19 Apr 2022 17:13:09 +0800 Subject: [PATCH 086/579] 111 --- src/views/modules/communityParty/regionalParty/activitys.vue | 1 + src/views/modules/communityParty/regionalParty/units.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue index fccc7806a..7f14586d2 100644 --- a/src/views/modules/communityParty/regionalParty/activitys.vue +++ b/src/views/modules/communityParty/regionalParty/activitys.vue @@ -223,6 +223,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle" + :destroy-on-close="true" width="950px" top="5vh" class="dialog-h" diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 9c6d5b6b5..e01609a02 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -235,6 +235,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle" + :destroy-on-close="true" width="950px" top="5vh" class="dialog-h" From a2481ad34f62dd35eb28c6011711f51c9e2d6706 Mon Sep 17 00:00:00 2001 From: YUJT Date: Tue, 19 Apr 2022 17:32:42 +0800 Subject: [PATCH 087/579] =?UTF-8?q?=E6=96=B0=E5=A2=9EtreeSelect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/utils/treeSelect.js | 50 ++++++++ src/views/modules/plugins/power/.gitkeep | 0 src/views/modules/plugins/power/poweraxis.vue | 109 ++++++------------ 4 files changed, 86 insertions(+), 74 deletions(-) create mode 100644 src/utils/treeSelect.js delete mode 100644 src/views/modules/plugins/power/.gitkeep diff --git a/package.json b/package.json index 3deef137b..dcecc12f3 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "et:list": "gulp themes" }, "dependencies": { + "@riophae/vue-treeselect": "^0.4.0", "@tinymce/tinymce-vue": "^4.0.4", "axios": "^0.19.0", "babel-eslint": "^8.0.1", diff --git a/src/utils/treeSelect.js b/src/utils/treeSelect.js new file mode 100644 index 000000000..4ff8cfd0c --- /dev/null +++ b/src/utils/treeSelect.js @@ -0,0 +1,50 @@ +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + */ + export function handleTree(data, id, parentId, children) { + let config = { + id: id || 'id', + parentId: parentId || 'parentId', + childrenList: children || 'children' + }; + + var childrenListMap = {}; + var nodeIds = {}; + var tree = []; + + for (let d of data) { + let parentId = d[config.parentId]; + if (childrenListMap[parentId] == null) { + childrenListMap[parentId] = []; + } + nodeIds[d[config.id]] = d; + childrenListMap[parentId].push(d); + } + + for (let d of data) { + let parentId = d[config.parentId]; + if (nodeIds[parentId] == null) { + tree.push(d); + } + } + + for (let t of tree) { + adaptToChildrenList(t); + } + + function adaptToChildrenList(o) { + if (childrenListMap[o[config.id]] !== null) { + o[config.childrenList] = childrenListMap[o[config.id]]; + } + if (o[config.childrenList]) { + for (let c of o[config.childrenList]) { + adaptToChildrenList(c); + } + } + } + return tree; +} diff --git a/src/views/modules/plugins/power/.gitkeep b/src/views/modules/plugins/power/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue index c60bf68fd..2c37816aa 100644 --- a/src/views/modules/plugins/power/poweraxis.vue +++ b/src/views/modules/plugins/power/poweraxis.vue @@ -2,15 +2,10 @@
- + - 搜索 重置 @@ -33,29 +28,21 @@ - - - + + + + + + @@ -134,7 +121,11 @@ \ No newline at end of file From f0a336726433796f861874c94759557195bc7128 Mon Sep 17 00:00:00 2001 From: YUJT Date: Wed, 20 Apr 2022 10:22:58 +0800 Subject: [PATCH 091/579] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/power/poweraxis.vue | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue index f18153113..1fbfe7c9e 100644 --- a/src/views/modules/plugins/power/poweraxis.vue +++ b/src/views/modules/plugins/power/poweraxis.vue @@ -1,6 +1,13 @@ - + + diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index dc67bf6a9..43afa3dfb 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -86,6 +86,14 @@ label="楼栋类型" min-width="140"> + + + + diff --git a/src/views/modules/base/community/community copy.vue b/src/views/modules/base/community/community copy.vue deleted file mode 100644 index 2812b0d7c..000000000 --- a/src/views/modules/base/community/community copy.vue +++ /dev/null @@ -1,341 +0,0 @@ - - - - - - - diff --git a/src/views/modules/base/community/communityTable copy.vue b/src/views/modules/base/community/communityTable copy.vue deleted file mode 100644 index 7edd74bff..000000000 --- a/src/views/modules/base/community/communityTable copy.vue +++ /dev/null @@ -1,793 +0,0 @@ - - - - - - - diff --git a/src/views/modules/base/community/roomTable copy.vue b/src/views/modules/base/community/roomTable copy.vue deleted file mode 100644 index ecc109bb6..000000000 --- a/src/views/modules/base/community/roomTable copy.vue +++ /dev/null @@ -1,716 +0,0 @@ - - - - diff --git a/src/views/modules/visual/basicinfo/houseStatic/options.js b/src/views/modules/visual/basicinfo/houseStatic/options.js index e271f19d3..5b7e5f5e0 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/options.js +++ b/src/views/modules/visual/basicinfo/houseStatic/options.js @@ -57,7 +57,7 @@ export function housePieOption (_charts) { itemStyle: { color: 'rgba(40, 101, 250, 0)', width:0, - borderColor: 'rgba(40, 101, 250, 0.5)', + borderColor: 'rgba(40, 101, 250, 1)', borderWidth: 1, borderType: 'dotted' } diff --git a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js index 7ac43fcfa..54129ff2b 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js +++ b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js @@ -59,7 +59,7 @@ export function userPieOption (_charts) { itemStyle: { color: 'rgba(40, 101, 250, 0)', width:0, - borderColor: 'rgba(40, 101, 250, 0.5)', + borderColor: 'rgba(40, 101, 250, 1)', borderWidth: 1, borderType: 'dotted' } From 2c897e3afc9a79d6a89f7b3bbd6e6f27e5e8f623 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 26 Apr 2022 09:43:09 +0800 Subject: [PATCH 167/579] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/zh-CN.js | 1 + .../rent/rentcontractinfo-add-or-update.vue | 95 ++++++----- .../modules/plugins/rent/rentcontractinfo.vue | 153 +++++++++++------- .../plugins/rent/rentcontractreview.vue | 85 +++++++++- 4 files changed, 230 insertions(+), 104 deletions(-) diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 6f3923da2..993f4b0ad 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -13,6 +13,7 @@ t.delete = '删除' t.deleteBatch = '删除' t.update = '修改' t.checkBtn = '审核' +t.lookBtn = '查看' t.checkTGBtn = '审核通过' t.checkBTGBtn = '审核不通过' t.query = '查询' diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index fcc54a223..387ec8a9e 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -1,43 +1,45 @@ + + + @@ -104,6 +109,7 @@ export default { visible: false, dataForm: { id: '', + flag: '', gridId: '', gridName: '', buildId: '', @@ -123,7 +129,10 @@ export default { signDate: '', startDate: '', endDate: '' - } + }, + dataListLoading: false, + dialogVisible: false, + dialogImageUrl: '' } }, computed: { @@ -199,6 +208,11 @@ export default { } }) }, + // 查看大图 + imgShow(url){ + this.dialogImageUrl = url + this.dialogVisible = true + }, // 获取信息 getInfo () { this.$http.get(`/pli/power/rentContractInfo/${this.dataForm.id}`).then(({ data: res }) => { @@ -212,12 +226,13 @@ export default { }).catch(() => {}) }, // 审核提交方法 - checkHandle(type){ + checkHandle: function (type) { this.$message({ message: type, type: 'success', duration: 500, - onClose: () => {} + onClose: () => { + } }) }, diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 354a5fd54..00a4dcbf2 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -97,12 +97,20 @@
- - - - - - +
+ + + + + + + + + +
+ + + @@ -110,10 +118,14 @@
- - - - + + + + + + + + @@ -184,56 +196,60 @@ import mixinViewModule from '@/mixins/view-module' import AddOrUpdate from './rentcontractinfo-add-or-update' export default { mixins: [mixinViewModule], - data () { - return { - mixinViewModuleOptions: { - getDataListURL: '/pli/power/rentContractInfo/page', - getDataListIsPage: true, - deleteURL: '/pli/power/rentContractInfo', - deleteIsBatch: true - }, - optionsV: [], - optionsB: [], - optionsH: [], - optionsD: [], - optionsG: [], - dataForm: { - id: '', - gridId: '', - villageId: '', - buildId: '', - unitId: '', - homeId: '', - lesseeIdCard: '', - state: '', - lesseeMobile: '', - lesseeName: '', - startTime: '', - endTime: '' - }, - stateArr: [ - { dictValue: '0', dictName: '未审核' }, - { dictValue: '1', dictName: '审核通过' }, - { dictValue: '2', dictName: '审核不通过' } - ], - pickerBeginDateBefore: { - disabledDate: (time) => { - let beginDateVal = this.dataForm.endTime - if (beginDateVal) { - return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + data: function () { + return { + mixinViewModuleOptions: { + getDataListURL: '/pli/power/rentContractInfo/page', + getDataListIsPage: true, + deleteURL: '/pli/power/rentContractInfo', + deleteIsBatch: true + }, + optionsV: [], + optionsB: [], + optionsH: [], + optionsD: [], + optionsG: [], + dataForm: { + id: '', + gridId: '', + villageId: '', + buildId: '', + unitId: '', + homeId: '', + lesseeName: '', + lesseeIdCard: '', + lesseeMobile: '', + lessorName: '', + lessorIdCard: '', + lessorMobile: '', + startTime: '', + endTime: '', + endDate: '' + }, + pickerBeginDateBefore: { + disabledDate: (time) => { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } } - } - }, - pickerBeginDateAfter: { - disabledDate: (time) => { - let EndDateVal = this.dataForm.startTime - if (EndDateVal) { - return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } } - } + }, + endDateArr: [ + {dictValue: '0', dictName: '近一个月'}, + {dictValue: '1', dictName: '近两个月'}, + {dictValue: '2', dictName: '近三个月'}, + {dictValue: '3', dictName: '到期的房屋合同'} + ] } - } - }, + }, components: { AddOrUpdate }, @@ -253,6 +269,15 @@ export default { } }, methods: { + // 新增 / 修改 + addOrUpdateHandle (id,flag) { + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.dataForm.id = id + this.$refs.addOrUpdate.dataForm.flag = flag + this.$refs.addOrUpdate.init() + }) + }, btKeyUpLesseeIdCard (e) { e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') this.dataForm.lesseeIdCard = e.target.value @@ -265,6 +290,18 @@ export default { e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') this.dataForm.lesseeName = e.target.value }, + btKeyUpLessorIdCard (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeIdCard = e.target.value + }, + btKeyUpLessorMobile (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeMobile = e.target.value + }, + btKeyUpLessorName (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeName = e.target.value + }, handleClearVillage() { this.dataForm.buildId = '' this.dataForm.homeId = '' diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index 32493ba75..59124ad3e 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -97,28 +97,69 @@
+
+ + + + + + + + + + + + +
+ + + + + + + + + + + {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} - + + + - + @@ -162,8 +203,19 @@ export default { villageId: '', buildId: '', unitId: '', - homeId: '' - } + homeId: '', + lesseeIdCard: '', + state: '0', + lesseeMobile: '', + lesseeName: '', + startTime: '', + endTime: '' + }, + stateArr: [ + {dictValue: '0', dictName: '未审核'}, + {dictValue: '1', dictName: '审核通过'}, + {dictValue: '2', dictName: '审核不通过'} + ] } }, components: { @@ -185,6 +237,27 @@ export default { } }, methods: { + // 新增 / 修改 + addOrUpdateHandle (id,flag) { + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.dataForm.id = id + this.$refs.addOrUpdate.dataForm.flag = flag + this.$refs.addOrUpdate.init() + }) + }, + btKeyUpLesseeIdCard (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeIdCard = e.target.value + }, + btKeyUpLesseeMobile (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeMobile = e.target.value + }, + btKeyUpLesseeName (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeName = e.target.value + }, handleClearVillage() { this.dataForm.buildId = '' this.dataForm.homeId = '' From 25c1c032301facf2881a210c9a105790f779fd1c Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Apr 2022 14:59:37 +0800 Subject: [PATCH 168/579] dfsfs --- src/views/modules/shequ/cpts/people-more.vue | 4 +- .../visual/basicinfo/cpts/people-more.vue | 288 ++++++++++-------- 2 files changed, 163 insertions(+), 129 deletions(-) diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index 00f8f9158..7425c30a6 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -136,7 +136,7 @@
-
+
-
+
更多信息
-
+
-
+
-
+
所属网格： {{ gridName }}
-
+
所属小区： {{ xiaoquName }}
-
+
所属楼栋： {{ louName }}-{{ danyuanName }}
-
+
所属家庭： {{ homeName }}
-
+
{{ field.label }}： - {{ + " + >{{ info[field.columnName] == null ? "--" : getOptionLabel( @@ -53,7 +50,8 @@ info[field.columnName], field.itemType ) - }} + }} {{ info[field.columnName] == null ? "--" : info[field.columnName] @@ -65,43 +63,63 @@
-
+
-
+
{{ item.label }}
-
+
-
-
-
-
+
+
+
+
{{ field.label }}： - {{ + " + >{{ infoItem[field.columnName] == null ? "--" : getOptionLabel( @@ -109,7 +127,8 @@ infoItem[field.columnName], field.itemType ) - }} + }} {{ infoItem[field.columnName] == null @@ -119,39 +138,47 @@
-
+
- - +
-
-
+
- - +
-
-
+
+
{{ field.label }}： - {{ + " + >{{ !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null ? "--" @@ -160,7 +187,8 @@ allInfo[group.tableName][0][field.columnName], field.itemType ) - }} + }} {{ !allInfo[group.tableName] || @@ -195,10 +223,11 @@ export default { }, components: { - cptCard, cptTb + cptCard, + cptTb, }, - data () { + data() { return { fieldList: [], groupList: [], @@ -212,8 +241,8 @@ export default { danyuanList: [], homeList: [], - natList: [],//核酸信息 - tripList: [],//行程信息 + natList: [], //核酸信息 + tripList: [], //行程信息 natDemand: { loading: false, @@ -267,17 +296,22 @@ export default { width: "15%", }, ], - header: ["序号", "来自地区", "来到本地地区", "离开本地地区", "最近一次通知时间", "备注"], + header: [ + "序号", + "来自地区", + "来到本地地区", + "离开本地地区", + "最近一次通知时间", + "备注", + ], list: [], srcList: [], - - }, }; }, computed: { - xiaoquName () { + xiaoquName() { const { xiaoquList, info: { VILLAGE_ID }, @@ -290,7 +324,7 @@ export default { } return ""; }, - louName () { + louName() { const { louList, info: { BUILD_ID }, @@ -303,7 +337,7 @@ export default { } return ""; }, - danyuanName () { + danyuanName() { const { danyuanList, info: { UNIT_ID }, @@ -316,7 +350,7 @@ export default { } return ""; }, - danyuanName () { + danyuanName() { const { danyuanList, info: { UNIT_ID }, @@ -329,7 +363,7 @@ export default { } return ""; }, - homeName () { + homeName() { const { homeList, info: { HOME_ID }, @@ -345,17 +379,17 @@ export default { }, watch: { - userId () { + userId() { this.getApiData(); }, }, - mounted () { + mounted() { this.getApiData(); }, methods: { - addStartGroupIndex () { + addStartGroupIndex() { const { startGroupIndex, groupList } = this; if (startGroupIndex < groupList.length - 9) { this.startGroupIndex = startGroupIndex + 1; @@ -363,7 +397,7 @@ export default { this.startGroupIndex = groupList.length - 9; } }, - subStartGroupIndex () { + subStartGroupIndex() { const { startGroupIndex, groupList } = this; if (startGroupIndex > 0) { this.startGroupIndex = startGroupIndex - 1; @@ -371,21 +405,21 @@ export default { this.startGroupIndex = 0; } }, - handleClose () { + handleClose() { this.$emit("close"); }, - async getApiData () { + async getApiData() { await this.getField(); await this.getInfo(); - this.getDetailList() + this.getDetailList(); this.getXiaoquList(); this.getLouList(); this.getDanyuanList(); this.getHomeList(); }, - getOptionLabel (options, value, type = "") { + getOptionLabel(options, value, type = "") { if (Array.isArray(options)) { let valueArr = value.split(","); if (type == "cascader") { @@ -419,7 +453,7 @@ export default { }, //加载组织数据 - async getField () { + async getField() { const url = "/oper/customize/icform/getcustomerform"; const { data, code, msg } = await requestPost(url, { @@ -459,7 +493,7 @@ export default { }, //加载组织数据 - async getInfo () { + async getInfo() { const url = "/epmetuser/icresiuser/detail"; const { data, code, msg } = await requestPost(url, { @@ -493,49 +527,46 @@ export default { } }); }); - const arr = [{ - groupId: "hs123", - itemList: [], - label: "核酸检测信息", - sort: 998, - supportAdd: false, - tableName: "ic_hs", - }, { - groupId: "hs124", - itemList: [], - label: "行程信息", - sort: 999, - supportAdd: false, - tableName: "ic_xc", - }] - this.groupList = [...this.groupList, ...arr] + const arr = [ + { + groupId: "hs123", + itemList: [], + label: "核酸检测信息", + sort: 998, + supportAdd: false, + tableName: "ic_hs", + }, + { + groupId: "hs124", + itemList: [], + label: "行程信息", + sort: 999, + supportAdd: false, + tableName: "ic_xc", + }, + ]; + this.groupList = [...this.groupList, ...arr]; } else { this.$message.error(msg); } }, - async getDetailList () { - - const url = "/epmetuser/epidemicPrevention/info" + async getDetailList() { + const url = "/epmetuser/epidemicPrevention/info"; let params = { - id: this.userId - } + id: this.userId, + }; - const { data, code, msg } = await requestPost(url, params) + const { data, code, msg } = await requestPost(url, params); if (code === 0) { - const { natList, tripList } = data + const { natList, tripList } = data; - this.natList = natList - this.tripList = tripList + this.natList = natList; + this.tripList = tripList; this.natDemand.list = natList.map((item) => { - return [ - { type: "index" }, - item.testTime, - item.address, - item.result, - ]; + return [{ type: "index" }, item.testTime, item.address, item.result]; }); this.natDemand.srcList = natList; @@ -550,14 +581,13 @@ export default { ]; }); this.tripDemand.srcList = tripList; - } else { - this.$message.error(msg) + this.$message.error(msg); } }, //加载组织数据 - async getOptions (url) { + async getOptions(url) { if (!url) return []; const { data, code, msg } = await requestPost(url, {}); @@ -569,7 +599,7 @@ export default { } }, - async getXiaoquList () { + async getXiaoquList() { const url = "/gov/org/icneighborhood/neighborhoodoption"; const { data, code, msg } = await requestPost(url, { @@ -583,7 +613,7 @@ export default { this.$message.error(msg); } }, - async getLouList () { + async getLouList() { const url = "/gov/org/icbuilding/buildingoption"; const { data, code, msg } = await requestPost(url, { @@ -596,7 +626,7 @@ export default { this.$message.error(msg); } }, - async getDanyuanList () { + async getDanyuanList() { const url = "/gov/org/icbuildingunit/unitoption"; const { data, code, msg } = await requestPost(url, { @@ -609,7 +639,7 @@ export default { this.$message.error(msg); } }, - async getHomeList () { + async getHomeList() { const url = "/gov/org/ichouse/houseoption"; const { data, code, msg } = await requestPost(url, { @@ -626,4 +656,8 @@ export default { }; - + From 2d0422ae21e143783f552dbfc7b183d2aef08363 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 26 Apr 2022 15:53:05 +0800 Subject: [PATCH 169/579] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentblacklist-add-or-update.vue | 2 + src/views/modules/plugins/rent/resi.vue | 58 +++++++++++++++++-- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue index 36506da3e..e7047362e 100644 --- a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue @@ -163,6 +163,8 @@ export default { // 表单提交 dataFormSubmitHandle: debounce(function () { this.$refs['dataForm'].validate((valid) => { + console.log(this.dataForm) + return if (!valid) { return false } diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue index e9aa50cdb..c974c2cd9 100644 --- a/src/views/modules/plugins/rent/resi.vue +++ b/src/views/modules/plugins/rent/resi.vue @@ -261,7 +261,16 @@ :userId="lookInfo.userId" :gridName="lookInfo.gridName" @close="handleCancleLook" /> - + + + + 取 消 + 确 定 + +
@@ -333,7 +342,10 @@ export default { lookInfo: { userId: '', gridName: '' - } + }, + blacklistVisible: false, // 加入黑名单 + blacklistReason: '', // 加入黑名单原因 + rowData: {}, // 加入黑名单的人员信息 } }, props: { @@ -376,7 +388,7 @@ export default { this.pageLoading = true this.searchH = this.$refs.resiSearch.$el.offsetHeight console.log('storeoooo----0000', this.$store) - console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight) + // console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight) }, mounted () { @@ -400,7 +412,34 @@ export default { }) }, joinBlacklist (row) { - console.log(row) + this.blacklistVisible = true + this.blacklistReason = '' + this.rowData = { ...row } + }, + confirmJoinBlacklist () { + const params = { + idCard: this.rowData.ID_CARD, + name: this.rowData.NAME, + mobile: this.rowData.MOBILE, + gender: this.rowData.GENDER == '女' ? '0' : this.rowData.GENDER == '男' ? '1' : '', + type: '1', + userid: this.rowData.icResiUserId, + joinReason: this.blacklistReason + } + this.$http.post('/pli/power/rentBlacklist/save', params).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.blacklistVisible = false + this.getTableData() + } + }) + }).catch(() => {}) }, checkSelect (row, index) { @@ -528,7 +567,6 @@ export default { return _val || row[item.columnName] }, handleSearch (val) { - console.log('searchhh--', val) this.currentPage = 1 this.conditions = val this.getTableData() @@ -940,7 +978,6 @@ export default { this.tableHeader.push(item) } }) - console.log('xxxxxxxxxxxxxxx', this.tableHeader) } }) .catch(() => { @@ -1299,4 +1336,13 @@ export default { margin-top: 15px; } } +.blacklist-reason { + width: 100%; + height: 80px; + border: 1px solid #e4e4e4; + border-radius: 4px; + resize: none; + padding: 8px; + box-sizing: border-box; +} From 1204c1bdd67066da3af53e82d5c71d3a19155daa Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Apr 2022 16:05:26 +0800 Subject: [PATCH 170/579] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=96=AB=E8=8B=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequ/cpts/people-more.vue | 300 +++++++++++------- .../visual/basicinfo/cpts/people-more.vue | 55 ++++ 2 files changed, 247 insertions(+), 108 deletions(-) diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index 7425c30a6..46216a559 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -136,86 +136,161 @@
-
- - - - - - - - - - +
+ + + + + + + + + + +
+
+ + + + + + + + + + + + + +
-
- - - - - - - - - - - - - - +
+ + + + + + + + + +
+
+
+ +
+
{ + return [ + { type: "index" }, + item.vaccinateTime, + item.address, + item.manufactor, + ]; + }); + this.vaccineDemand.srcList = vaccineList; } else { this.$message.error(msg); } From 2e36fbb871a8b23917e513d47e3296b2b34d27d5 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 26 Apr 2022 16:25:22 +0800 Subject: [PATCH 171/579] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 387ec8a9e..6ee970efb 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -32,7 +32,7 @@ @@ -83,7 +83,7 @@ @@ -92,8 +92,8 @@ @@ -227,14 +227,24 @@ export default { }, // 审核提交方法 checkHandle: function (type) { + const params = { + id: this.dataForm.id, + state: type + } + this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } this.$message({ - message: type, - type: 'success', - duration: 500, - onClose: () => { - } + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.visible = false + this.$emit('refreshDataList') + } }) - + }).catch(() => {}) }, // 表单提交 dataFormSubmitHandle: debounce(function () { From d78d302741619402873d62d8b6a600672d915a71 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Apr 2022 16:56:32 +0800 Subject: [PATCH 172/579] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=96=AB=E8=8B=97=E4=BF=A1=E6=81=AF2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequ/cpts/people-more.vue | 2 +- src/views/modules/visual/basicinfo/cpts/people-more.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index 46216a559..49d0755de 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -253,7 +253,7 @@ > Date: Tue, 26 Apr 2022 17:05:37 +0800 Subject: [PATCH 173/579] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/view-module.js | 5 ++ .../rent/rentblacklist-add-or-update.vue | 4 +- .../modules/plugins/rent/rentblacklist.vue | 60 +++++++++++++++++-- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js index b139641e7..ebde6a3ee 100644 --- a/src/mixins/view-module.js +++ b/src/mixins/view-module.js @@ -63,6 +63,11 @@ export default { } this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0 + this.dataList.forEach(item => { + if (item.gender) { + item.gender = item.gender == '0' ? '女' : item.gender == '1' ? '男' : item.gender + } + }) }).catch(() => { this.dataListLoading = false }) diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue index e7047362e..7d13084c8 100644 --- a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue @@ -163,12 +163,10 @@ export default { // 表单提交 dataFormSubmitHandle: debounce(function () { this.$refs['dataForm'].validate((valid) => { - console.log(this.dataForm) - return if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentBlacklist/', this.dataForm).then(({ data: res }) => { + this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentBlacklist/save', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue index f62bad8d0..8d0ddabcd 100644 --- a/src/views/modules/plugins/rent/rentblacklist.vue +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -58,8 +58,9 @@ @@ -74,6 +75,16 @@ + + + + 取 消 + 确 定 + +
@@ -94,7 +105,10 @@ export default { timeRange: '', dataForm: { id: '' - } + }, + blacklistVisible: false, // 解除黑名单 + blacklistReason: '', // 解除黑名单原因 + removeId: '', // 解除黑名单的人员信息id } }, watch: { @@ -106,10 +120,48 @@ export default { this.dataForm.startTime = ""; this.dataForm.endTime = ""; } - }, + } }, components: { AddOrUpdate + }, + methods: { + removeBlacklist (id) { + this.blacklistVisible = true + this.blacklistReason = '' + this.removeId = id + }, + confirmRemoveBlacklist () { + const params = { + id: this.removeId, + removeReason: this.blacklistReason + } + this.$http.post('/pli/power/rentBlacklist/update', params).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.blacklistVisible = false + this.getDataList() + } + }) + }).catch(() => {}) + } } } + \ No newline at end of file From 4419da407a271f6095457c68a6a4bc4e02655576 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 26 Apr 2022 17:16:39 +0800 Subject: [PATCH 174/579] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/checkBox.vue | 77 +++++ src/views/components/dragItem.vue | 94 ++++++ src/views/modules/base/diyInfo.vue | 455 +++++++++++++++++++++++++++++ src/views/modules/base/resi.vue | 30 +- 4 files changed, 654 insertions(+), 2 deletions(-) create mode 100644 src/views/components/checkBox.vue create mode 100644 src/views/components/dragItem.vue create mode 100644 src/views/modules/base/diyInfo.vue diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue new file mode 100644 index 000000000..bfd326ca4 --- /dev/null +++ b/src/views/components/checkBox.vue @@ -0,0 +1,77 @@ + + + + + \ No newline at end of file diff --git a/src/views/components/dragItem.vue b/src/views/components/dragItem.vue new file mode 100644 index 000000000..c9268ac94 --- /dev/null +++ b/src/views/components/dragItem.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue new file mode 100644 index 000000000..7f3e86bcc --- /dev/null +++ b/src/views/modules/base/diyInfo.vue @@ -0,0 +1,455 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 5ffed18ab..2e6f90fec 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -63,6 +63,10 @@ class="diy-button--reset" :loading="exportBtn" @click="handleExport">{{exportBtnTitle}} + 自定义导出 + + + Date: Tue, 26 Apr 2022 17:20:48 +0800 Subject: [PATCH 175/579] dd --- src/views/modules/base/diyInfo.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index 7f3e86bcc..2d103fba8 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -257,12 +257,15 @@ export default { }, handlePreview(id) { if (id) this.getPreview(id) - else this.previewList = this.rightList.map(item => { + else { + if (this.rightList.length == 0) return this.$message.error('请选择导出信息') + this.previewList = this.rightList.map(item => { return { label: item.groupName, children: item.queryItemList } }) + } this.diyDialog = true }, handleExport() { From fc966fba14564edf84bbd80660804150ddcc1dfa Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Apr 2022 17:29:03 +0800 Subject: [PATCH 176/579] ss --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbb18e32c..3def21d39 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@riophae/vue-treeselect": "^0.4.0", - "@tinymce/tinymce-vue": "^4.0.4", + "@tinymce/tinymce-vue": "^3.2.8", "axios": "^0.19.0", "babel-eslint": "^8.0.1", "babel-plugin-component": "^1.1.1", From d68d30b492bc529e629ee974689103c95ab2cad4 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 26 Apr 2022 18:44:58 +0800 Subject: [PATCH 177/579] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/assets/boy.png | Bin 0 -> 11553 bytes src/views/modules/plugins/assets/girl.png | Bin 0 -> 15246 bytes .../power/kernelhouseholdAddMember.vue | 136 ++++++++++++++++++ .../plugins/power/kernelhouseholdTable.vue | 55 ++++++- .../plugins/power/poweraxis_add_leader.vue | 11 +- 5 files changed, 194 insertions(+), 8 deletions(-) create mode 100644 src/views/modules/plugins/assets/boy.png create mode 100644 src/views/modules/plugins/assets/girl.png create mode 100644 src/views/modules/plugins/power/kernelhouseholdAddMember.vue diff --git a/src/views/modules/plugins/assets/boy.png b/src/views/modules/plugins/assets/boy.png new file mode 100644 index 0000000000000000000000000000000000000000..c8b11a8f3e117930b9219cd62098ba674ee05b52 GIT binary patch literal 11553 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 MaRsqT5yQa$15r93>;M1& literal 0 HcmV?d00001 diff --git a/src/views/modules/plugins/power/kernelhouseholdAddMember.vue b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue new file mode 100644 index 000000000..5bf7d64dd --- /dev/null +++ b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue @@ -0,0 +1,136 @@ + + + + + + + + diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue index 66ea920f4..557a2f7ee 100644 --- a/src/views/modules/plugins/power/kernelhouseholdTable.vue +++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue @@ -2,7 +2,7 @@
-
房主姓名
+
党员名称
+ + @@ -57,6 +61,10 @@ class="div-table-button--delete" size="small" @click="handleDelete(scope.row.id)">删除 + 添加党员 @@ -86,12 +94,26 @@ :axisStructId="axisStructId"> + + + +
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue index 62fdfc1ff..f8501043a 100644 --- a/src/views/modules/visual/plugin/power/organization.vue +++ b/src/views/modules/visual/plugin/power/organization.vue @@ -129,7 +129,7 @@ export default { return { headerList: [ { title: "序号", coulmn: 'index', width: '100px' }, - { title: "党员", coulmn: 'ownerName' }, + { title: "党员", coulmn: 'kernelMemberNameConcat' }, { title: "地址", coulmn: 'address' } ], headerStyle: [ From e6cb76e34a079986c851efd8660ac32005ef3af3 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 26 Apr 2022 19:05:27 +0800 Subject: [PATCH 179/579] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/power/kernelhouseholdTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue index 557a2f7ee..97a45c1f3 100644 --- a/src/views/modules/plugins/power/kernelhouseholdTable.vue +++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue @@ -64,7 +64,7 @@ 添加党员 + @click="handleAddMember(scope.row.houseId, scope.row.ownerName)">中心党员 From da4e297b950bb389e30afbb4a451e09bf0685f4b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 27 Apr 2022 09:54:35 +0800 Subject: [PATCH 180/579] =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/resi.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue index c974c2cd9..73dbf70f7 100644 --- a/src/views/modules/plugins/rent/resi.vue +++ b/src/views/modules/plugins/rent/resi.vue @@ -423,7 +423,7 @@ export default { mobile: this.rowData.MOBILE, gender: this.rowData.GENDER == '女' ? '0' : this.rowData.GENDER == '男' ? '1' : '', type: '1', - userid: this.rowData.icResiUserId, + userId: this.rowData.icResiUserId, joinReason: this.blacklistReason } this.$http.post('/pli/power/rentBlacklist/save', params).then(({ data: res }) => { From 38c71b81a9d4fc6ed8f3e133dee25687c119011f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 27 Apr 2022 10:11:40 +0800 Subject: [PATCH 181/579] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/checkBox.vue | 1 + src/views/modules/base/diyInfo.vue | 39 ++++++++++++------------ src/views/modules/base/resi.vue | 49 ++++++++++++++++++++++++++++-- 3 files changed, 67 insertions(+), 22 deletions(-) diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue index bfd326ca4..4bab4aea7 100644 --- a/src/views/components/checkBox.vue +++ b/src/views/components/checkBox.vue @@ -41,6 +41,7 @@ export default { }, created() { this.boxList = this.list.filter(item => item.itemType != 'inputRange') + console.log('cehck-bo----', this.list) this.pid = this.list[0].itemGroupId }, methods: { diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index 2d103fba8..b93a49398 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -1,13 +1,13 @@ - + - - - - - + + + + + diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index 59124ad3e..69a454f85 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -147,15 +147,20 @@ {{scope.$index+1}} - + - - - - - + + + + + + - - - + + + + + + diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index e81aee7bb..f245491ca 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -148,9 +148,14 @@ - - - + + + + + + From b425d065d4d0ce68dc6fda242d6373ab9e6f4cf0 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 13:45:56 +0800 Subject: [PATCH 197/579] =?UTF-8?q?=E6=94=B9=E5=8F=98=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo-add-or-update.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index c47d3cb06..7eeec13f2 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -92,8 +92,8 @@ From f6f5065758adfa82a1606ddfd78d70d37d96edf6 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 14:02:57 +0800 Subject: [PATCH 198/579] =?UTF-8?q?=E4=BF=AE=E6=94=B9label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentblacklist.vue | 4 ++-- src/views/modules/plugins/rent/rentcontractinfo.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue index 8d0ddabcd..0a4b7c47a 100644 --- a/src/views/modules/plugins/rent/rentblacklist.vue +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -53,7 +53,7 @@ - + @@ -164,4 +164,4 @@ export default { padding: 8px; box-sizing: border-box; } - \ No newline at end of file + diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 2bb299e95..4ef1cf789 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -171,9 +171,9 @@ - - - + + + From ed809f203f43026973b64970c7bd259660f986e9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 5 May 2022 10:01:58 +0800 Subject: [PATCH 211/579] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/rent/rentdeath-add-or-update.vue | 194 ++++++++++++++++++ src/views/modules/plugins/rent/rentdeath.vue | 82 ++++++++ 2 files changed, 276 insertions(+) create mode 100644 src/views/modules/plugins/rent/rentdeath-add-or-update.vue create mode 100644 src/views/modules/plugins/rent/rentdeath.vue diff --git a/src/views/modules/plugins/rent/rentdeath-add-or-update.vue b/src/views/modules/plugins/rent/rentdeath-add-or-update.vue new file mode 100644 index 000000000..16f0f62da --- /dev/null +++ b/src/views/modules/plugins/rent/rentdeath-add-or-update.vue @@ -0,0 +1,194 @@ + + + diff --git a/src/views/modules/plugins/rent/rentdeath.vue b/src/views/modules/plugins/rent/rentdeath.vue new file mode 100644 index 000000000..4fda37ce6 --- /dev/null +++ b/src/views/modules/plugins/rent/rentdeath.vue @@ -0,0 +1,82 @@ + + + From 18ee97f13184a0d77e85b7f85279bbe5a2772924 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 5 May 2022 10:08:11 +0800 Subject: [PATCH 212/579] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentdeath.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/plugins/rent/rentdeath.vue b/src/views/modules/plugins/rent/rentdeath.vue index 4fda37ce6..01529503e 100644 --- a/src/views/modules/plugins/rent/rentdeath.vue +++ b/src/views/modules/plugins/rent/rentdeath.vue @@ -9,10 +9,10 @@ {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} @@ -37,8 +37,8 @@ From 9690c3be76ed809a238b0de961901e47bf49d03b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 5 May 2022 10:09:39 +0800 Subject: [PATCH 213/579] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentdeath.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentdeath.vue b/src/views/modules/plugins/rent/rentdeath.vue index 01529503e..aaf922e8f 100644 --- a/src/views/modules/plugins/rent/rentdeath.vue +++ b/src/views/modules/plugins/rent/rentdeath.vue @@ -59,7 +59,7 @@ diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index f6437d36f..944306dcf 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -281,21 +281,25 @@ export default { }; }, async mounted () { - this.dataLoading = true + await this.getApiData() - this.dataLoading = false + }, methods: { async getApiData () { + this.dataLoading = true this.housePieInitState = false this.userPieInitState = false this.getHousechart() this.getUserchart() - this.getSubuserhouselist() this.getHousePie() this.getUserPie() + + await this.getSubuserhouselist() + this.dataLoading = false + }, housePieInitOk (dom) { console.log('pie准备好了', dom) @@ -310,7 +314,6 @@ export default { }, - async getHousechart (node, resolve) { if (this.$refs.housePieChart) { this.$refs.housePieChart.showLoading() @@ -567,16 +570,19 @@ export default { // this.getTable() }, - handleToSubAgency (item) { + async handleToSubAgency (item) { + if (!this.dataLoading) { + this.toSubAgency(item) + + await this.getApiData() + } - this.toSubAgency(item) - this.getApiData() }, - //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 + //下钻到下一级 async toSubAgency (item) { this.runNum++ @@ -586,6 +592,7 @@ export default { orgName: this.orgName, } + this.runAgencyArray.push(obj) this.orgId = item.orgId From 4d08abb7b0596b8700339fdda4a00d8614196b49 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 5 May 2022 16:58:43 +0800 Subject: [PATCH 216/579] =?UTF-8?q?=E6=88=BF=E4=B8=9C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/deathSearch.vue | 649 ++++++++ .../modules/plugins/rent/rentblacklist.vue | 39 +- src/views/modules/plugins/rent/rentdeath.vue | 132 +- .../rent/renttenantinfo-add-or-update.vue | 123 +- .../modules/plugins/rent/renttenantinfo.vue | 131 +- src/views/modules/plugins/rent/resideath.vue | 1350 +++++++++++++++++ 6 files changed, 2309 insertions(+), 115 deletions(-) create mode 100644 src/views/components/deathSearch.vue create mode 100644 src/views/modules/plugins/rent/resideath.vue diff --git a/src/views/components/deathSearch.vue b/src/views/components/deathSearch.vue new file mode 100644 index 000000000..1c46b7e93 --- /dev/null +++ b/src/views/components/deathSearch.vue @@ -0,0 +1,649 @@ + + + + + diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue index 3516274b2..5aa2927c0 100644 --- a/src/views/modules/plugins/rent/rentblacklist.vue +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -59,6 +59,7 @@ @@ -85,6 +86,10 @@ 确 定 +
@@ -92,6 +97,8 @@ diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue index 870b11eb7..bfe53ce29 100644 --- a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue @@ -1,47 +1,37 @@ @@ -53,19 +43,17 @@ export default { visible: false, dataForm: { id: '', + flag: '', contractId: '', name: '', idCard: '', mobile: '', yfzgx: '', - img: '', - delFlag: '', - revision: '', - createdBy: '', - createdTime: '', - updatedBy: '', - updatedTime: '' - } + imgList: [], + reason: '' + }, + dialogVisible: false, + dialogImageUrl: '' } }, computed: { @@ -86,25 +74,7 @@ export default { yfzgx: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ], - img: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - delFlag: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - revision: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - createdBy: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - createdTime: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - updatedBy: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - updatedTime: [ + imgList: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] } @@ -120,6 +90,11 @@ export default { } }) }, + // 查看大图 + imgShow(url){ + this.dialogImageUrl = url + this.dialogVisible = true + }, // 获取信息 getInfo () { this.$http.get(`/pli/power/rentTenantInfo/${this.dataForm.id}`).then(({ data: res }) => { @@ -133,12 +108,13 @@ export default { }).catch(() => {}) }, // 表单提交 - dataFormSubmitHandle: debounce(function () { + dataFormSubmitHandle: debounce(function (type) { this.$refs['dataForm'].validate((valid) => { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentTenantInfo/', this.dataForm).then(({ data: res }) => { + this.dataForm.state = type + this.$http.post('/pli/power/rentTenantInfo/landlord/review', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -157,3 +133,14 @@ export default { } } + diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue index e6b11241d..b016004b1 100644 --- a/src/views/modules/plugins/rent/renttenantinfo.vue +++ b/src/views/modules/plugins/rent/renttenantinfo.vue @@ -2,35 +2,49 @@
- - + + - - {{ $t('query') }} + + + + + - {{ $t('add') }} + {{ $t('query') }} + + + - - - + + + + + + - - - - - + + + + + - - @@ -45,6 +59,14 @@ + + + + {{ $t('cancel') }} + {{ $t('checkBTGBtn') }} + {{ $t('checkTGBtn') }} + +
@@ -57,18 +79,85 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/pli/power/rentTenantInfo/page', + getDataListURL: '/pli/power/rentTenantInfo/landlord/page', getDataListIsPage: true, deleteURL: '/pli/power/rentTenantInfo', deleteIsBatch: true }, dataForm: { - id: '' - } + id: '', + name: '', + idCard: '', + mobile: '' + }, + checkVisible: false, + checkForm:{ + id: '', + state: '', + reason: '' + } } }, components: { AddOrUpdate - } + }, + methods: { + // 新增 / 修改 + addOrUpdateHandle (id,flag) { + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.dataForm.id = id + this.$refs.addOrUpdate.dataForm.flag = flag + this.$refs.addOrUpdate.init() + }) + }, + btKeyUpIdCard (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.idCard = e.target.value + }, + btKeyUpMobile (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.mobile = e.target.value + }, + btKeyUpName (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.name = e.target.value + }, + checkHandle(id){ + this.checkForm.id = id + this.checkVisible = true + this.reason = '' + + }, + // 审核提交方法 + checkSubmitHandle: function (type) { + this.checkForm.state = type + this.$http.post('/pli/power/rentTenantInfo/landlord/review', this.checkForm).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.checkVisible = false + this.$emit('refreshDataList') + } + }) + }).catch(() => {}) + } + } } + diff --git a/src/views/modules/plugins/rent/resideath.vue b/src/views/modules/plugins/rent/resideath.vue new file mode 100644 index 000000000..1b8180452 --- /dev/null +++ b/src/views/modules/plugins/rent/resideath.vue @@ -0,0 +1,1350 @@ + + + + + + + From 5e05fa059763332a62905f2b8e6a0e8b7df6c166 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 5 May 2022 17:19:41 +0800 Subject: [PATCH 217/579] =?UTF-8?q?=E6=88=BF=E4=B8=9C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/rent/rentcontractreview.vue | 2 +- .../rent/renttenantinfo-add-or-update.vue | 18 +++++++++--------- .../modules/plugins/rent/renttenantinfo.vue | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index e0826d4a9..d49ad66f0 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -170,7 +170,7 @@ diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue index bfe53ce29..8ea00452e 100644 --- a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue @@ -2,17 +2,17 @@ - + - + - - - - + + + + - + diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue index b016004b1..647d10a9d 100644 --- a/src/views/modules/plugins/rent/renttenantinfo.vue +++ b/src/views/modules/plugins/rent/renttenantinfo.vue @@ -44,6 +44,7 @@ From e54efaf5e635036cb18454f6662b28f66d2ea2d2 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 6 May 2022 09:34:47 +0800 Subject: [PATCH 218/579] dd --- src/views/modules/base/resi.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 19db9ea3a..8c552f2c4 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -3,7 +3,10 @@ + :name="item.itemGroupId"> + Date: Fri, 6 May 2022 09:51:31 +0800 Subject: [PATCH 219/579] dd --- .../modules/visual/basicinfo/peopleList.vue | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue index 1438a50d6..abad7f683 100644 --- a/src/views/modules/visual/basicinfo/peopleList.vue +++ b/src/views/modules/visual/basicinfo/peopleList.vue @@ -10,7 +10,7 @@
-
+
@@ -115,6 +115,7 @@ export default { pageNo: 1, total: 0, orgLevel: 'search', + orgId: '', selUserId: '', //下钻层级记录 runNum: 0, @@ -128,11 +129,18 @@ export default { this.searchName = '' this.tableData = [] const { columnName, label, id, level } = this.$route.query + this.orgLevel = level + this.orgId = id this.searchName = columnName this.tableTitle = label this.loadList(id, level) }, + deactivated() { + this.orgLevel = '' + this.orgId = '' + this.pageNo = 1 + }, beforeRouteEnter(to, from, next) { const arr = [ {...from }, { ...to, meta: { title: '人员列表'}}] next((vm) =>{ @@ -176,24 +184,9 @@ export default { pageCurrentChangeHandle (val) { this.pageNo = val - this.loadList() + this.loadList(this.orgId, this.orgLevel) }, - //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 - async toSubAgency (type, userId) { - - - this.orgLevel = 'people' - this.selUserId = userId - - - }, - - //返回所选组织 - handleClickBack () { - this.orgLevel = 'search' - - }, }, destroyed () { From 0ab539e15bddaf6bae125b951f69c0cdc58b205a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 6 May 2022 11:19:43 +0800 Subject: [PATCH 220/579] =?UTF-8?q?=E7=BB=9F=E4=B8=80css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentblacklist.vue | 65 ++++++++++++++++++- .../modules/plugins/rent/rentcontractfile.vue | 65 ++++++++++++++++++- .../modules/plugins/rent/rentcontractinfo.vue | 65 ++++++++++++++++++- .../plugins/rent/rentcontractreview.vue | 65 ++++++++++++++++++- src/views/modules/plugins/rent/rentdeath.vue | 65 ++++++++++++++++++- .../modules/plugins/rent/renttenantinfo.vue | 65 ++++++++++++++++++- 6 files changed, 372 insertions(+), 18 deletions(-) diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue index 5aa2927c0..6b8f9402a 100644 --- a/src/views/modules/plugins/rent/rentblacklist.vue +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -1,6 +1,7 @@