From 08bd1762070d35dfdda66544f9cb7cc06ba70c61 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 17 Jun 2024 16:33:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[update=20=E5=9B=BD=E9=99=85=E7=A0=94?= =?UTF-8?q?=E8=AE=A8=E4=BC=9A]=20=E4=BC=9A=E8=AE=AE=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=8E=BB=E6=8E=89=E4=BA=94=E4=B8=AA?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=A2=9E=E5=8A=A0=E8=81=8C=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/commonEnums.js | 11 +++++++++++ .../meetManage/AddOrDetailMeet.vue | 5 +++-- .../meetManage/SignUpInfoEdit.vue | 19 ++++++++++++++++--- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index efee05d..59063e2 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -62,4 +62,15 @@ export const PayMode = { remittance: { name: '汇款', value: 1 }, onSitePayment: { name: '现场缴费', value: 2 }, pack: { name: '打包', value: 3 }, +} + +// 会议类型 +export const MeetingTypeEnums = { + workGroup: { name: '工作组会议', value: '1' }, + standard: { name: '标协会议', value: '2' }, + internationalSeminar: { name: '国际研讨会', value: '3' }, + other: { name: '其他会议', value: '4' }, + committee: { name: '分标委会议', value: '5' }, + council: { name: '理事会会议', value: '6' }, + draftGroup: { name: '起草会会议', value: '7' } } \ No newline at end of file diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 90732de..b894c5d 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -630,7 +630,7 @@ import JImageUpload from '@comp/jero/JImageUpload' import {checkMeetingName} from '@/utils/validateOnly' import {addZero} from '@/utils/util' import {money, phoneReg} from '@/utils/validate' -import { LinkTopicsEnums } from '../../../enums/commonEnums' +import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums' export default { @@ -1187,7 +1187,8 @@ export default { * 添加会议联系人 * */ addMeetingContacts(index) { - if (this.model.meetingContactsList.length >= 5) { + // 国际研讨会不限制5个会议联系人 + if ((this.meetingType !== MeetingTypeEnums.internationalSeminar.value) && (this.model.meetingContactsList.length >= 5)) { this.$message.warning('最多添加5个会议联系人') return } diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 32a6ffa..6bb5c38 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -18,7 +18,7 @@ - + + + + + + + + @@ -169,7 +178,7 @@ import {httpAction} from '@api/manage' import pick from 'lodash.pick' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import { queryCompanyInfoById } from '../../../api/api' -import { LinkTopicsEnums } from '../../../enums/commonEnums' +import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums' import WasicTopicData from './modules/wasicStaticData' export default { @@ -185,6 +194,7 @@ export default { }, data() { return { + MeetingTypeEnums, description: '报名信息编辑页', form: this.$form.createForm(this), confirmLoading: false, @@ -233,8 +243,11 @@ export default { guestType:{ rules: [{required: true, message: '请选择嘉宾类型'}], validateTrigger: 'change' + }, + jobInformation: { + rules: [{required: true, message: '请选择职务信息'}], + validateTrigger: 'blur' } - }, // 身份类型 identifyType: null, From dd2554be80703b57683de8f9fe0c90f96ef06a99 Mon Sep 17 00:00:00 2001 From: danshihao Date: Tue, 18 Jun 2024 14:13:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[update=20=E5=9B=BD=E9=99=85=E7=A0=94?= =?UTF-8?q?=E8=AE=A8=E4=BC=9A]=20=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E8=81=8C=E5=8A=A1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/incomePayments/meetManage/SignUpInfoEdit.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 6bb5c38..635b276 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -47,7 +47,7 @@ + v-decorator="['post',validatorRules.post]"> @@ -244,8 +244,8 @@ export default { rules: [{required: true, message: '请选择嘉宾类型'}], validateTrigger: 'change' }, - jobInformation: { - rules: [{required: true, message: '请选择职务信息'}], + post: { + rules: [{required: true, message: '请输入职务信息'}], validateTrigger: 'blur' } }, From 734675228eabf82934957ea9bb667f19d29900c3 Mon Sep 17 00:00:00 2001 From: danshihao Date: Tue, 18 Jun 2024 14:22:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[update=20=E5=9B=BD=E9=99=85=E7=A0=94?= =?UTF-8?q?=E8=AE=A8=E4=BC=9A]=20=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E8=81=8C=E5=8A=A1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/incomePayments/meetManage/SignUpInfoEdit.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 635b276..80e59f2 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -42,10 +42,10 @@ - + - - + @@ -245,7 +245,7 @@ export default { validateTrigger: 'change' }, post: { - rules: [{required: true, message: '请输入职务信息'}], + rules: [{required: true, message: '请输入职务'}], validateTrigger: 'blur' } },