From 520959daa2576e83917c543d45d103d9ecc62b61 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 1 Jun 2022 11:12:54 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/icpartymemberpayrecorddetail.vue | 2 +- src/views/modules/partymember/icpartyorgtree.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue index dc685a44..e184c20c 100644 --- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue +++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue @@ -56,7 +56,7 @@ - {{ $t('query') }} + {{ $t('query') }} 重置 diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 1e132a6f..1c74a852 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -7,7 +7,7 @@ 删除 + class="btn-color-del">删除 From 71ab8156504104af5f14b6ffb65c136618866307 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 9 Jun 2022 10:43:14 +0800 Subject: [PATCH 02/38] dd --- src/views/components/editResi.vue | 1 + src/views/components/resiForm.vue | 1 + .../communityParty/members/cpts/record.vue | 10 +++--- .../communityParty/members/crateForm.vue | 9 ++--- src/views/modules/shequ/cpts/people-more.vue | 35 +++++++++++-------- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index bcacbaf0..542b5841 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -236,6 +236,7 @@ v-model.trim="form[n.columnName]" :options="n.options" :disabled="disabled" + :props="{ emitPath: false }" clearable size="small" class="resi-cell-select"> diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 7246d608..ec8bea49 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -198,6 +198,7 @@ v-else-if="n.itemType === 'cascader'" v-model.trim="form[n.columnName]" :options="n.options" + :props="{ emitPath: false }" clearable size="small" class="resi-cell-select"> diff --git a/src/views/modules/communityParty/members/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue index cc7d8795..18800117 100644 --- a/src/views/modules/communityParty/members/cpts/record.vue +++ b/src/views/modules/communityParty/members/cpts/record.vue @@ -54,8 +54,8 @@ {{ scope.row.startDate + ' - ' + scope.row.endDate }} - + diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue index e0269b0a..11775d81 100644 --- a/src/views/modules/communityParty/members/crateForm.vue +++ b/src/views/modules/communityParty/members/crateForm.vue @@ -216,11 +216,11 @@ export default { address: '', rdsj: '', sszb: '', - isLd: '', + isLd: '0', ldzh: '', - partyZw: '', - isDyzxh: '', - isMxx: '', + partyZw: '0', + isDyzxh: '0', + isMxx: '0', culture: '', remark: '' }, @@ -239,6 +239,7 @@ export default { handler(val) { if (Object.keys(val).length > 0) { this.form = { ...val } + if (val.icResiUserId) this.isAuto = true console.log('val----------in', val) this.partyOrgs = val.orgPids.split(':') console.log('partyOrgs-----', this.partyOrgs) diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index 49d0755d..4ebad94f 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -484,20 +484,9 @@ export default { if (Array.isArray(options)) { let valueArr = value.split(","); if (type == "cascader") { - if (valueArr.length > 0) { - let level1 = options.find((item) => item.value == valueArr[0]); - if (level1) { - if (valueArr.length > 1 && level1.children) { - let level2 = level1.children.find( - (item) => item.value == valueArr[1] - ); - if (level2) { - return level1.label + "-" + level2.label; - } - } - return level1.label; - } - } + let finalValue = []; + this.getNodePath(options, value, finalValue); + return finalValue.join("-"); } else { return valueArr .map((val) => { @@ -513,6 +502,24 @@ export default { return "--"; }, + getNodePath(node, val, path) { // node:所有数据，val:后台返回的id, path:要渲染的数组id + for (let i = 0; i < node.length; i++) { + const ele = node[i]; + if (ele.value === val) { + path.push(ele.label); + return path + } else if (ele.children && ele.children.length > 0) { + if (ele.children.some(row => row.value === val)) { + path.unshift(ele.label); + this.getNodePath(ele.children,val,path); + } else { + this.getNodePath(ele.children,val,path); + } + } + } + return path; + }, + //加载组织数据 async getField() { const url = "/oper/customize/icform/getcustomerform"; From ff2605011cc80b717e262a6de74a315bfff78f42 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 9 Jun 2022 13:53:29 +0800 Subject: [PATCH 03/38] dd --- src/views/components/resiForm.vue | 2 ++ src/views/modules/visual/communityParty/options.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index ec8bea49..5c5f6680 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -682,6 +682,8 @@ export default { console.log('获取查询详情成功', res.data) if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1' else this.form.IS_VOLUNTEER = '0' + if (res.data.isPartyMember == '1') this.form.IS_PARTY = '1' + else this.form.IS_PARTY = '0' } }) .catch(() => { diff --git a/src/views/modules/visual/communityParty/options.js b/src/views/modules/visual/communityParty/options.js index ba0ddd33..a22fd586 100644 --- a/src/views/modules/visual/communityParty/options.js +++ b/src/views/modules/visual/communityParty/options.js @@ -88,7 +88,7 @@ export function pieOption (_charts) { // formatter: '{a|{c}}\n\n{name|{b}}', formatter: '{a|{c}}\n{r|}\n{name|{b}}', minMargin: 5, - edgeDistance: 1, + edgeDistance: '10%', lineHeight: 15, color: '#fff', fontSize: 12, From 31b81f15d29da8a6f86a0303a58c3e01308f3022 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 9 Jun 2022 14:27:12 +0800 Subject: [PATCH 04/38] bug --- .../icpartymemberpayrecorddetail.vue | 19 +++- .../modules/partymember/icpartyorgtree.vue | 2 +- src/views/modules/partymember/lookMember.vue | 100 ++++++++++++++++-- .../visual/communityParty/gridParty.vue | 6 +- .../visual/components/screen-map/index.vue | 8 +- 5 files changed, 117 insertions(+), 18 deletions(-) diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue index e184c20c..6ac74f3d 100644 --- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue +++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue @@ -73,7 +73,7 @@
{{ $t('export') }}
- +