diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 54b0015..898bd62 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -22,7 +22,7 @@ - {{model.startTime + '~' + model.endTime}} + {{ model.startTime + '~' + model.endTime }} @@ -58,7 +58,8 @@ -
+ +

报名信息

@@ -78,28 +79,44 @@ - - - - - + + + + + + {{ situationInfo.checkInHotel_dictText }} + + + + + + {{ situationInfo.arrivalTime }} + + + + {{ situationInfo.departureTime }} + + + + - - - + + - - + + @@ -109,6 +126,315 @@ +
+ +
+

报名信息

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + {{ situationInfo.speechTopic }} + + + + + + + + + + + + + + {{situationInfo.profile}} + + + + + + + {{ situationInfo.haveMeals_dictText }} + + + + {{ situationInfo.huiPeople_dictText }} + + + + + + {{ situationInfo.checkInHotel_dictText }} + + + + {{ situationInfo.departureTime }} + + + + + + {{ situationInfo.outHotelTime }} + + + + {{ situationInfo.roomLayout }} + + + + + + {{ situationInfo.pickUp_dictText }} + + + + {{ situationInfo.arrivalTime }} + + + + + + {{ situationInfo.destination }} + + + + {{ situationInfo.arrivalShift }} + + + + + + {{ situationInfo.deliveryStation_dictText }} + + + + {{ situationInfo.departureTime }} + + + + + + {{ situationInfo.departureStation }} + + + + {{ situationInfo.departureShift }} + + + + + + {{ situationInfo.peer }} + + + + {{ situationInfo.remark }} + + +
+ +
+ + + + {{ situationInfo.speechTopic }} + + + + + + + + + + + + + + {{situationInfo.profile}} + + + + + + + {{ situationInfo.haveMeals_dictText }} + + + + {{ situationInfo.huiPeople_dictText }} + + + + + + {{ situationInfo.pickUp_dictText }} + + + + {{ situationInfo.arrivalTime }} + + + + + + {{ situationInfo.destination }} + + + + {{ situationInfo.arrivalShift }} + + + + + + {{ situationInfo.deliveryStation_dictText }} + + + + {{ situationInfo.departureTime }} + + + + + + {{ situationInfo.departureStation }} + + + + {{ situationInfo.departureShift }} + + + + + + {{ situationInfo.peer }} + + + + {{ situationInfo.remark }} + + +
+ +
+ + + + {{ situationInfo.speechTopic }} + + + + + + + + + + + + + + {{situationInfo.profile}} + + + + + + + {{ situationInfo.haveMeals_dictText }} + + + + {{ situationInfo.huiPeople_dictText }} + + + + + + {{ situationInfo.pickUp_dictText }} + + + + {{ situationInfo.arrivalTime }} + + + + + + {{ situationInfo.destination }} + + + + {{ situationInfo.arrivalShift }} + + + + + + {{ situationInfo.deliveryStation_dictText }} + + + + {{ situationInfo.departureTime }} + + + + + + {{ situationInfo.departureStation }} + + + + {{ situationInfo.departureShift }} + + + + + + {{ situationInfo.peer }} + + +
+ + + + + {{ situationInfo.arrivalTime }} + + + + {{ situationInfo.departureTime }} + + + +
@@ -173,6 +499,7 @@ import JEllipsis from '@comp/jero/JEllipsis' import {getMeetInfoById, queryCommonProjectById} from '@api/incomePaymentsApi' import {getSingUpUserInfo} from '@api/incomePaymentsApi' import '@/assets/less/TableExpand.less' + const columns = [ { title: '开票人', @@ -218,21 +545,21 @@ const columns = [ title: '操作', align: 'center', dataIndex: '', - scopedSlots: { customRender: 'action' } + scopedSlots: {customRender: 'action'} } ] export default { name: 'MeetingDetailModal', - components:{ + components: { PreviewFile, JEllipsis }, - props:{ + props: { // 是否是从会议点进来的 默认走消息 - isMeetingBool:{ - type:Boolean, - required:false, - default:false + isMeetingBool: { + type: Boolean, + required: false, + default: false } }, data() { @@ -242,23 +569,23 @@ export default { visible: false, model: {}, // 会议信息 - meetingInfo:{}, + meetingInfo: {}, // 参会人信息 - situationInfo:{}, + situationInfo: {}, columns, // 到账信息 - paymentInfoList:[], + paymentInfoList: [], // 开票邮寄信息 - logisticsInfoList:[] + logisticsInfoList: [] } }, - computed:{ + computed: { // eslint-disable-next-line - genderTest(){ - if(this.$store.getters.userInfo.gender === 1){ - return '男' - }else if(this.$store.getters.userInfo.gender === 2){ - return '女' + genderTest() { + if (this.$store.getters.userInfo.gender === 1) { + return '男' + } else if (this.$store.getters.userInfo.gender === 2) { + return '女' } } @@ -267,7 +594,7 @@ export default { open(param) { this.visible = true // 通过id查询项目详情 - queryCommonProjectById({ id: param.situationId }).then(res => { + queryCommonProjectById({id: param.situationId}).then(res => { if (res.success) { console.log(res.result, 'res.result') // 到账信息 @@ -279,28 +606,28 @@ export default { } }) - if(param && !this.isMeetingBool){ + if (param && !this.isMeetingBool) { // 消息进来的获取会议的详情 this.queryMeetingInfoById(param.id).then(res => { // 会议详情 - this.model = Object.assign({},res) - console.log(this.model,'this.model') + this.model = Object.assign({}, res) + console.log(this.model, 'this.model') }) // 查询参会人的信息 - getSingUpUserInfo({id:param.situationId}).then(res => { - if(res.success){ + getSingUpUserInfo({id: param.situationId}).then(res => { + if (res.success) { this.situationInfo = res.result } }) - }else { + } else { // 会议进来查询的会议信息 - this.model = Object.assign({},param) + this.model = Object.assign({}, param) // 会议进来的查询参会人信息 - getSingUpUserInfo({id:param.situationId}).then(res => { - if(res.success){ + getSingUpUserInfo({id: param.situationId}).then(res => { + if (res.success) { this.situationInfo = res.result } }) @@ -327,26 +654,26 @@ export default { } }) } - return `${ item.person }于${ item.time }开票，金额为:${ item.money }元,票号:${ item.piaoNo },项目:${ porjectItem }` + return `${item.person}于${item.time}开票，金额为:${item.money}元,票号:${item.piaoNo},项目:${porjectItem}` }, /* * 查看物流 * */ lookLogistics(record) { const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`) }, /* * 通过会议id获取会议性情 * */ - queryMeetingInfoById(id){ + queryMeetingInfoById(id) { return new Promise(resolve => { let result = {} getMeetInfoById({id}).then(res => { - if(res.success){ + if (res.success) { result = res.result } - }).finally( () => { + }).finally(() => { resolve(result) }) }) @@ -355,7 +682,7 @@ export default { * 会议类型 1 工作组会议 2 标协会议 3国际研讨会 4 其他会议 * */ generateMeetingType(val) { - switch (val +'') { + switch (val + '') { case '1': return '工作组会议' case '2': @@ -404,6 +731,7 @@ export default { display: flex; } } + .ant-row { margin: 12px; } @@ -457,6 +785,7 @@ h3.title::before { } + /* 到账信息 */ .payment-info { margin-bottom: 14px; @@ -486,6 +815,7 @@ h3.title::before { } + /* 开票邮寄信息 */ .wrap-table { border: 1px solid #ccc;