Merge branch '24年6月17日国际研讨会'

src/enums/commonEnums.js

@@ -62,4 +62,15 @@ export const PayMode = {
   remittance: { name: '汇款', value: 1 },
   onSitePayment: { name: '现场缴费', value: 2 },
   pack: { name: '打包', value: 3 },
+}
+
+// 会议类型
+export const MeetingTypeEnums = {
+  workGroup: { name: '工作组会议', value: '1' },
+  standard: { name: '标协会议', value: '2' },
+  internationalSeminar: { name: '国际研讨会', value: '3' },
+  other: { name: '其他会议', value: '4' },
+  committee: { name: '分标委会议', value: '5' },
+  council: { name: '理事会会议', value: '6' },
+  draftGroup: { name: '起草会会议', value: '7' }
 }

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -630,7 +630,7 @@ import JImageUpload from '@comp/jero/JImageUpload'
 import {checkMeetingName} from '@/utils/validateOnly'
 import {addZero} from '@/utils/util'
 import {money, phoneReg} from '@/utils/validate'
-import { LinkTopicsEnums } from '../../../enums/commonEnums'
+import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums'
 
 
 export default {
@@ -1187,7 +1187,8 @@ export default {
     * 添加会议联系人
     * */
     addMeetingContacts(index) {
-      if (this.model.meetingContactsList.length >= 5) {
+      // 国际研讨会不限制5个会议联系人
+      if ((this.meetingType !== MeetingTypeEnums.internationalSeminar.value) && (this.model.meetingContactsList.length >= 5)) {
         this.$message.warning('最多添加5个会议联系人')
         return
       }

src/views/incomePayments/meetManage/SignUpInfoEdit.vue

@@ -18,7 +18,7 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
+          <a-row :gutter="24" type="flex">
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <select-contacts :selected-company="selectedCompany"
@@ -42,6 +42,15 @@
               </a-form-item>
             </a-col>
 
+            <!--国际研讨会-职务-->
+            <a-col :xxl="8" :xl="12" :sm="24" v-if="meetingType === MeetingTypeEnums.internationalSeminar.value ">
+              <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入职务"
+                         :maxLength='50'
+                         v-decorator="['post',validatorRules.post]"></a-input>
+              </a-form-item>
+            </a-col>
+
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <!--内部企业的时候不允许进行修改参会身份-->
@@ -169,7 +178,7 @@ import {httpAction} from '@api/manage'
 import pick from 'lodash.pick'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import { queryCompanyInfoById } from '../../../api/api'
-import { LinkTopicsEnums } from '../../../enums/commonEnums'
+import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums'
 import WasicTopicData from './modules/wasicStaticData'
 
 export default {
@@ -185,6 +194,7 @@ export default {
   },
   data() {
     return {
+      MeetingTypeEnums,
       description: '报名信息编辑页',
       form: this.$form.createForm(this),
       confirmLoading: false,
@@ -233,8 +243,11 @@ export default {
         guestType:{
           rules: [{required: true, message: '请选择嘉宾类型'}],
           validateTrigger: 'change'
+        },
+        post: {
+          rules: [{required: true, message: '请输入职务'}],
+          validateTrigger: 'blur'
         }
-
       },
       // 身份类型
       identifyType: null,