From 6f79fc6b606b3ee2e023ed995cc6ab2a64bec0c9 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, 5 Sep 2024 18:44:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E7=BB=84=E7=BB=87=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volunteer/VoluntaryOrganization/add.vue | 101 +++--- .../volunteer/VoluntaryOrganization/edit.vue | 48 +-- .../volunteer/VoluntaryOrganization/index.vue | 296 +++--------------- .../volunteer/VoluntaryOrganization/info.vue | 29 +- .../VoluntaryOrganization/process.vue | 54 +++- .../volunteer/activityArchive/enclosure.vue | 2 +- .../volunteer/activityArchive/index.vue | 4 +- 7 files changed, 170 insertions(+), 364 deletions(-) diff --git a/src/views/modules/volunteer/VoluntaryOrganization/add.vue b/src/views/modules/volunteer/VoluntaryOrganization/add.vue index d6c1b962e..ff4edce2d 100644 --- a/src/views/modules/volunteer/VoluntaryOrganization/add.vue +++ b/src/views/modules/volunteer/VoluntaryOrganization/add.vue @@ -13,14 +13,14 @@ - - + - - + + @@ -48,20 +48,20 @@ - - + - - + - - + @@ -73,22 +73,22 @@ - +
- +
- +
- +
- + @@ -143,40 +143,29 @@ export default { { label: "学校", value: 3 }, ], formData: - { - VolunteerPic:"",//品牌图片 - Volunteerbrand:"",//志愿品牌 - Organizational:"",//组织介绍 - fileList: [],//封面图片 - AdministratorIDCard:"",//身份证信息 - Administratorphone:"",//管理员电话 - AdministratorName:"",//管理员姓名 + { + status:"",//审核状态 + numberNum:"",//组织成员数量 + userId:"",//志愿者id + agencyId:"",//组织id + orgType:"", + brandImg:"",//品牌图片 + brand:"",//志愿品牌 + introduction:"",//组织介绍 + qualification: "",//封面图片 + idCard:"",//身份证信息 + mobile:"",//管理员电话 + operator:"",//管理员姓名 Organizationaltype:"",//组织类型 - Servicetype:"",//服务类型 - OrganizationName:"",//组织名称 + // serviceTypeList:"",//服务类型 + orgName:"",//组织名称 agencyName:"",//所属组织 - Servicetype:[], - id: "", - typeId: "", - activityName: "",//活动名称 - status: 0,//状态 - assistingParty: "",//协办方 - startTime: "",//开始时间 - endTime: "",//结束时间 - coverPic: "",//封面图片地址 - content: "",//活动内容 + serviceTypeList:[],//服务类型 address: "",//地址 - online: 0,//开关 - cutOffTime: "",//截止时间 - points: 0,//积分 - participants: 0,//活动人数 - sendMessage: 0,//推送数 - sumUp: "",//活动总结 activityImgs: [],//图片列表 longitude: this.$store.state.user.longitude, //经度 latitude: this.$store.state.user.latitude,//纬度 }, - corganizerList: [], uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2', customerId: localStorage.getItem('customerId'), @@ -507,6 +496,8 @@ export default { }, async handleComfirm() { + console.log(this.formData," this.formData"); + if (!this.formData.agencyName) { this.$message.error('请选择所属组织'); return; @@ -514,7 +505,7 @@ export default { - if (!this.formData.Organizational) { + if (!this.formData.introduction) { this.$message.error('请输入组织介绍'); return; } @@ -524,17 +515,17 @@ export default { return; } - if (!this.formData.AdministratorIDCard) { + if (!this.formData.idCard) { this.$message.error('请输入身份证信息'); return; } - if (!this.formData.Administratorphone) { + if (!this.formData.mobile) { this.$message.error('请输入管理员电话'); return; } - if (!this.formData.AdministratorName) { + if (!this.formData.operator) { this.$message.error('请输入管理员姓名'); return; } @@ -544,12 +535,12 @@ export default { return; } - if (!this.formData.Servicetype) { + if (!this.formData.serviceTypeList) { this.$message.error('请输入服务类型'); return; } - if (!this.formData.OrganizationName) { + if (!this.formData.orgName) { this.$message.error('请输入组织名称'); return; } @@ -746,30 +737,30 @@ export default { dataRule() { return { - OrganizationName: [ + orgName: [ { required: true, message: '组织名称不能为空', trigger: 'blur' } ], - Servicetype: [ + serviceTypeList: [ { required: true, message: '请选择服务类型', trigger: 'blur' } ], Organizationaltype: [ { required: true, message: '请选择组织类型', trigger: 'blur' } ], - AdministratorName: [ + operator: [ { required: true, message: '请输入管理员姓名', trigger: 'blur' } ], - AdministratorIDCard: [ + idCard: [ { required: true, message: '身份证号不能为空不能为空', trigger: 'blur' }, { pattern: /^(?:[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)|[1-9]\d{5}\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3})$/, message: '请输入正确的身份证号', trigger: 'blur' } ], - Administratorphone: [ + mobile: [ { required: true, message: '管理员电话不能为空不能为空', trigger: 'blur' }, { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' } ], fileList: [ { required: true, message: '请上传组织封面图', trigger: 'blur' } ], - Organizational: [ + introduction: [ { required: true, message: '请填写组织介绍', trigger: 'blur' }, { min:50, message: '请输入50字以上的介绍', trigger: 'blur'} ], diff --git a/src/views/modules/volunteer/VoluntaryOrganization/edit.vue b/src/views/modules/volunteer/VoluntaryOrganization/edit.vue index aed9110e4..0f50bee63 100644 --- a/src/views/modules/volunteer/VoluntaryOrganization/edit.vue +++ b/src/views/modules/volunteer/VoluntaryOrganization/edit.vue @@ -1,6 +1,5 @@ +