diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 31e57e6..a15865b 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -42,17 +42,19 @@ - {{ item.meetingContactsName}} {{item.meetingContactsName? ':' :''}} {{item.meetingContactsPhone + ' ' }} + >{{ item.meetingContactsName }} {{ item.meetingContactsName ? ':' : '' }} {{ + item.meetingContactsPhone + ' ' + }} - + {{ model.hotelName }} @@ -62,13 +64,13 @@ - {{ item.hotelContacts}} {{item.hotelContacts? ':' :''}} {{item.hotelContactsPhone + ' ' }} + >{{ item.hotelContacts }} {{ item.hotelContacts ? ':' : '' }} {{ item.hotelContactsPhone + ' ' }} @@ -96,7 +98,7 @@ - nothing show + nothing show @@ -104,7 +106,7 @@ - nothing show + nothing show @@ -234,14 +236,18 @@ - - - + + +
-

报名信息

+
+

报名信息

+ + 编辑报名信息 +
-
- 报名 +
+ 报名

会议资料

- - + +

会议纪要

- +
@@ -591,6 +600,7 @@ + @@ -598,13 +608,14 @@ import PreviewFile from '@comp/jero/PreviewFile' import FileTable from '@/views/MessagePage/modules/FileTable' import JEllipsis from '@comp/jero/JEllipsis' -import { getMeetInfoById, queryCommonProjectById } from '@api/incomePaymentsApi' -import { getSingUpUserInfo, checkMember } from '@api/incomePaymentsApi' +import {getMeetInfoById, queryCommonProjectById} from '@api/incomePaymentsApi' +import {getSingUpUserInfo, checkMember} from '@api/incomePaymentsApi' import JImageUpload from '@comp/jero/JImageUpload' import '@/assets/less/TableExpand.less' import SignStep from './modules/SignStep' -import { MeetingSignUpTypeEnums, MeetingTypeEnums } from '../../enums/commonEnum' -import { compareCurrentTime } from '../../utils/meetingJudgeUtil' +import {MeetingSignUpTypeEnums, MeetingTypeEnums} from '../../enums/commonEnum' +import {compareCurrentTime} from '../../utils/meetingJudgeUtil' +import EditSignUpInfo from '@views/meetingActivity/modules/EditSignUpInfo' const columns = [ { @@ -651,7 +662,7 @@ const columns = [ title: '操作', align: 'center', dataIndex: '', - scopedSlots: { customRender: 'action' } + scopedSlots: {customRender: 'action'} } ] export default { @@ -661,7 +672,8 @@ export default { JEllipsis, JImageUpload, FileTable, - SignStep + SignStep, + EditSignUpInfo }, props: { // 是否是从会议点进来的 默认走消息 @@ -692,7 +704,7 @@ export default { // 显示更多的开票邮寄信息 showMoreInfo: false, - showDetailBool:true + showDetailBool: true } }, computed: { @@ -720,7 +732,7 @@ export default { }, methods: { // 是否显示文件查看 - async changeShowDetailBool(){ + async changeShowDetailBool() { // 增加判断,等后端接口开发完成后再做处理 //先判断当前的会议类型,如果会议是分标委会议或者理事会会议 需要判断当前人是否是 分标委成员或者理事会成员, if (this.model.meetingType === MeetingTypeEnums.committee.index || this.model.meetingType === MeetingTypeEnums.council.index) { @@ -729,12 +741,18 @@ export default { this.showDetailBool = isBool return } - if((this.situationInfo.checkResult == 1 && this.situationInfo.registerCheckResult == 1)){ - this.showDetailBool = true - }else{ - this.showDetailBool = false + if ((this.situationInfo.checkResult == 1 && this.situationInfo.registerCheckResult == 1)) { + this.showDetailBool = true + } else { + this.showDetailBool = false } }, + /** + * @description 国际研讨会嘉宾编辑个人信息 + * */ + editSignUpInfo(){ + this.$refs.editSignUpInfoForm.open(this.situationInfo) + }, // 判断是否是 分标委成员或者理事会成员 judgeIsMember() { return new Promise(resolve => { @@ -758,8 +776,8 @@ export default { this.situationInfoLoading = true this.showMoreInfo = false // 通过id查询项目详情 - if(!param.situationId) { - queryCommonProjectById({ id: param.situationId }).then(res => { + if (!param.situationId) { + queryCommonProjectById({id: param.situationId}).then(res => { if (res.success) { console.log(res.result, 'res.result') // 到账信息 @@ -803,8 +821,8 @@ export default { getSingUpUserInfoFunc(param) { return new Promise(resolve => { // 存在报名信息 - if(param.situationId) { - getSingUpUserInfo({ id: param.situationId }).then(res => { + if (param.situationId) { + getSingUpUserInfo({id: param.situationId}).then(res => { if (res.success) { this.situationInfo = res.result } else { @@ -859,7 +877,7 @@ export default { queryMeetingInfoById(id) { return new Promise(resolve => { let result = {} - getMeetInfoById({ id }).then(res => { + getMeetInfoById({id}).then(res => { if (res.success) { result = res.result } @@ -935,6 +953,7 @@ export default { .ant-col { display: flex; } + label { flex-shrink: 0; } @@ -1081,14 +1100,20 @@ h3.title::before { } // 多个酒店联系人及手机号 换行显示 -.mul-row-row{ +.mul-row-row { display: flex; clear: both; } -.mul-row-content{ + +.mul-row-content { display: block; - .content{ + + .content { display: block; } } + +.m-l-10 { + margin-left: 10px; +} diff --git a/src/views/meetingActivity/modules/CooperativeForm.vue b/src/views/meetingActivity/modules/CooperativeForm.vue new file mode 100644 index 0000000..85b596a --- /dev/null +++ b/src/views/meetingActivity/modules/CooperativeForm.vue @@ -0,0 +1,249 @@ + + + + + \ No newline at end of file diff --git a/src/views/meetingActivity/modules/EditSignUpInfo.vue b/src/views/meetingActivity/modules/EditSignUpInfo.vue new file mode 100644 index 0000000..b93321a --- /dev/null +++ b/src/views/meetingActivity/modules/EditSignUpInfo.vue @@ -0,0 +1,124 @@ + + + + + \ No newline at end of file diff --git a/src/views/meetingActivity/modules/SpeakGuestForm.vue b/src/views/meetingActivity/modules/SpeakGuestForm.vue new file mode 100644 index 0000000..5f75290 --- /dev/null +++ b/src/views/meetingActivity/modules/SpeakGuestForm.vue @@ -0,0 +1,517 @@ + + + + + \ No newline at end of file diff --git a/src/views/meetingActivity/modules/TeyaoGuestForm.vue b/src/views/meetingActivity/modules/TeyaoGuestForm.vue new file mode 100644 index 0000000..18a4f94 --- /dev/null +++ b/src/views/meetingActivity/modules/TeyaoGuestForm.vue @@ -0,0 +1,486 @@ + + + + + \ No newline at end of file diff --git a/src/views/meetingActivity/modules/VipForm.vue b/src/views/meetingActivity/modules/VipForm.vue new file mode 100644 index 0000000..7f54f5d --- /dev/null +++ b/src/views/meetingActivity/modules/VipForm.vue @@ -0,0 +1,596 @@ + + + + + \ No newline at end of file