diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 131a3e1..0d1bab3 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -31,6 +31,7 @@ export const InvoiceTypeEnums = { // 免费专题 export const LinkTopicsEnums = { free: { name: '免费专题', index: 6 }, + freeTwo: { name: '免费专题', index: 8 }, default: {name: '114/22焦点论坛(默认专题)', index: 99} } diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 94a237c..0167cf5 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -90,7 +90,7 @@ {{ item.text }}
- + {{ item.text }}
@@ -219,7 +219,7 @@ export default { }, choiceTopic: { rules: [ - {required: true, message: '请选择会议名称'}, + {required: true, validator: this.checkChoiceTopic}, ], validateTrigger: ['change'] }, @@ -332,9 +332,34 @@ export default { }, }, methods: { + // 验证选择会议名称的情况 + checkChoiceTopic(rules, value, callback) { + console.log(value) + let arr = [] + if (value && value.length > 0) { + arr = [...value] + } + let radioKey = this.form.getFieldValue('radioKey') + let radioKeyTwo = this.form.getFieldValue('radioKeyTwo') + if(radioKey || radioKeyTwo) { + callback() + } else { + arr = arr.filter(tt => tt !== LinkTopicsEnums.freeTwo.index + '') + if(arr.length === 0) { + callback('请至少选择一个非参观类会议') + } else { + callback() + } + } + }, choiceTopicChange(e) { console.log(e) }, + changeRadioTopic() { + this.$nextTick(() => { + this.form.validateFields(['choiceTopic']) + }) + }, // 获取国际研讨会-能选择课题的数据字典数据 getLinkTopicsOptionArr(meetingId) { getLinkTopics({id: meetingId}).then(res =>{ @@ -366,7 +391,7 @@ export default { // 新增页面,给Form赋值 if(!this.model.id) { this.form.setFieldsValue({ - choiceTopic: [LinkTopicsEnums.default.index + ''] + choiceTopic: [] }) } } diff --git a/src/views/incomePayments/meetManage/modules/wasicStaticData.js b/src/views/incomePayments/meetManage/modules/wasicStaticData.js index 45c9ff7..658d484 100644 --- a/src/views/incomePayments/meetManage/modules/wasicStaticData.js +++ b/src/views/incomePayments/meetManage/modules/wasicStaticData.js @@ -37,7 +37,7 @@ const WasicTopicData = [ 'value': '99', 'text': '114/22焦点论坛(08:00-12:00,全体大会)', 'title': '114/22焦点论坛(08:00-12:00,全体大会)', - 'disabled': true + // 'disabled': true } ], radioChildren: [