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/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 945bcbf..cee0113 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -256,7 +256,7 @@
邀请码
- + - + - + - + - + @@ -113,19 +118,19 @@ - {{ currentMeetingInfo.vipInvitationCode }} + {{ currentMeetingInfo.vipInvitationCode }} - + - + - + - + @@ -393,6 +398,7 @@ import PreviewFile from '@comp/jero/PreviewFile' import JImageUpload from '@comp/jero/JImageUpload' import SetGuessUploadFlagModal from './modules/SetGuessUploadFlagModal' import { downloadFile } from '../../../api/manage' +import WasicTopicData from "./modules/wasicStaticData"; export default { @@ -667,6 +673,8 @@ export default { meetingCostBool: false, meetingId: '', meetingTypeValue: '', + // 关联会议展示的字段 + wasicLinkTopics: [], } }, created() { @@ -681,6 +689,7 @@ export default { getMeetInfoById(param).then(res => { if (res.success) { this.currentMeetingInfo = Object.assign({}, res.result) + this.wasicLinkTopics = this.handleWasicLinkTopics(this.currentMeetingInfo) // 转化会议类型 this.meetingType = this.generateMeetingType(this.currentMeetingInfo.meetingType) // 列表表头只有国际研讨会有对接人字段 @@ -780,6 +789,41 @@ export default { }, }, methods: { + // 处理国际研讨会-WASIC-已经选择的数据如何展示 + handleWasicLinkTopics(currentMeetingInfo, dictKey) { + dictKey = dictKey || 'linkTopics' + let resultArr = [] + if(currentMeetingInfo[dictKey] && currentMeetingInfo[dictKey + '_dictText']) { + let topicArr = currentMeetingInfo[dictKey].split(',') + let topicTextArr = currentMeetingInfo[dictKey + '_dictText'].split(',') + let opeArr = JSON.parse(JSON.stringify(WasicTopicData)) + opeArr.map(tt => { + // 先查询子集中 + tt.allChildren = [...tt.children, ...(tt.radioChildren || [])] + let ele = tt.allChildren.find(item => topicArr.includes(item.value)) + if(ele) { + let dateItem = { + name: tt.name, + date: tt.date, + children: [] + } + + tt.allChildren.map(innerItem => { + let index = topicArr.findIndex(a => a === innerItem.value) + if(index > -1) { + dateItem.children.push({ + 'value': innerItem.value, + 'text': topicTextArr[index], + 'title': topicTextArr[index] + }) + } + }) + resultArr.push(dateItem) + } + }) + } + return resultArr + }, selectIdentity(){ console.log(this.queryParam.identity) if(this.queryParam.identity !== '1'){ diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 3546aeb..ece5d07 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -32,8 +32,6 @@ @ok="addContactsOk"> - - - - - - - - - @@ -76,15 +57,49 @@ - VIP - 演讲嘉宾 - 特邀嘉宾 - 合作伙伴 - 参展商 + VIP(吃饭+住宿+接站) + 演讲嘉宾(吃饭+接站) + 特邀嘉宾(接站) + 合作伙伴(只登记行程) + 参展商类别(只登记行程) + + + + + + + + + + + + + + + + + + +
+
{{item.name}}
+
+ {{ item.text }} +
+
+ + {{ item.text }} + +
+
+
+ 清空会议信息 +
+
+