确定
取消
@@ -304,16 +177,12 @@ import {httpAction} from '@api/manage'
import pick from 'lodash.pick'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import { queryCompanyInfoById } from '../../../api/api'
-import {LinkTopicsEnums, MeetingTypeEnums, YesOrNoEnums} from '../../../enums/commonEnums'
+import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums'
import WasicTopicData from './modules/wasicStaticData'
-import JImageUpload from '@comp/jero/JImageUpload'
-import JDate from '@comp/tools/JDate'
export default {
name: 'SignUpInfoEdit',
components: {
- JDate,
- JImageUpload,
SelectContacts,
SeminarPartnerForm,
// JDictSelectTag,
@@ -434,8 +303,8 @@ export default {
},
// 海外会议的url
overseasMeetingUrl: {
- add: '',
- edit: ''
+ add: '/meeting/overseasSituation/add',
+ edit: '/meeting/overseasSituation/edit'
},
title:'添加参会人',
// 当前参会企业是否是内部企业
@@ -445,74 +314,7 @@ export default {
// 可选会议名称的数组
linkTopicsOptionArr: [],
// WASIC可选会议的数组-前端写死
- showTopicsArr: [...WasicTopicData],
- /*海外会议start*/
- // 是否需要签证
- isNeedVisa: false,
- // 海外会议表单校验
- overseasRules: {
- photo: {
- rules: [{required: true, message: '请上传照片'}],
- validateTrigger: 'change'
- },
- name: {
- rules: [{required: true, message: '请输入姓名'}],
- validateTrigger: 'blur'
- },
- unit: {
- rules: [{required: true, message: '请输入职务及单位'}],
- validateTrigger: 'blur'
- },
- international: {
- rules: [{required: true, message: '请输入国际'}],
- validateTrigger: 'blur'
- },
- address: {
- rules: [{required: true, message: '请输入地址'}],
- validateTrigger: 'blur'
- },
- email: {
- rules: [{required: true, message: '请输入邮箱'}],
- validateTrigger: 'blur'
- },
- phone: {
- rules: [{required: true, message: '请输入联系电话'}],
- validateTrigger: 'blur'
- },
- needVisa: {
- rules: [{required: true, message: '请选择是否需要签证'}],
- validateTrigger: 'change'
- },
- foreignName: {
- rules: [{required: true, message: '请输入外文姓名'}],
- validateTrigger: 'blur'
- },
- sex: {
- rules: [{required: true, message: '请输入性别'}],
- validateTrigger: 'blur'
- },
- birthday: {
- rules: [{required: true, message: '请输入选择日期'}],
- validateTrigger: 'change'
- },
- nationality: {
- rules: [{required: true, message: '请输入国籍'}],
- validateTrigger: 'blur'
- },
- passportNo: {
- rules: [{required: true, message: '请输入护照号码'}],
- validateTrigger: 'blur'
- },
- entryAndExitDate: {
- rules: [{required: true, message: '请选择出入境日期'}],
- validateTrigger: 'change'
- },
- embassiesAndConsulates: {
- rules: [{required: true, message: '请输入办理签证使领馆'}],
- validateTrigger: 'blur'
- },
- }
- /*海外会议end*/
+ showTopicsArr: [...WasicTopicData]
}
},
created() {
@@ -538,10 +340,6 @@ export default {
},
computed:{
- // 是否海外会议，报名信息调整
- isOverseasMeeting () {
- return this.meetingType + '' === MeetingTypeEnums.overseas.value
- },
// eslint-disable-next-line
url() {
switch (this.$route.query.meetingType) {
@@ -566,14 +364,6 @@ export default {
},
},
methods: {
- // 是否需要签证改变
- changeNeedVisa (val) {
- if (val + '' === YesOrNoEnums.no.value) {
- this.isNeedVisa = true
- } else {
- this.isNeedVisa = false
- }
- },
// 验证选择会议名称的情况
checkChoiceTopic(rules, value, callback) {
console.log(value)
@@ -675,13 +465,6 @@ export default {
if(this.model.id){
this.title = '编辑参会人'
}
- // 海外会议回显单独处理
- if (this.isOverseasMeeting) {
- this.$nextTick(() => {
- this.form.setFieldsValue(this.model)
- })
- return
- }
// 设置编辑的显示隐藏状态
this.identifyType = this.model.identity
this.guestType = this.model.guestType ? this.model.guestType : null
@@ -815,9 +598,7 @@ export default {
if(submitData.companyName) {
submitData.companyName = (submitData.companyName || '').replaceAll(' (未审核)','').replaceAll(' （未审核）','')
}
- if (values.companyId) {
- submitData.companyId = values.companyId.id
- }
+ submitData.companyId = values.companyId.id
// 会议id
submitData.meetingId = this.$route.query.meetingId
// 会议类型
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEditOverseas.vue b/src/views/incomePayments/meetManage/SignUpInfoEditOverseas.vue
new file mode 100644
index 0000000..cbcc6da
--- /dev/null
+++ b/src/views/incomePayments/meetManage/SignUpInfoEditOverseas.vue
@@ -0,0 +1,475 @@
+
+
+
+
+
+
+
+
+ 个人信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index bc532d8..86f39b9 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -61,6 +61,7 @@ import { ACCESS_TOKEN } from '../../../../store/mutation-types'
import { Modal } from 'ant-design-vue'
import store from '@/store'
import { isExternalTerminal } from '../../../../utils/util'
+import {MeetingTypeEnums} from '@/enums/commonEnums'
const FILE_TYPE_ALL = 'all'
const columns = [
@@ -208,6 +209,12 @@ export default {
uploadFile: '/meeting/draftGroupMeeting/uploadFile',
uploadCouncilFile: '/meeting/draftGroupMeeting/uploadCouncilFile',
}
+ // 海外会议
+ case MeetingTypeEnums.overseas.value:
+ return {
+ uploadFile: '/meeting/overseas/uploadFile',
+ uploadCouncilFile: '/meeting/overseas/uploadCouncilFile',
+ }
}
},
handleOk() {
diff --git a/src/views/projectManagement/OverseasMeeting.vue b/src/views/projectManagement/OverseasMeeting.vue
index c7a3863..ebdae2a 100644
--- a/src/views/projectManagement/OverseasMeeting.vue
+++ b/src/views/projectManagement/OverseasMeeting.vue
@@ -74,7 +74,7 @@
导出
批量删除
-
发布
+
发布
@@ -230,21 +230,15 @@ export default {
endKey: 'meetingEndTime'
},
url: {
- list: '/meeting/payMeeting/queryMeetingSummary',
- delete: '',
- deleteBatch: '',
- exportXlsUrl: '',
- importExcelUrl: '',
- releaseMeeingUrl: ''// 发布会议的接口
+ list: '/meeting/overseas/page',
+ delete: '/meeting/overseas/delete',
+ deleteBatch: '/meeting/overseas/deleteBatch',
+ exportXlsUrl: '/meeting/overseas/exportXls',
+ releaseMeeingUrl: '/meeting/overseas/publishReminder'// 发布会议的接口
},
disableMixinCreated: true
}
},
- computed: {
- importExcelUrl: function () {
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
- },
- },
created() {
this.filters.meetingType = MeetingTypeEnums.overseas.value
this.loadData(1)