diff --git a/package.json b/package.json index 1bb574cc2..75c94e25c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build:uat": "vue-cli-service build --mode production.uat", "build:preview": "vue-cli-service build --mode preview", "build:prod": "vue-cli-service build --mode production", - "build:test": "vue-cli-service build --mode test", + "build:test": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode test", "build:shibei_prod": "vue-cli-service build --mode shibei_production", "lint": "vue-cli-service lint", "et": "node_modules/.bin/et", diff --git a/src/views/modules/volunteer/VolunteerProjects/add.vue b/src/views/modules/volunteer/VolunteerProjects/add.vue index b48b0ecd0..73873cb40 100644 --- a/src/views/modules/volunteer/VolunteerProjects/add.vue +++ b/src/views/modules/volunteer/VolunteerProjects/add.vue @@ -21,13 +21,13 @@ - - @@ -569,52 +569,48 @@ }, async handleComfirm() { - // if (!this.formData.agencyName) { - // this.$message.error('请选择所属组织'); - // return; - // } + if (!this.formData.projectTitle) { + this.$message.error('请填写名称'); + return; + } - // if (!this.formData.Organizational) { - // this.$message.error('请填写项目介绍'); - // return; - // } - - // if (this.fileList.length === 0) { - // this.$message.error('请上传封面图片'); - // return; - // } - - // if (!this.formData.AdministratorIDCard) { - // this.$message.error('请输入身份证信息'); - // return; - // } - - // if (!this.formData.Administratorphone) { - // this.$message.error('请输入管理员电话'); - // return; - // } - - // if (!this.formData.AdministratorName) { - // this.$message.error('请输入管理员姓名'); - // return; - // } - - // if (!this.formData.Organizationaltype) { - // this.$message.error('请输入组织类型'); - // return; - // } - - // if (!this.formData.Servicetype) { - // this.$message.error('请输入服务类型'); - // return; - // } - - // if (!this.formData.OrganizationName) { - // this.$message.error('请填写发布单位'); - // return; - // } + if (!this.formData.description) { + this.$message.error('请填写项目介绍'); + return; + } + + + if (!this.formData.serviceClasses) { + this.$message.error('请选择服务类型'); + return; + } + + if (!this.formData.recruitDeadline) { + this.$message.error('请选择服务截止时间'); + return; + } + + if (!this.formData.recruitRequirement) { + this.$message.error('请填写招募要求'); + return; + } + + if (!this.formData.Organizationaltype) { + this.$message.error('请输入组织类型'); + return; + } + + if (!this.formData.serviceTimeFrom&&!this.formData.serviceTimeTo) { + this.$message.error('请选择服务期限'); + return; + } + + if (!this.formData.OrganizationName) { + this.$message.error('请填写发布单位'); + return; + } console.log(this.formData,"this.formData"); this.addActivity() }, diff --git a/src/views/modules/volunteer/VolunteerProjects/index.vue b/src/views/modules/volunteer/VolunteerProjects/index.vue index ff5d51d56..3a011b20d 100644 --- a/src/views/modules/volunteer/VolunteerProjects/index.vue +++ b/src/views/modules/volunteer/VolunteerProjects/index.vue @@ -91,7 +91,7 @@ style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">上线 删除 - 招募 diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue index 9e322ed6e..2532608b1 100644 --- a/src/views/modules/volunteer/activityArchive/realselect.vue +++ b/src/views/modules/volunteer/activityArchive/realselect.vue @@ -318,6 +318,7 @@ if (item.value == this.formData.type.toString()) { console.log(item.projectTitle,"item.label"); this.formData.typeName=item.label + return } }); diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue index 5fabc40ec..078993695 100644 --- a/src/views/modules/volunteer/pointsRedemption/add.vue +++ b/src/views/modules/volunteer/pointsRedemption/add.vue @@ -85,6 +85,7 @@ +
@@ -105,8 +106,17 @@
- - + + + + + @@ -129,12 +139,10 @@