From 48e2906ee99ef11ba0a3a7a234ff94f235786746 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: Wed, 18 Dec 2024 10:48:04 +0800 Subject: [PATCH] Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang # Conflicts: # src/views/modules/volunteer/Dynamicmanagement/add.vue # src/views/modules/volunteer/Dynamicmanagement/edit.vue # src/views/modules/volunteer/Dynamicmanagement/index.vue # src/views/modules/volunteer/Dynamicmanagement/info.vue # src/views/modules/volunteer/LifeCircleManagement/index.vue # src/views/modules/volunteer/Projectreview/index.vue # src/views/modules/volunteer/Projectreview/process.vue # src/views/modules/volunteer/VolManage/enclosure.vue # src/views/modules/volunteer/VoluntaryOrganization/MemberManagement.vue # src/views/modules/volunteer/VoluntaryOrganization/add.vue # src/views/modules/volunteer/VoluntaryOrganization/index.vue # src/views/modules/volunteer/VoluntaryOrganization/info.vue # src/views/modules/volunteer/VoluntaryOrganization/process.vue # src/views/modules/volunteer/VolunteerProjects/add.vue # src/views/modules/volunteer/VolunteerProjects/edit.vue # src/views/modules/volunteer/VolunteerProjects/index.vue # src/views/modules/volunteer/VolunteerProjects/info.vue # src/views/modules/volunteer/VolunteerProjects/record.vue # src/views/modules/volunteer/VolunteerProjects/recruit.vue # src/views/modules/volunteer/activityArchive/process.vue --- .../modules/shequzhili/peopleOpinons/opinionsDaily.vue | 2 +- .../modules/shequzhili/solicitationSpecial/cpts/add.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue b/src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue index a384330da..9ba34af68 100644 --- a/src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue +++ b/src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue @@ -220,7 +220,7 @@ export default { openFlag:"", publicationPeople:"", typeCode:"", - demandType: "", + demandType: "idea", name: "", mobile: "", eventContent: "", diff --git a/src/views/modules/shequzhili/solicitationSpecial/cpts/add.vue b/src/views/modules/shequzhili/solicitationSpecial/cpts/add.vue index b7e7390f6..4dbcf9b49 100644 --- a/src/views/modules/shequzhili/solicitationSpecial/cpts/add.vue +++ b/src/views/modules/shequzhili/solicitationSpecial/cpts/add.vue @@ -316,9 +316,9 @@ export default { subjectContent: [ { required: true, message: '征集内容不能为空', trigger: 'blur' } ], - fileList: [ - { required: true, message: '请选择活动照片', trigger: 'blur' } - ] + // fileList: [ + // { required: true, message: '请选择活动照片', trigger: 'blur' } + // ] } },