From 875ce4f433ceaea6b04fcbf7f87d02ee4dc3e331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Thu, 10 Oct 2024 17:35:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8C=82=E9=9D=A0=E9=98=B5=E5=9C=B0?= =?UTF-8?q?=E5=B8=A6*=EF=BC=8C=E6=97=A5=E6=9C=9F=E8=BF=9B=E8=A1=8Cformat?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/volunteer/Venuemanagement/add.vue | 3 +++ .../modules/volunteer/Venuemanagement/info.vue | 17 ++++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/views/modules/volunteer/Venuemanagement/add.vue b/src/views/modules/volunteer/Venuemanagement/add.vue index 97fd60dd0..c8506a4c4 100644 --- a/src/views/modules/volunteer/Venuemanagement/add.vue +++ b/src/views/modules/volunteer/Venuemanagement/add.vue @@ -523,6 +523,9 @@ address: [ { required: true, message: '请选择位置', trigger: 'blur' } ], + typeName: [ + { required: true, message: '请选择阵地', trigger: 'blur' } + ], } }, diff --git a/src/views/modules/volunteer/Venuemanagement/info.vue b/src/views/modules/volunteer/Venuemanagement/info.vue index efaa7e7c4..06057d0c7 100644 --- a/src/views/modules/volunteer/Venuemanagement/info.vue +++ b/src/views/modules/volunteer/Venuemanagement/info.vue @@ -9,15 +9,9 @@ :disabled="true" class="u-item-width-normal"> --> - - + @@ -87,7 +81,7 @@ import util from '@js/util.js'; // import UploadImage from './upload-image.vue' import UploadImage from '@/views/modules/plugins/rent/upload-image.vue' - + import dayjs from 'dayjs'; var map var search var markers @@ -185,8 +179,9 @@ console.log(res); if (res.code == 0) { this.tableData1 = res.data.list - l - + this.tableData1.forEach(item => { + item.time = dayjs(item.time).format('YYYY-MM-DD') + }) } else { this.$message.error(res.msg) } From a2f4305be40d806df848c9741e33e964743f3d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Sat, 12 Oct 2024 14:28:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/checkBox.vue | 2 -- src/views/modules/base/diyInfo.vue | 3 +++ src/views/modules/base/smartExport/exset.vue | 16 +++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue index 7c713e078..e26e45bbf 100644 --- a/src/views/components/checkBox.vue +++ b/src/views/components/checkBox.vue @@ -45,9 +45,7 @@ export default { } }, created() { - console.log(this.leftList,"sfsdfd"); this.boxList = this.list.filter(item => item.itemType != 'inputRange') - console.log(this.boxList,"kdsflkljf"); this.pid = this.list[0].itemGroupId }, methods: { diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index 844e4fcc2..49fecd811 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -303,10 +303,13 @@ export default { this.$emit('close') }, handleExportTemplate(id) { + console.log(id,"sdl;fkldsf"); + this.exportTemplate(id) this.$emit('close') }, async exportTemplate(id) { + console.log(id,"dsofspdjf"); let url = "/actual/base/residentBaseInfo/exportExcelCustom" let params = { templateId: id || '', diff --git a/src/views/modules/base/smartExport/exset.vue b/src/views/modules/base/smartExport/exset.vue index 54ced454b..4bbda3f00 100644 --- a/src/views/modules/base/smartExport/exset.vue +++ b/src/views/modules/base/smartExport/exset.vue @@ -4,7 +4,7 @@

智能导出/导出设置

- + { From 75465323898271fdb0b6f478c5e3ca3ada7c8a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Mon, 14 Oct 2024 10:22:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=9F=E6=B4=BB=E5=9C=88=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=8A=A0*=EF=BC=8C=E6=8A=98=E6=89=A3=E5=88=B8?= =?UTF-8?q?=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volunteer/LifeCircleManagement/add.vue | 12 +- .../volunteer/LifeCircleManagement/index.vue | 202 +++++++++--------- .../volunteer/pointsRedemption/add.vue | 4 +- 3 files changed, 105 insertions(+), 113 deletions(-) diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue index ee206136d..39db4f339 100644 --- a/src/views/modules/volunteer/LifeCircleManagement/add.vue +++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue @@ -592,10 +592,10 @@ // console.log(this.formData.tags.map(item => item.tab).join(', ')," this.formData"); - // if (!this.formData.type) { - // this.$message.error('请选择类型'); - // return; - // } + if (!this.formData.type) { + this.$message.error('请选择类型'); + return; + } if (!this.formData.name) { this.$message.error('请输入组织介绍'); return; @@ -756,8 +756,8 @@ computed: { dataRule() { return { - typeName: [ - { required: true, message: '请选择组织类型', trigger: 'blur' } + type: [ + { required: true, message: '请选择类型', trigger: 'blur' } ], name: [ { required: true, message: '请填写名称', trigger: 'blur' } diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue index 90fe3a357..e87402f78 100644 --- a/src/views/modules/volunteer/LifeCircleManagement/index.vue +++ b/src/views/modules/volunteer/LifeCircleManagement/index.vue @@ -1,111 +1,98 @@