diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 972fd1d..1145f7c 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -65,6 +65,8 @@ const queryPostInfoById = (params) => getAction('/company/payContactsManagement/
// 报名的时候修改企业的信息
const updateInvoiceBySignUp = (params) => postAction('/company/payCompanyManagement/updateInvoice', params)
+// 国际研讨会-WASIC-通过会议ID获取关联主题的信息
+const getLinkTopics = (params) => getAction('/meeting/internalMeeting/getLinkTopics', params)
export {
queryCommonProjectById,
@@ -96,5 +98,6 @@ export {
judgeMeetingCode,
upgradeVip,
- updateInvoiceBySignUp
+ updateInvoiceBySignUp,
+ getLinkTopics
}
diff --git a/src/enums/commonEnum.js b/src/enums/commonEnum.js
index b1d27d1..fa033bd 100644
--- a/src/enums/commonEnum.js
+++ b/src/enums/commonEnum.js
@@ -53,3 +53,13 @@ export const InvoiceTypeEnums = {
plain: { name: '增值税普通发票', index: 1 },
special: { name: '增值税专用发票', index: 2 }
}
+// 国际研讨会关联课题
+//汽车网络安全与数据安全标准合规专题,
+// 智能网汽车标准化领航及标准路线图专题,
+// 汽车地毯专题,
+// 动力电池安全专题,
+// 弱势道路交通参与者（VRU）保护专题,
+// 免费专题
+export const LinkTopicsEnums = {
+ free: { name: '免费专题', index: 6 }
+}
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 5f5181b..9946a17 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -21,6 +21,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -87,22 +98,33 @@
-
-
- {{ model.meetingCosts }} 元/人
-
-
-
- {{ model.meetingCostsVip }} 元/人
-
-
+
+
+
+ {{ model.meetingCostsTwoTopic }} 元/人
+
+
+ {{ model.meetingCostsThreeTopic }} 元/人
+
+
+
+
+
+ {{ model.meetingCosts }} 元/人
+
+
+
+ {{ model.meetingCostsVip }} 元/人
+
+
+
![nothing show]()
-
+
@@ -189,14 +211,19 @@
+
+
+
+
+
-
-
+
+
{{ situationInfo.checkInHotel_dictText }}
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index f8309d2..b69ee8d 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -159,6 +159,7 @@
@click.stop="uploadPaymentRecord(item)"
>查看凭证
+ {{item.signUpStatus}}--{{$store.getters.userInfo.roleCode !== '3'}}
{{ currentMeetingInfo.meetingContent }}
+
+
+
+ {{ currentMeetingInfo.linkTopics_dictText }}
+
+
@@ -133,6 +139,8 @@ export default {
invalidationBool: false,
// url是否有id参数
urlHaveIdBool:false,
+ // 是否为国际研讨会 WASIC会议
+ isWasic: false
}
},
created() {
@@ -203,6 +211,10 @@ export default {
// 有vip会议费用 并且 不是 信息交流会（年会）
if (this.currentMeetingInfo.meetingCostsVip && (this.currentMeetingInfo.tbMeetingType + '' !== '3')) {
this.meetingMoney = `非标协会员(${this.currentMeetingInfo.meetingCosts}/人) 标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
+ } else if (this.currentMeetingInfo.meetingType === '3' && this.currentMeetingInfo.isWasic){
+ this.isWasic = true
+ // 国际研讨会 且为WASIC 会议
+ this.meetingMoney = `会议费用（2个课题）(${this.currentMeetingInfo.meetingCostsTwoTopic}/人) 会议费用（3个及以上）(${this.currentMeetingInfo.meetingCostsThreeTopic}/人)`
} else {
this.meetingMoney = ` ${this.currentMeetingInfo.meetingCosts}/人`
}
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index c5b633b..99e2143 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -82,6 +82,12 @@
{{ currentMeetingInfo.meetingContent }}
+
+
+
+ {{ currentMeetingInfo.linkTopics_dictText }}
+
+
@@ -142,7 +148,26 @@
-
+
+
+
+
+
+
+
+
+
+
是
@@ -252,6 +277,8 @@ import SeminarVipForm from '@comp/signUpForm/SeminarVipForm'
import SeminarPartnerForm from '@comp/signUpForm/SeminarPartnerForm'
import InviteCode from './InviteCode'
import InvoiceConfirmModal from './modules/InvoiceConfirmModal'
+import {LinkTopicsEnums} from '../../enums/commonEnum'
+import {getLinkTopics} from "../../api/incomePaymentsApi";
export default {
@@ -277,6 +304,10 @@ export default {
currentMeetingInfo: {},
// 会议费用
meetingMoney: '',
+ // 是否为国际研讨会 WASIC会议
+ isWasic: false,
+ // 可选课题名称的数组
+ linkTopicsOptionArr: [],
// 召开时间
holdtime: '',
// 召开地点
@@ -306,6 +337,12 @@ export default {
rules: [{required: true, message: '请选择参会企业'}],
validateTrigger: 'change'
},
+ choiceTopic: {
+ rules: [
+ {required: true, message: '请选择课题名称'},
+ ],
+ validateTrigger: ['change']
+ },
inviteCode: {
rules: [{required: true, message: '请选择是否有邀请码'}],
validateTrigger: 'change'
@@ -361,6 +398,8 @@ export default {
},
// 当前参会企业是否是内部企业
isInternalEnterprise: false,
+ // 国际研讨会-WASIC-选择关联客户的数组
+ choiceTopicArr: []
}
},
created() {
@@ -374,6 +413,14 @@ export default {
}
},
methods: {
+ // 获取国际研讨会-能选择课题的数据字典数据
+ getLinkTopicsOptionArr() {
+ getLinkTopics({id: this.meetingId}).then(res =>{
+ if(res.success) {
+ this.linkTopicsOptionArr = res.result || []
+ }
+ })
+ },
/*
* 获取会议详情
* */
@@ -389,6 +436,11 @@ export default {
this.meetingMoney = `非标协会员(${this.currentMeetingInfo.meetingCosts}/人) 标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
// 费用合计
this.meetingCostSum = this.currentMeetingInfo.meetingCosts
+ } else if (this.currentMeetingInfo.meetingType === '3' && this.currentMeetingInfo.isWasic){
+ // 国际研讨会 且为WASIC 会议
+ this.isWasic = true
+ this.meetingMoney = `会议费用（2个课题）(${this.currentMeetingInfo.meetingCostsTwoTopic}/人) 会议费用（3个及以上）(${this.currentMeetingInfo.meetingCostsThreeTopic}/人)`
+ this.getLinkTopicsOptionArr()
} else {
this.meetingMoney = `${this.currentMeetingInfo.meetingCosts}/人`
// 费用合计
@@ -546,7 +598,7 @@ export default {
that.confirmLoading = false
})
}
- //todo 判断当前是否需要发票，如果需要发票，二次判断对应发票的信息是否正确
+ //判断当前是否需要发票，如果需要发票，二次判断对应发票的信息是否正确
if (Number(submitData.needInvoice)) {
that.showInvoiceConfirmModal(submitData, callbackFunc)
that.confirmLoading = false
@@ -575,7 +627,15 @@ export default {
if(e.target.value === 3 && this.currentMeetingInfo.meetingType === '3' ){
this.meetingCostSum = '0.00'
}else {
- this.meetingCostSum = this.currentMeetingInfo.meetingCosts
+ this.meetingCostSum = this.currentMeetingInfo.meetingCosts
+ // TODO 如果当前是WASIC会议 则需要通过课题名称判断会议的费用
+ if(this.isWasic) {
+ if(this.choiceTopicArr.length > 2) {
+ this.meetingCostSum = this.currentMeetingInfo.meetingCostsThreeTopic
+ } else {
+ this.meetingCostSum = this.currentMeetingInfo.meetingCostsTwoTopic
+ }
+ }
}
// 当前会议不是国际研讨会议 身份选择嘉宾和 内部企业的会议费用为0
if(e.target.value !== 2 && this.currentMeetingInfo.meetingType !== '3' ){
@@ -669,6 +729,18 @@ export default {
this.guestType = null
})
},
+ changeChoiceTopic(choiceTopic) {
+ // 保存选择的付费主题 用于进行费用的计算
+ this.choiceTopicArr = (choiceTopic || '').split(',')
+ this.choiceTopicArr = this.choiceTopicArr.filter(item => item && item !== (LinkTopicsEnums.free.index + ''))
+ if(this.choiceTopicArr.length > 2) {
+ this.meetingCostSum = this.currentMeetingInfo.meetingCostsThreeTopic
+ } else {
+ this.meetingCostSum = this.currentMeetingInfo.meetingCostsTwoTopic
+ }
+ console.log(this.choiceTopicArr)
+
+ },
/*
* 是否有邀请码
* */
@@ -970,4 +1042,14 @@ export default {
}
}
+
+// 国际研讨会-关联课题 多选样式的修改
+.meeting-form-multi-select{
+ /deep/.ant-checkbox-wrapper + .ant-checkbox-wrapper {
+ margin-left: 0!important;
+ }
+ /deep/ .ant-checkbox-wrapper{
+ margin-right: 8px;
+ }
+}