diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index ed0a154..778bd24 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -347,7 +347,6 @@ import {httpAction} from '@api/manage'
import JDictSelectTag from '@comp/dict/JDictSelectTag'
import JYearDate from '@comp/jero/JYearDate'
import JUpload from '@comp/jero/JUpload'
-// import JDate from "@comp/tools/JDate";
import JDate from '@comp/jero/JDate'
import SelectPrincipal from '@comp/company/SelectPrincipal'
import JAreaLinkage from '@comp/jero/JAreaLinkagePca'
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 310e7e3..01efef8 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -175,7 +175,7 @@
导出
批量删除
-
+
设置对接人
@@ -368,7 +368,7 @@ export default {
title: '操作',
align: 'center',
fixed: 'right',
- width: 160,
+ width: 300,
scopedSlots: {customRender: 'action'}
},
],
@@ -435,13 +435,14 @@ export default {
* 审核
* */
handleAudit(record) {
- this.$refs.auditModal.open(record)
+ this.$refs.auditModal.open(record,false)
},
/*
* 审核报名信息
* */
handleAuditSignUp(record){
- console.log('审核报名信息',record)
+ this.$refs.auditModal.title='审核报名信息'
+ this.$refs.auditModal.open(record,true)
},
/*
* 导入参会人
diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index 267ac1e..61fdc8f 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -29,11 +29,11 @@
{{model.identity_dictText}}
-
-
+
+
{{model.checkInHotel_dictText}}
-
+
{{model.arrivalTime}}
@@ -150,16 +150,23 @@ export default {
}
},
url: {
+ // 审核凭证
check: '/meeting/payMeetingSituation/check',
+ // 审核报名信息
+ checkSignUp:''
},
// 审核结果选择
- checkBool:false
+ checkBool:false,
+ // 是否是审核报名信息
+ checkSignBool:false
}
},
methods: {
- open(record) {
+ open(record,signUp) {
this.form.resetFields()
this.visible = true
+ // 控制行程信息显示 审核凭证不显示
+ this.checkSignBool = signUp
this.model = Object.assign({}, record)
console.log(record)
},
@@ -172,7 +179,15 @@ export default {
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
- let httpurl = this.url.check
+ that.confirmLoading = true
+ let httpurl = ''
+ if(that.checkSignBool){
+ // 审核报名信息的接口
+ httpurl = this.url.check
+ }else {
+ // 审核凭证的接口
+ httpurl = this.url.checkSignUp
+ }
let method = 'post'
const formData = Object.assign({}, values)
formData.id = this.model.id
@@ -180,6 +195,7 @@ export default {
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
+ that.confirmLoading = false
that.close()
} else {
that.$message.warning(res.message)