【bug】会议详情参会人信息不同的展示

This commit is contained in:
fengachen
2021-11-02 17:21:42 +08:00
parent 7c4e936e20
commit 727f86d976
+375 -45
View File
@@ -22,7 +22,7 @@
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<label>召开时间</label>
<span>{{model.startTime + '~' + model.endTime}}</span>
<span>{{ model.startTime + '~' + model.endTime }}</span>
</a-col>
<a-col :span="12">
<label>年份</label>
@@ -58,7 +58,8 @@
</section>
<!--会议信息end-->
<!--报名信息begin-->
<section class="base-info">
<!-- 除开国际研讨会嘉宾身份个人信息的显示 -->
<section class="base-info" v-if="(model.meetingType === '3' && situationInfo.identity === 1 )">
<h3 class="title">报名信息</h3>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
@@ -78,28 +79,44 @@
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<!-- 需求沟通去掉性别-->
<!-- <a-col :span="12">-->
<!-- <label>性别</label>-->
<!-- <span>{{genderTest}}</span>-->
<!-- </a-col>-->
<a-col :span="12">
<label>手机号</label>
<span><j-ellipsis :value="situationInfo.phone" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<!-- 行程信息 -->
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.checkInHotel_dictText">
<label>是否住酒店</label>
<span>{{ situationInfo.checkInHotel_dictText }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.arrivalTime">
<label>抵达时间</label>
<span>{{ situationInfo.arrivalTime }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.departureTime">
<label>离开时间</label>
<span> {{ situationInfo.departureTime }}</span>
</a-col>
</a-row>
<!-- 只有参会人才会显示 -->
<a-row :gutter="24" class="flex-col" v-show="situationInfo.identity === 2">
<a-col :span="12">
<label>付款方式</label>
<span><j-ellipsis :value="situationInfo.payMode_dictText" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<!-- 缴费方式为打包不显示-->
<a-col :span="12" v-show="situationInfo.payMode !== 3">
<label>需要发票</label>
<span><j-ellipsis :value="situationInfo.needInvoice_dictText" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<!-- 缴费方式为打包时候 不显示 -->
<a-row :gutter="24" v-if="situationInfo.payMode !== 3" class="flex-col">
<!-- 缴费方式为打包时候 不需要发票 不显示 -->
<a-row :gutter="24"
v-if="situationInfo.payMode !== 3 && situationInfo.needInvoice !== 0 && situationInfo.identity === 2 "
class="flex-col">
<a-col :span="12">
<label>发票邮寄地址</label>
<span><j-ellipsis :value="situationInfo.postContactAddress" :length="20"></j-ellipsis></span>
@@ -109,6 +126,315 @@
<span><j-ellipsis :value="situationInfo.postCode" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
</section>
<!-- 国际研讨会嘉宾身份个人信息的显示 -->
<section class="base-info" v-else>
<h3 class="title">报名信息</h3>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<label>参会单位</label>
<span><j-ellipsis :value="situationInfo.companyName" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<label>参会人</label>
<span><j-ellipsis :value="situationInfo.companyContactName" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12">
<label>身份</label>
<span><j-ellipsis :value="situationInfo.identity_dictText" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<label>手机号</label>
<span><j-ellipsis :value="situationInfo.phone" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<!--vip身份显示-->
<section v-show="situationInfo.guestType == 1 ">
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.speechTopic">
<label>演讲题目</label>
<span>{{ situationInfo.speechTopic }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.speechPpt">
<label>演讲ppt</label>
<span><preview-file style="width: 80%" :file-id="model.speechPpt"></preview-file></span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.photo">
<label>照片</label>
<span><j-image-upload v-if="situationInfo.photo" :return-id="true" v-model="situationInfo.photo" disabled></j-image-upload></span>
</a-col>
<a-col :span="12" v-show="situationInfo.profile">
<label>个人简介</label>
<span>{{situationInfo.profile}}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<label>是否用餐</label>
<span>{{ situationInfo.haveMeals_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.haveMeals === 1">
<label>是否回民</label>
<span> {{ situationInfo.huiPeople_dictText }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" >
<label>是否住酒店</label>
<span>{{ situationInfo.checkInHotel_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.checkInHotel === 1">
<label>入住酒店时间</label>
<span> {{ situationInfo.departureTime }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col" v-show="situationInfo.checkInHotel === 1">
<a-col :span="12" >
<label>离店时间</label>
<span>{{ situationInfo.outHotelTime }}</span>
</a-col>
<a-col :span="12" >
<label>房型</label>
<span> {{ situationInfo.roomLayout }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" >
<label>是否需要接站</label>
<span>{{ situationInfo.pickUp_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.pickUp === 1">
<label>抵达时间</label>
<span> {{ situationInfo.arrivalTime }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
<a-col :span="12" >
<label>到达站</label>
<span>{{ situationInfo.destination }}</span>
</a-col>
<a-col :span="12" >
<label>到达班次</label>
<span> {{ situationInfo.arrivalShift }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" >
<label>是否需要送站</label>
<span>{{ situationInfo.deliveryStation_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.deliveryStation === 1">
<label>离开时间</label>
<span> {{ situationInfo.departureTime }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
<a-col :span="12" >
<label>离开站</label>
<span>{{ situationInfo.departureStation }}</span>
</a-col>
<a-col :span="12" >
<label>离开班次</label>
<span> {{ situationInfo.departureShift }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.peer">
<label>同行人</label>
<span>{{ situationInfo.peer }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.remark">
<label>备注</label>
<span> {{ situationInfo.remark }}</span>
</a-col>
</a-row>
</section>
<!-- 演讲嘉宾显示 -->
<section v-show="situationInfo.guestType == 2 ">
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.speechTopic">
<label>演讲题目</label>
<span>{{ situationInfo.speechTopic }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.speechPpt">
<label>演讲ppt</label>
<span><preview-file style="width: 80%" :file-id="model.speechPpt"></preview-file></span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.photo">
<label>照片</label>
<span><j-image-upload v-if="situationInfo.photo" :return-id="true" v-model="situationInfo.photo" disabled></j-image-upload></span>
</a-col>
<a-col :span="12" v-show="situationInfo.profile">
<label>个人简介</label>
<span>{{situationInfo.profile}}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<label>是否用餐</label>
<span>{{ situationInfo.haveMeals_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.haveMeals === 1">
<label>是否回民</label>
<span> {{ situationInfo.huiPeople_dictText }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" >
<label>是否需要接站</label>
<span>{{ situationInfo.pickUp_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.pickUp === 1">
<label>抵达时间</label>
<span> {{ situationInfo.arrivalTime }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
<a-col :span="12" >
<label>到达站</label>
<span>{{ situationInfo.destination }}</span>
</a-col>
<a-col :span="12" >
<label>到达班次</label>
<span> {{ situationInfo.arrivalShift }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" >
<label>是否需要送站</label>
<span>{{ situationInfo.deliveryStation_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.deliveryStation === 1">
<label>离开时间</label>
<span> {{ situationInfo.departureTime }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
<a-col :span="12" >
<label>离开站</label>
<span>{{ situationInfo.departureStation }}</span>
</a-col>
<a-col :span="12" >
<label>离开班次</label>
<span> {{ situationInfo.departureShift }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.peer">
<label>同行人</label>
<span>{{ situationInfo.peer }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.remark">
<label>备注</label>
<span> {{ situationInfo.remark }}</span>
</a-col>
</a-row>
</section>
<!-- 特邀嘉宾显示-->
<section v-show="situationInfo.guestType == 3 ">
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.speechTopic">
<label>演讲题目</label>
<span>{{ situationInfo.speechTopic }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.speechPpt">
<label>演讲ppt</label>
<span><preview-file style="width: 80%" :file-id="model.speechPpt"></preview-file></span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.photo">
<label>照片</label>
<span><j-image-upload v-if="situationInfo.photo" :return-id="true" v-model="situationInfo.photo" disabled></j-image-upload></span>
</a-col>
<a-col :span="12" v-show="situationInfo.profile">
<label>个人简介</label>
<span>{{situationInfo.profile}}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<label>是否用餐</label>
<span>{{ situationInfo.haveMeals_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.haveMeals === 1">
<label>是否回民</label>
<span> {{ situationInfo.huiPeople_dictText }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" >
<label>是否需要接站</label>
<span>{{ situationInfo.pickUp_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.pickUp === 1">
<label>抵达时间</label>
<span> {{ situationInfo.arrivalTime }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
<a-col :span="12" >
<label>到达站</label>
<span>{{ situationInfo.destination }}</span>
</a-col>
<a-col :span="12" >
<label>到达班次</label>
<span> {{ situationInfo.arrivalShift }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" >
<label>是否需要送站</label>
<span>{{ situationInfo.deliveryStation_dictText }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.deliveryStation === 1">
<label>离开时间</label>
<span> {{ situationInfo.departureTime }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
<a-col :span="12" >
<label>离开站</label>
<span>{{ situationInfo.departureStation }}</span>
</a-col>
<a-col :span="12" >
<label>离开班次</label>
<span> {{ situationInfo.departureShift }}</span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col">
<a-col :span="12" v-show="situationInfo.peer">
<label>同行人</label>
<span>{{ situationInfo.peer }}</span>
</a-col>
</a-row>
</section>
<!--合作伙伴身份显示 -->
<a-row :gutter="24" class="flex-col" v-show="situationInfo.guestType == 4 ">
<a-col :span="12" v-show="situationInfo.arrivalTime">
<label>抵达时间</label>
<span>{{ situationInfo.arrivalTime }}</span>
</a-col>
<a-col :span="12" v-show="situationInfo.departureTime">
<label>离开时间</label>
<span> {{ situationInfo.departureTime }}</span>
</a-col>
</a-row>
</section>
<!--报名信息end-->
<!--会议资料begin-->
@@ -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;