From 14bddbc942195886a7a8895d530a3bc8c733ca68 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 10:37:11 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/partymember/icpartyorg-add-or-update.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index aaa091841..bfa352579 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -42,6 +42,7 @@ placeholder="请选择上级党组织" :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }" @change="handleChangeOrg" + :disabled="dataForm.id ? true : false" clearable /> From 6cdaa085171aec80163392b09703420e550a3026 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 11:19:01 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/icpartyorg-add-or-update.vue | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index bfa352579..d141b251b 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -48,7 +48,7 @@ -
@@ -71,7 +71,7 @@
- @@ -309,7 +309,7 @@ document.getElementById('app').innerHTML = '' if (document.getElementById('app')) { document.getElementById('mapSeach_id').style.display = "block" - document.getElementById('lon_lat_id').style.display = "block" + // document.getElementById('lon_lat_id').style.display = "block" } // 定义地图中心点坐标 @@ -417,6 +417,9 @@ }, // 表单提交 dataFormSubmitHandle: debounce(function () { + if (!this.dataForm.latitude || !this.dataForm.longitude) { + return this.$message.error('请滑动地图选择党组织位置') + } this.$refs['dataForm'].validate((valid) => { if (!valid) { return false @@ -451,13 +454,6 @@ partyOrgType: [ {required: true, message: this.$t('validate.required'), trigger: 'blur'} ], - - longitude: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} - ], - latitude: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} - ], agencyId: [ {required: true, message: this.$t('validate.required'), trigger: 'blur'} ] From 6033ad86e71c112782fe807f944241bbbdee28c8 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 25 May 2022 15:03:58 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=9B=BE=E8=A1=A8=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/measure/hong@2x.png | Bin 0 -> 15549 bytes src/assets/scss/modules/visual/houseStatic.scss | 10 +++++----- .../basicinfo/houseStatic/houseStatic.vue | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 src/assets/img/shuju/measure/hong@2x.png diff --git a/src/assets/img/shuju/measure/hong@2x.png b/src/assets/img/shuju/measure/hong@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..15a9496882425f646fb250eec014658011436361 GIT binary patch literal 15549 zcmeI3Yj6|S701_*5b&cVyvqc4BXGtIS?#VKM%u{2)HboHMT`-~PN$AnyDMwQl2+EP zvA~2^GH#vbjbR9(ahR5n78??G8cImxG^F6Pj+0EA6zJfXHj@GqFeM?AjMLJ)k}S#B z@*U44oqoBR(c|3zJ?HHG-E*$?%eGgpz9%PhVJ1NkIpt*~Rp46$@9gQ*z-LG40s(x@ z2$j{U1d%mce`gST_bng@`(@c(qt&=7I6(;*c~S95#z-IpW)p;Cc_hROjgm%sqy{-y zXc#`;YanH@(6HX>VqBqO$tRa>3QKD@t#%8W8U?#(SnkYpL^u#2AZa`q3HXC57b!GE z<8t7)K1>_P=oGE7(6B;JNY=P2$zmlekyc{?C9q~2xy){4t#+Hqau;c0*aDid)2xMJ zSdOuC3`@pe24^Ptc*hPN2s8>I2L3yPKl%nVL7D9N|4m!@*bsGD>NANM2S~?U4c*{QBaMu0~F~9AEH?! zL#J~Rg@jM2IqZ*KnkdkcUkXS;O$B~zTECD_(G=CEOpr1mPna0&iOZG9o%VVIfwZYr zt#kuG5J#HUQ+00)NpzK@D$QX*D%}88^Xo+w0@E7g5m=n_R}*1H9SjvXwb zB7pG8%kuJq)x;LCl<4tVDVCK4is#K1%5LGkV!<+-Rj{+8iBf`%OLT8o2In5{Pnn~y zMFhzNkC~BJmI2X46J=v89*Vbs6lM!pl83dMZLDQ9MVc_qkA9K8*pKVS-Zx2ay&|^lEmzD60yUF9X zb8-k`@l)I<&e7tNf~fY2g^JFaIEbovwH7`st!MxhGMUbgMIGw~hj-BWe}P~AA8drm zZ}@uKFuAV!n%j_iLjC`?Az8(Oj}JCTqLUsi;L(A}?Obd>$9C3ew~p^bhyLfpfi4CW z#YejboF3!Gl9^-kYxHjPH%I3$Gcn*rv-)S;HC2XPYtgQ$GVGf4To;rzrzxHd8cy-j z|3PEN`&w|bCpinORg#zw(iAGqP96L*~B`ZIBieUm?uEBYp*La}fX2ngE5xX^qc72|?{piPVm z%?DC3E(i$P#JJFWAQj_+fS^r`3(W^oF)j!Q+Qhifd>|F$f`Fh+j0?>NQZX(F2-?KB z(0m{j|F$f`Fh+j0?>NQZX(F2-?KB(0m{jfbWY0(aaFUrFw$k_7KE;<*EDsu#zCAtST>A;f|c`T7UfT z`$gHe-9Mu}bK%~_tM1#fZ6tT#+DCQ&8q9qyf9vx*UpQ6sVdpHSE+gVBV){!n9=^Qm`ad0ajNE=}=9HHQ zu8W)Ljv>=K(syT{srb)K;j-v8{Q9wj+Z1ymCv%0pZbs3sq;7Uo0i*jLpaD-`{yuRF~!*dTvqKrJHa2cwNg&S=IiW(4mTV zcjXXso_L2C%HE z{-$VfR=xkdR{w8bc%`@M(VQ#8?X$Yq_&4-c80SsvYs)!(;mDug+fZ#FJBe2pb@;M& ze^|RUk9a0hyylf3{H@J=X2~s0Kl856FX}m2f8)T_l~*$RW^YrnzPi!7YJUIS_l0VY zWEB4Cr0M6^mYnGM{p+VA_fGp@&V^qN-kR~{^r3U52hNsCjctE_+qQS8qCF>DzWi*& z{mGGh<67_T>=&PG`s1(e9R4C}=G3d|_O{6F2M<5geDRR!PG!#e-?i>>R6lTaUM_dR z@t3?4p4naYn^f=9yQW;rczxs!(tN)Bhc7;{YtMspan{ @@ -299,21 +299,21 @@ font-size: 35px; font-family: PingFang SC; font-weight: bold; - color: #FAC126; + color: #3dda83; } .cz{ font-size: 35px; font-family: PingFang SC; font-weight: bold; - color: #45D97F; + color: #e43c26; } .xz{ font-size: 35px; font-family: PingFang SC; font-weight: bold; - color: #2865FA; + color: #fac126; } .colorwhite{ diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index 25c1f970d..893f8c5bb 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -233,21 +233,21 @@ export default { xzHouseTotal: 200,//房屋闲置总数 xzHouseRatio: '70%',//房屋闲置总数占比（保留两位小数，带百分号的） }, - houseColorArray: ['#FAC126', '#3DDA83', '#2865FA'], + houseColorArray: ['#3dda83', '#e43c26', '#fac126'], housePieData: [], legendArray: [ { name: '自住房屋数', - url: require('../../../../../assets/img/shuju/measure/huang@2x.png') + url: require('../../../../../assets/img/shuju/measure/lv@2x.png') }, { name: '出租房屋数', - url: require('../../../../../assets/img/shuju/measure/lv@2x.png') + url: require('../../../../../assets/img/shuju/measure/hong@2x.png') }, { name: '闲置房屋数', - url: require('../../../../../assets/img/shuju/measure/lan@2x.png') + url: require('../../../../../assets/img/shuju/measure/huang@2x.png') } ], @@ -265,7 +265,7 @@ export default { ldUserRatio: '5%',//流动居民总数占比 }, - userColorArray: ['#ff7800', '#00E5ED'], + userColorArray: ['#3dda83', '#e43c26'], userPieData: [], subList: [], From 9d0dc2ad6e4d8a933b20d5374a8a0862121b4d4f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 25 May 2022 15:51:19 +0800 Subject: [PATCH 04/19] dd --- src/views/modules/communityParty/members/cpts/record.vue | 6 ++---- src/views/modules/communityParty/members/index.vue | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/modules/communityParty/members/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue index bfc176bd1..4236f0e88 100644 --- a/src/views/modules/communityParty/members/cpts/record.vue +++ b/src/views/modules/communityParty/members/cpts/record.vue @@ -80,7 +80,7 @@ class="btn-color-edit" >取消 - + --> diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue index b0ce18dc8..eb49b55fc 100644 --- a/src/views/modules/communityParty/members/index.vue +++ b/src/views/modules/communityParty/members/index.vue @@ -490,7 +490,7 @@ export default { } }, - handleTimeChangePay (timvale) { + handleTimeChangePay (val) { if (val.length > 0) { this.searchForm.payStatrDate = val[0] this.searchForm.payEndDate = val[0] From 7c96a8692cba557c0387b1f2768a1cc856d27bb9 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 16:29:45 +0800 Subject: [PATCH 05/19] bug --- .../partymember/icpartyorg-add-or-update.vue | 20 +++---- .../modules/partymember/icpartyorgtree.vue | 10 ++-- src/views/modules/partymember/lookMember.vue | 53 ++++++++++++++++--- 3 files changed, 62 insertions(+), 21 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index d141b251b..a36f8633c 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -160,8 +160,8 @@ this.getInfo() } else { this.initMap() - if(this.dataForm.orgPids) { - this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':') + if(this.dataForm.id) { + this.dataForm.mySelectOrg = this.dataForm.id } else { this.dataForm.mySelectOrg = '' } @@ -221,7 +221,7 @@ } this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } this.agencyOrgList = this.removeEmptyChildren(res.data) }).catch(() => {}) @@ -230,8 +230,8 @@ getOrgList() { return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) - } + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') + } this.orgList = this.removeEmptyChildren(res.data) this.orgList.unshift({ partyOrgName: '一级组织', @@ -269,14 +269,16 @@ getInfo() { this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } this.dataForm = { ...this.dataForm, ...res.data } // 党组织组织 - this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':') + this.dataForm.mySelectOrg = this.dataForm.id + // this.dataForm.mySelectOrg.push(this.dataForm.id) + console.log(JSON.stringify(this.dataForm.mySelectOrg)) // 行政组织 this.dataForm.agencyId = this.dataForm.agencyId this.initMap() @@ -293,7 +295,7 @@ orgType:this.dataForm.partyOrgType} }).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } this.agencyOrgList = res.data }).catch(() => { @@ -426,7 +428,7 @@ } this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } this.$message({ message: this.$t('prompt.success'), diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index ea30b4400..3a62fb75f 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -19,7 +19,7 @@ \ No newline at end of file + @import "@/assets/scss/modules/visual/communityManageForm.scss"; + diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index a866b6f3c..9231cb35b 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -188,633 +188,647 @@ From 10a1c7905279b0b517fb3105d6568902ae209977 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 16:42:49 +0800 Subject: [PATCH 07/19] bug --- .../modules/partymember/icpartyorg-add-or-update.vue | 8 ++++---- src/views/modules/partymember/icpartyorgtree.vue | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index a36f8633c..127119b3b 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -42,7 +42,7 @@ placeholder="请选择上级党组织" :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }" @change="handleChangeOrg" - :disabled="dataForm.id ? true : false" + :disabled="dataForm.id || dataForm.orgId ? true : false" clearable /> @@ -124,7 +124,7 @@ latitude: '', //纬度 address: '', introduction: '', // 党组织介绍 - + orgId: '', customerId: '', staffId:'', orgPidName: '', @@ -160,8 +160,8 @@ this.getInfo() } else { this.initMap() - if(this.dataForm.id) { - this.dataForm.mySelectOrg = this.dataForm.id + if(this.dataForm.orgId) { + this.dataForm.mySelectOrg = this.dataForm.orgId } else { this.dataForm.mySelectOrg = '' } diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 3a62fb75f..0d6802876 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -24,7 +24,7 @@ size="small" class="div-table-button--detail">{{'查看党员'}} 新增下级 @@ -106,12 +106,12 @@ this.tableLoading = false }, // 新增 / 修改 - addOrUpdateHandle (id, orgPids) { + addOrUpdateHandle (id, orgId) { this.addOrUpdateVisible = true this.$nextTick(() => { this.$refs.addOrUpdate.dataForm.id = id // 新增下级需要传 - this.$refs.addOrUpdate.dataForm.orgPids = orgPids // 党组织 + this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织 this.$refs.addOrUpdate.init() }) From 41ee42f81c4158f7738d5be62565b1386ca92f10 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 17:11:26 +0800 Subject: [PATCH 08/19] bug --- .../modules/partymember/icpartyorg-add-or-update.vue | 11 ++++------- src/views/modules/partymember/icpartyorgtree.vue | 7 ++++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 127119b3b..ffa947d1d 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -162,11 +162,13 @@ this.initMap() if(this.dataForm.orgId) { this.dataForm.mySelectOrg = this.dataForm.orgId + this.dataForm.orgPid = this.dataForm.orgId + this.dataForm.orgPids = this.dataForm.orgPids + ':' + this.dataForm.orgId + console.log(this.dataForm.orgPid) + console.log(this.dataForm.orgPids) } else { this.dataForm.mySelectOrg = '' } - - this.orgListTreeSetDefaultHandle() } }) }) @@ -301,11 +303,6 @@ }).catch(() => { }) }, - // 上级党组织树, 设置默认值 - orgListTreeSetDefaultHandle() { - this.dataForm.orgPid = '0' - this.dataForm.orgPidName = '一级组织' - }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap () { document.getElementById('app').innerHTML = '' diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 0d6802876..5b44d05c8 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -23,8 +23,8 @@ type="text" size="small" class="div-table-button--detail">{{'查看党员'}} - 新增下级 @@ -106,12 +106,13 @@ this.tableLoading = false }, // 新增 / 修改 - addOrUpdateHandle (id, orgId) { + addOrUpdateHandle (id, orgId, orgPids) { this.addOrUpdateVisible = true this.$nextTick(() => { this.$refs.addOrUpdate.dataForm.id = id // 新增下级需要传 this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织 + this.$refs.addOrUpdate.dataForm.orgPids = orgPids this.$refs.addOrUpdate.init() }) From ea5759324ad60aaa70ab122215f37cf52c3e8bdf Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 25 May 2022 17:12:41 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E7=94=A8=E9=80=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/community.vue | 6 ++++++ src/views/modules/base/community/roomTable.vue | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index fe7977bdc..c1c0e0c58 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -120,6 +120,8 @@ :ownerName="ownerName" :ownerPhone="ownerPhone" :rentFlag="rentFlag" + :purpose="purpose" + :remark="remark" @toNextLevel="toNextLevel" @refreshTree="refreshTree"> @@ -129,6 +131,8 @@ :ownerName="ownerName" :ownerPhone="ownerPhone" :rentFlag="rentFlag" + :purpose="purpose" + :remark="remark" ref="ref_buildingTable" @refreshTree="refreshTree"> @@ -138,6 +142,8 @@ :ownerName="ownerName" :ownerPhone="ownerPhone" :rentFlag="rentFlag" + :purpose="purpose" + :remark="remark" ref="ref_communityTable" @refreshTree="refreshTree"> diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 9231cb35b..daea171b1 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -622,9 +622,9 @@ gridId: '', ownerName: this.ownerName, ownerPhone: this.ownerPhone, + rentFlag: this.rentFlag, purpose: this.purpose, remark: this.remark, - rentFlag: this.rentFlag, buildingId: '', neighborHoodId: '' } From 2402754a4e093a891734f259a05739e970bda10f Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 17:40:09 +0800 Subject: [PATCH 10/19] bug --- src/views/modules/partymember/icpartyorg-add-or-update.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index ffa947d1d..2d1505f57 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -278,9 +278,7 @@ ...res.data } // 党组织组织 - this.dataForm.mySelectOrg = this.dataForm.id - // this.dataForm.mySelectOrg.push(this.dataForm.id) - console.log(JSON.stringify(this.dataForm.mySelectOrg)) + this.dataForm.mySelectOrg = this.dataForm.orgPid // 行政组织 this.dataForm.agencyId = this.dataForm.agencyId this.initMap() From 020deffb8a611728e81ececf151d343fe823a8b3 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 26 May 2022 10:14:16 +0800 Subject: [PATCH 11/19] basicInfoCommunity --- src/views/modules/visual/basicinfo/basicInfoCommunity.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index 34b08a885..e28220ff8 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -46,7 +46,7 @@
-
{{item.rentFlag}}
+
{{item.rentFlag}}
@@ -163,9 +163,6 @@ export default { runNum: 0, runAgencyArray: [], - - - } }, async mounted () { From 42b895c733be30a333838e72e52107d9979310fb Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 26 May 2022 14:16:05 +0800 Subject: [PATCH 12/19] dd --- src/views/modules/visual/communityParty/community.vue | 2 +- src/views/modules/visual/communityParty/memberInfo.vue | 1 + src/views/modules/visual/communityParty/unitInfo.vue | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 73af5c970..3194f8ee1 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -1255,7 +1255,7 @@ export default { } } .table-h { - height: 360px; + height: 320px; } .calc-h { height: calc(100vh - 240px); diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue index 55041b781..ed06439a8 100644 --- a/src/views/modules/visual/communityParty/memberInfo.vue +++ b/src/views/modules/visual/communityParty/memberInfo.vue @@ -228,6 +228,7 @@ export default { overflow: auto; .left-item { padding: 10px 0; + border-right: 1px dashed #1257c9; cursor: pointer; .item-title { font-size: 16px; diff --git a/src/views/modules/visual/communityParty/unitInfo.vue b/src/views/modules/visual/communityParty/unitInfo.vue index 75ff68ca8..8ee4c9ea3 100644 --- a/src/views/modules/visual/communityParty/unitInfo.vue +++ b/src/views/modules/visual/communityParty/unitInfo.vue @@ -234,6 +234,7 @@ export default { overflow: auto; .left-item { padding: 10px 0; + border-bottom: 1px dashed #1257c9; cursor: pointer; .item-title { font-size: 16px; From df0d640319ee6dd7e952427f458b50a1fc42a26e Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 26 May 2022 14:23:28 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 60 +++++++++++++------ 1 file changed, 41 insertions(+), 19 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 8175db9b2..bed59ac9a 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -1,21 +1,21 @@ @@ -745,6 +746,12 @@ const vueGis = { //把 overlay 显示到指定的 x,y坐标 }, + // 关闭弹窗 + handleClosePopup() { + this.overlay.setPosition(undefined); + document.getElementById("popup-closer").blur(); + return false; + }, //取随机数 getRndBetween (lowerLimit, upperLimit) { @@ -888,6 +895,9 @@ export default vueGis; .popup-content { width: 300px; } +.popup-goMore{ + margin: 20px 0; +} .ol-popup-closer:after { content: "✖"; // color: rgba(1, 17, 104, 1); From dc198c233d875f7b495831aa914ed751cb8a31a1 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 26 May 2022 17:23:02 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/icpartyorg-add-or-update.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 2d1505f57..20aa0eb89 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -443,16 +443,16 @@ dataRule() { return { partyOrgName: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: "党组织名称不能为空", trigger: 'blur'} ], mySelectOrg: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: "上级党组织不能为空", trigger: 'blur'} ], partyOrgType: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: "党组织类型不能为空", trigger: 'blur'} ], agencyId: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} + {required: true, message: "行政组织不能为空", trigger: 'blur'} ] } } From dd266a5555c4a65a799d361843b860f20992de48 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 26 May 2022 17:33:56 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/partymember/lookMember.vue | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue index 974e8dc1a..4d2197a8f 100644 --- a/src/views/modules/partymember/lookMember.vue +++ b/src/views/modules/partymember/lookMember.vue @@ -6,7 +6,6 @@ - Date: Thu, 26 May 2022 18:09:12 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/partymember/icpartyorg-add-or-update.vue | 5 +++-- src/views/modules/partymember/icpartyorgtree.vue | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 20aa0eb89..b530b4553 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -128,7 +128,8 @@ customerId: '', staffId:'', orgPidName: '', - agencyName:'' + agencyName:'', + pid: '' }, orgListVisible: false, agencyListVisible:false, @@ -230,7 +231,7 @@ }, // 获取党组织列表 getOrgList() { - return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => { + return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId, orgPid: this.dataForm.id ? this.dataForm.pid : ''}}).then(({data: res}) => { if (res.code !== 0) { return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 5b44d05c8..1e132a6fa 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -29,7 +29,7 @@ size="small" class="div-table-button--add">新增下级 修改 @@ -106,13 +106,15 @@ this.tableLoading = false }, // 新增 / 修改 - addOrUpdateHandle (id, orgId, orgPids) { + addOrUpdateHandle (id, orgId, orgPids, pid) { + console.log('pid:::::', pid) this.addOrUpdateVisible = true this.$nextTick(() => { this.$refs.addOrUpdate.dataForm.id = id // 新增下级需要传 this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织 this.$refs.addOrUpdate.dataForm.orgPids = orgPids + this.$refs.addOrUpdate.dataForm.pid = pid this.$refs.addOrUpdate.init() })