From ab4ad940a5e0477c5419d1a63b9e8af9c44e3cf6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 18 Aug 2022 16:36:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regionalParty/activitysForm.vue | 53 +++++++++---------- .../communityParty/regionalParty/units.vue | 19 +++---- .../regionalParty/unitsDetail.vue | 3 +- .../regionalParty/unitsForm.vue | 31 ++++++----- 4 files changed, 55 insertions(+), 51 deletions(-) diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 94ce4234b..a45a5b80b 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -234,6 +234,22 @@ var geocoder // 新建一个正逆地址解析类 let loading // 加载动画 export default { data () { + let initFormData = () => { + let _form = { + unitName: '', + serviceMatterList: [], + type: '', + contact: '', + contactMobile: '', + memberCount: 0, + remark: '', //备注【最大500字】 + address: '', //详细地址 + longitude: this.$store.state.user.longitude, //经度 + latitude: this.$store.state.user.latitude//纬度 + } + + return _form + } return { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 @@ -241,22 +257,7 @@ export default { keyWords: '', activityId: '', - formData: { - gridId: '', - serviceMatter: '',//服务事项 - serviceMatterList: [], - unitId: '',//单位ID - unitIdList: [], - title: '',//活动标题 - target: '',//活动目标 - content: '',//活动内容 - activityTime: '',//活动时间 - peopleCount: 0,//服务人数 - result: '', //活动结果 - address: '', //详细地址 - longitude: 120.38945519, //经度 - latitude: 36.0722275 //纬度 - }, + formData: initFormData(), serviceList: [], // gridList: [], agencyId: '' @@ -527,20 +528,16 @@ export default { this.activityId = '' this.keyWords = '' this.formData = { - gridId: '', - serviceMatter: '',//服务事项 + unitName: '', serviceMatterList: [], - unitId: '',//单位ID - unitIdList: [], - title: '',//活动标题 - target: '',//活动目标 - content: '',//活动内容 - activityTime: '',//活动时间 - peopleCount: 0,//服务人数 - result: '', //活动结果 + type: '', + contact: '', + contactMobile: '', + memberCount: 0, + remark: '', //备注【最大500字】 address: '', //详细地址 - longitude: 36.0722275, //经度 - latitude: 120.38945519 //纬度 + longitude: this.$store.state.user.longitude, //经度 + latitude: this.$store.state.user.latitude//纬度 } }, // 开启加载动画 diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 0feb07c8b..23db7d00e 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -477,9 +477,10 @@ export default { }, handleDetail (row) { - this.detailShow = true + this.formTitle = '详情' + this.formShow = true this.$nextTick(() => { - this.$refs.ref_detail.initForm(row) + this.$refs.ref_form.initForm('detail', row.id) }) }, @@ -501,7 +502,7 @@ export default { handleAdd () { this.formTitle = '新增' - this.formShow = 'edit' + this.formShow = true this.$nextTick(() => { this.$refs.ref_form.initForm('add', null) }) @@ -574,12 +575,12 @@ export default { if (code === 0) { if (data.type) { - this.$message({ - type: "success", - message: data.msg || "同步成功" - }); - - this.loadTable() + this.$message({ + type: "success", + message: data.msg || "同步成功" + }); + + this.loadTable() } else { this.$message.error(data.msg) } diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue index 306fc3f83..b9f18486b 100644 --- a/src/views/modules/communityParty/regionalParty/unitsDetail.vue +++ b/src/views/modules/communityParty/regionalParty/unitsDetail.vue @@ -106,7 +106,7 @@ export default { } }, components: {}, - mounted () { + created () { this.initMap() }, @@ -118,6 +118,7 @@ export default { }, async initForm (row) { + this.startLoading() this.formData = { ...row } map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue index 06b5eece2..f6de440b1 100644 --- a/src/views/modules/communityParty/regionalParty/unitsForm.vue +++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue @@ -173,14 +173,8 @@ var geocoder // 新建一个正逆地址解析类 let loading // 加载动画 export default { data () { - return { - formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 - - btnDisable: false, - - unitId: '', - keyWords: '', - formData: { + let initFormData = () => { + let _form = { unitName: '', serviceMatterList: [], type: '', @@ -189,9 +183,20 @@ export default { memberCount: 0, remark: '', //备注【最大500字】 address: '', //详细地址 - longitude: 120.38945519, //经度 - latitude: 36.0722275//纬度 - }, + longitude: this.$store.state.user.longitude, //经度 + latitude: this.$store.state.user.latitude//纬度 + } + + return _form + } + return { + formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 + + btnDisable: false, + + unitId: '', + keyWords: '', + formData: initFormData(), serviceList: [],//服务list } @@ -462,8 +467,8 @@ export default { memberCount: 0, remark: '', //备注【最大500字】 address: '', //详细地址 - longitude: '', //经度 - latitude: '' //纬度 + longitude: this.$store.state.user.longitude, //经度 + latitude: this.$store.state.user.latitude//纬度 } }, // 开启加载动画