diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 5e2e1ea..0d09db4 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -343,7 +343,8 @@
批量设置资料状态
-
+
+
批量审核报名信息
@@ -487,7 +488,7 @@ import StatusSlot from '@comp/tools/StatusSlot'
import PreviewFile from '@comp/jero/PreviewFile'
import JImageUpload from '@comp/jero/JImageUpload'
import SetGuessUploadFlagModal from './modules/SetGuessUploadFlagModal'
-import { downloadFile, postAction } from '../../../api/manage'
+import { downloadFile } from '../../../api/manage'
import WasicTopicData from './modules/wasicStaticData'
import { formatMoney } from '@/utils/formatMoney'
import {getPayConfirmList} from '@api/incomePaymentsApi'
@@ -513,6 +514,7 @@ export default {
},
data() {
return {
+ MeetingTypeEnums,
description: '参会情况',
columns: [
{
@@ -836,9 +838,7 @@ export default {
delete: '/meeting/workGroupMeetingSituation/delete',
deleteBatch: '/meeting/workGroupMeetingSituation/deleteBatch',
exportXlsUrl: '/meeting/workGroupMeetingSituation/exportXls',
- importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel',
- // 批量审核报名信息
- checkSignUpBatch: '/meeting/workGroupMeetingSituation/checkRegister',
+ importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel'
},
// 理事会的url
councilMeetingUrl: {
@@ -854,9 +854,7 @@ export default {
delete: '/meeting/draftGroupMeetingSituation/delete',
deleteBatch: '/meeting/draftGroupMeetingSituation/deleteBatch',
exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls',
- importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel',
- // 批量审核报名信息
- checkSignUpBatch: '/meeting/workGroupMeetingSituation/checkRegisterBatch',
+ importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel'
},
// 海外会议的url
overseasMeetingUrl: {
@@ -1333,36 +1331,17 @@ export default {
this.$message.warn('只有待审核信息才可批量审核报名信息')
return
}
- console.log(2, flag)
+
const that = this
- let ids = ''
- for (let a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ','
- }
+ let ids = this.selectedRowKeys.join(',')
this.$confirm({
title: '确认审核',
content: '是否确定批量审核报名信息?',
onOk: function () {
- that.loading = true
- if(!that.url.checkSignUpBatch) return
- postAction(that.url.checkSignUpBatch, {ids: ids}).then((res) => {
- if (res.success) {
- that.$message.success(res.message)
- that.loadData()
- that.onClearSelected()
- } else {
- if (res.message.indexOf('
') > -1) {
- that.messageLineFeed('审核失败', res.message)
- } else {
- that.$message.warning(res.message)
- }
- }
- }).finally(() => {
- that.loading = false
- })
+ that.$refs.auditModal.title = '审核报名信息'
+ that.$refs.auditModal.open({ batch: true, ids }, true)
}
})
- // this.$refs.setGuessUploadFlagModal.showBatch(this.selectedRowKeys)
},
}
diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index 3a07217..c04e5ef 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -8,7 +8,7 @@
@cancel="handleCancel"
cancelText="关闭">
-
+
报名信息
@@ -185,7 +185,9 @@ export default {
// 审核凭证
check: '/meeting/workGroupMeetingSituation/check',
// 审核报名信息
- checkSignUp: '/meeting/workGroupMeetingSituation/checkRegister'
+ checkSignUp: '/meeting/workGroupMeetingSituation/checkRegister',
+ // 批量审核报名信息
+ checkSignUpBatch: '/meeting/workGroupMeetingSituation/checkRegisterBatch',
},
// 分标委会议url
committeeMeetingUrl: {
@@ -220,12 +222,16 @@ export default {
// 审核凭证
check: '/meeting/draftGroupMeetingSituation/check',
// 审核报名信息
- checkSignUp: '/meeting/draftGroupMeetingSituation/checkRegister'
+ checkSignUp: '/meeting/draftGroupMeetingSituation/checkRegister',
+ // 批量审核报名信息
+ checkSignUpBatch: '/meeting/draftGroupMeetingSituation/checkRegisterBatch',
},
// 审核结果选择
checkBool: false,
// 是否是审核报名信息
checkSignBool: false,
+ // 是否批量 核查报名信息
+ batchCheckSignUp: false,
// 参会人id
signUpPersonId: '',
}
@@ -238,12 +244,23 @@ export default {
}
},
methods: {
+ /*
+ * record- 审核参数
+ * signUp- 是否审核报名信息
+ * */
open(record, signUp) {
this.form.resetFields()
- this.signUpPersonId = this.situationId ? this.situationId : record.id
// 控制行程信息显示 审核凭证不显示
this.checkSignBool = signUp || false
let meetingType = this.meetingType ? this.meetingType+'' :this.$route.query.meetingType
+ this.signUpPersonId = this.situationId ? this.situationId : record.id
+ // 判断是否为工作组的批量审批功能,批量审批record 的参数 batch= true; ids 存储多条数据
+ if(signUp && record.batch && record.ids) {
+ this.model = Object.assign({}, record)
+ this.batchCheckSignUp = true
+ } else {
+ this.batchCheckSignUp = false
+ }
// 到账开票
if(record.type && record.type === 'kp' ){
meetingType = record.meetingType + ''
@@ -268,17 +285,24 @@ export default {
this.form.validateFields((err, values) => {
if (!err) {
that.confirmLoading = true
+ const formData = Object.assign({}, values)
let httpurl = ''
if (that.checkSignBool) {
- // 审核报名信息的接口
- httpurl = this.url.checkSignUp
+ if(this.batchCheckSignUp) {
+ // 批量 审核报名信息的接口
+ httpurl = this.url.checkSignUpBatch
+ formData.ids = this.model.ids
+ } else {
+ // 审核报名信息的接口
+ httpurl = this.url.checkSignUp
+ formData.id = this.model.id
+ }
} else {
// 审核凭证的接口
httpurl = this.url.check
+ formData.id = this.model.id
}
let method = 'post'
- const formData = Object.assign({}, values)
- formData.id = this.model.id
httpAction(httpurl, formData, method).then((res) => {
if (res.success) {
that.$message.success(res.message)