From 9c5dcc212571717a1695bc116b5af9484c3fbb3a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 29 Aug 2022 10:16:32 +0800 Subject: [PATCH 1/7] emm --- .../modules/communityParty/stas/index.vue | 339 ++++++++++++++++++ 1 file changed, 339 insertions(+) create mode 100644 src/views/modules/communityParty/stas/index.vue diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue new file mode 100644 index 000000000..0f2842adb --- /dev/null +++ b/src/views/modules/communityParty/stas/index.vue @@ -0,0 +1,339 @@ + + + + From 3fe6cc06ddd70648a708dc48956544c2438bd693 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 29 Aug 2022 16:03:29 +0800 Subject: [PATCH 2/7] emm --- .../modules/communityParty/stas/index.vue | 597 +++++++++--------- 1 file changed, 306 insertions(+), 291 deletions(-) diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue index 0f2842adb..f6d3b989f 100644 --- a/src/views/modules/communityParty/stas/index.vue +++ b/src/views/modules/communityParty/stas/index.vue @@ -1,235 +1,180 @@ - From 0784911c73ee6c844ef9591f6376ea6a538e6551 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 29 Aug 2022 16:30:27 +0800 Subject: [PATCH 3/7] emm --- .../modules/communityParty/stas/index.vue | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue index f6d3b989f..45042991e 100644 --- a/src/views/modules/communityParty/stas/index.vue +++ b/src/views/modules/communityParty/stas/index.vue @@ -13,7 +13,12 @@ size="small" :options="orgList" placeholder="请选择党组织" - :props="partyProps" + :props="{ + checkStrictly: true, + label: 'partyOrgName', + value: 'id', + children: 'children' + }" @change="handleChangeOrg" clearable/> @@ -123,7 +128,6 @@ export default { }, tableData: [], orgList: [], - allOrgList: [], serviceTimeArea: '', partyOrg: { partyOrgType: '', @@ -131,12 +135,7 @@ export default { }, joinOrgIds: [], tableLoading: false, - partyProps: { - label: 'partyOrgName', - value: 'id', - checkStrictly: true, - joinOrgType: 'partyOrgType' - } + agencyId: '' } }, components: { @@ -148,7 +147,7 @@ export default { async mounted () { const { user } = this.$store.state this.agencyId = user.agencyId - this.handleSearch() + await this.handleSearch() }, methods: { @@ -158,7 +157,6 @@ export default { handleChangeOrg () { if (this.joinOrgIds.length > 0 && this.joinOrgIds) { this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1] - } else { this.form.joinOrgId = '' } @@ -171,10 +169,10 @@ export default { .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) + }else { + this.orgList = this.deepArrTOnull(res.data) } - this.orgList = this.deepArrTOnull(res.data) - }) - .catch(() => {}) + }).catch(() => {return this.$message.error("网络错误");}) }, deepArrTOnull(arr) { let a = [] @@ -184,7 +182,6 @@ export default { children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null } }) - this.allOrgList = a return a }, async loadTable () { @@ -199,10 +196,8 @@ export default { if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){ let a = this.orgList[0] this.form.joinOrgId = a.id; - this.form.joinOrgType = a.partyOrgType; }else { - this.form.joinOrgId = this.partyProps.value; - this.form.joinOrgType = this.partyProps.joinOrgType; + this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1]; } console.log('start') const url = "/resi/partymember/icPartyAct/patryactstatis" From 02b8925ab38a90c1101382581d7304a593fbb1fd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 29 Aug 2022 16:40:28 +0800 Subject: [PATCH 4/7] emm --- src/views/modules/communityParty/stas/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue index 45042991e..6f2cf1861 100644 --- a/src/views/modules/communityParty/stas/index.vue +++ b/src/views/modules/communityParty/stas/index.vue @@ -142,12 +142,13 @@ export default { }, async created () { - this.getOrgList() + await this.getOrgList() + await this.handleSearch() }, async mounted () { const { user } = this.$store.state this.agencyId = user.agencyId - await this.handleSearch() + }, methods: { @@ -193,9 +194,12 @@ export default { this.form.startTime = ''; this.form.endTime = ''; } + if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){ + console.log(this.orgList) let a = this.orgList[0] this.form.joinOrgId = a.id; + this.joinOrgIds = this.form.joinOrgId }else { this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1]; } From 30810691be839c4b4933ecde1b772e702f9c65eb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 29 Aug 2022 16:51:03 +0800 Subject: [PATCH 5/7] emm --- src/views/modules/communityParty/stas/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue index 6f2cf1861..827dd7494 100644 --- a/src/views/modules/communityParty/stas/index.vue +++ b/src/views/modules/communityParty/stas/index.vue @@ -196,14 +196,14 @@ export default { } if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){ - console.log(this.orgList) let a = this.orgList[0] this.form.joinOrgId = a.id; this.joinOrgIds = this.form.joinOrgId }else { - this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1]; + if (Array.isArray(this.joinOrgIds)){ + this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1]; + } } - console.log('start') const url = "/resi/partymember/icPartyAct/patryactstatis" // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/patryactstatis" let params = { From 8a0c3e8a0500f6bbd780c7eb5aa67ef28cef003c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 30 Aug 2022 14:41:12 +0800 Subject: [PATCH 6/7] yangshi --- src/views/modules/communityParty/stas/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue index 827dd7494..515af7aca 100644 --- a/src/views/modules/communityParty/stas/index.vue +++ b/src/views/modules/communityParty/stas/index.vue @@ -83,14 +83,14 @@ show-overflow-tooltip align="center" label="党小组会(次)" - width="80"> + mix-width="80"> + mix-width="80"> Date: Fri, 2 Sep 2022 13:37:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/stas/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue index 515af7aca..b063e674b 100644 --- a/src/views/modules/communityParty/stas/index.vue +++ b/src/views/modules/communityParty/stas/index.vue @@ -41,11 +41,17 @@ 导出报表 + @click="resetSearch">重置
+
+ 导出 +