开票邮寄信息
- {{showMoreInfo ? '收起': '查看'}}
+ {{ showMoreInfo ? '收起' : '查看' }}
-
-
- 报名信息
-
-
-
-
-
+
+
+
+ 报名信息
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ situationInfo.checkInHotel_dictText }}
-
-
-
-
-
- {{ situationInfo.arrivalTime }}
-
-
-
- {{ situationInfo.departureTime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 报名信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ situationInfo.speechTopic }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{situationInfo.profile}}
-
-
-
-
-
-
- {{ situationInfo.haveMeals_dictText }}
-
-
-
- {{ situationInfo.huiPeople_dictText }}
-
-
-
-
-
- {{ situationInfo.checkInHotel_dictText }}
-
-
-
- {{ situationInfo.inHotelTime }}
-
-
-
-
-
- {{ 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.checkInHotel_dictText }}
+
+
+
+
+
+ {{ situationInfo.arrivalTime }}
+
+
+
+ {{ situationInfo.departureTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{ 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.speechTopic }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ situationInfo.profile }}
+
+
+
+
+
+
+ {{ situationInfo.haveMeals_dictText }}
+
+
+
+ {{ situationInfo.huiPeople_dictText }}
+
+
+
+
+
+ {{ situationInfo.checkInHotel_dictText }}
+
+
+
+ {{ situationInfo.inHotelTime }}
+
+
+
+
+
+ {{ 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.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 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{ situationInfo.arrivalTime }}
-
-
-
- {{ situationInfo.departureTime }}
-
-
-
-
-
+
-
+ -->
@@ -491,10 +557,11 @@
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} from '@api/incomePaymentsApi'
+import { getMeetInfoById, queryCommonProjectById } from '@api/incomePaymentsApi'
+import { getSingUpUserInfo } from '@api/incomePaymentsApi'
import JImageUpload from '@comp/jero/JImageUpload'
import '@/assets/less/TableExpand.less'
+import SignStep from './modules/SignStep'
const columns = [
{
@@ -541,7 +608,7 @@ const columns = [
title: '操作',
align: 'center',
dataIndex: '',
- scopedSlots: {customRender: 'action'}
+ scopedSlots: { customRender: 'action' }
}
]
export default {
@@ -550,7 +617,8 @@ export default {
PreviewFile,
JEllipsis,
JImageUpload,
- FileTable
+ FileTable,
+ SignStep
},
props: {
// 是否是从会议点进来的 默认走消息
@@ -570,6 +638,8 @@ export default {
meetingInfo: {},
// 参会人信息
situationInfo: {},
+ // 加载参会信息的标识
+ situationInfoLoading: false,
columns,
// 到账信息
paymentInfoList: [],
@@ -595,10 +665,10 @@ export default {
},
methods: {
- open(param) {
+ async 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')
// 到账信息
@@ -611,6 +681,7 @@ export default {
})
if (param && !this.isMeetingBool) {
+ await this.getSingUpUserInfoFunc(param)
// 消息进来的获取会议的详情
this.queryMeetingInfoById(param.id).then(res => {
// 会议详情
@@ -618,24 +689,37 @@ export default {
console.log(this.model, 'this.model')
})
// 查询参会人的信息
- getSingUpUserInfo({id: param.situationId}).then(res => {
- if (res.success) {
- this.situationInfo = res.result
- }
- })
+ // getSingUpUserInfo({ id: param.situationId }).then(res => {
+ // if (res.success) {
+ // this.situationInfo = res.result
+ // }
+ // })
} else {
// 会议进来查询的会议信息
this.model = Object.assign({}, param)
// 会议进来的查询参会人信息
-
- getSingUpUserInfo({id: param.situationId}).then(res => {
+ await this.getSingUpUserInfoFunc(param)
+ // getSingUpUserInfo({ id: param.situationId }).then(res => {
+ // if (res.success) {
+ // this.situationInfo = res.result
+ // }
+ // })
+ }
+ },
+ getSingUpUserInfoFunc(param) {
+ return new Promise(resolve => {
+ this.situationInfoLoading = true
+ getSingUpUserInfo({ id: param.situationId }).then(res => {
if (res.success) {
this.situationInfo = res.result
}
+ }).finally(() => {
+ this.situationInfoLoading = false
+ resolve()
})
- }
+ })
},
close() {
this.visible = false
@@ -645,8 +729,8 @@ export default {
},
/*
-* 生成每一个开票信息
-* */
+ * 生成每一个开票信息
+ * */
createItemInfo(item) {
let porjectItem = ''
if (item.projects.length > 0) {
@@ -673,7 +757,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
}
@@ -690,7 +774,16 @@ export default {
case '1':
return '工作组会议'
case '2':
- return '标协会议'
+ switch (this.model.tbMeetingType) {
+ case '1':
+ return '标协会议-标准宣贯'
+ case '2':
+ return '标协会议-培训会'
+ case '3':
+ return '标协会议-信息交流会'
+ }
+ break
+ // return '标协会议'
case '3':
return '国际研讨会'
case '4':
@@ -701,6 +794,10 @@ export default {
return '其他会议'
}
},
+ goSignUpPage() {
+ let url = `${window._CONFIG['singUpQRCodeURL']}?id=${this.model.id}`
+ window.open(url, '_blank')
+ }
}
}
@@ -840,27 +937,27 @@ h3.title::before {
border-bottom: 1px solid #ccc;
}
}
+
.payment-qrcode-img {
width: 100px;
height: 100px
}
// 查看 开票邮寄信息
-.logistics-info{
+.logistics-info {
position: relative;
- .wrap-table.hide{
+
+ .wrap-table.hide {
height: 0;
display: none;
transition: all 0.5s ease-out;
}
- .wrap-table{
+
+ .wrap-table {
transition: all 0.5s ease-out;
}
- //.ant-table.hide{
- // height: 0;
- // display: none;
- //}
}
+
.collapse-span {
cursor: pointer;
color: #069f99 !important;
@@ -870,4 +967,9 @@ h3.title::before {
right: 0;
top: 0;
}
+
+/deep/ .ant-empty-normal {
+ padding: 0;
+ margin: 0;
+}
diff --git a/src/views/MessagePage/modules/FileTable.vue b/src/views/MessagePage/modules/FileTable.vue
index 8f3a598..b837e80 100644
--- a/src/views/MessagePage/modules/FileTable.vue
+++ b/src/views/MessagePage/modules/FileTable.vue
@@ -53,8 +53,8 @@ export default {
type: String,
required: false
},
- /* 是否是会议资料 会议资料有下载的限制 */
- isMeetingDataBool:{
+ /* 是否有下载的限制 */
+ hasLimitBool:{
type:Boolean,
required: false,
default:false
@@ -113,7 +113,7 @@ export default {
},
handleDownLoad(file) {
console.log(file)
- if(this.isMeetingDataBool){
+ if(this.hasLimitBool){
// 会议资料更换了接口
downloadFile(`sys/common/userDownload/${file.id}`, file.name)
}else {
@@ -137,5 +137,4 @@ export default {
padding-left: 20px;
}
-
diff --git a/src/views/MessagePage/modules/SignStep.vue b/src/views/MessagePage/modules/SignStep.vue
new file mode 100644
index 0000000..831423f
--- /dev/null
+++ b/src/views/MessagePage/modules/SignStep.vue
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/standardsAssociation/InfoCommunicationMeeting.vue b/src/views/standardsAssociation/InfoCommunicationMeeting.vue
index fe9508e..0cda7e4 100644
--- a/src/views/standardsAssociation/InfoCommunicationMeeting.vue
+++ b/src/views/standardsAssociation/InfoCommunicationMeeting.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/src/views/standardsAssociation/TrainingMeeting.vue b/src/views/standardsAssociation/TrainingMeeting.vue
index 76a101d..e7bb936 100644
--- a/src/views/standardsAssociation/TrainingMeeting.vue
+++ b/src/views/standardsAssociation/TrainingMeeting.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index 77153a6..e250684 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -43,8 +43,10 @@
-
+