diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 6df5174..a03e814 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -167,6 +167,8 @@ const workingGroupEditAccount = (param) => getAction('/project/payWorkingGroupSu
const getAllDraftProjects = (params) => getAction('/drafting/payDraftingGroup/listAll', params)
// 企业管理-单位/开票信息-更改是否打包企业
const updatePackageEnterprise = (params) => postAction('/company/payCompanyManagement/updatePackageEnterprise', params)
+// 判断是否打包企业
+const judgeCompanyIsPackaged = (params) => getAction('/company/payCompanyManagement/judgeCompanyIsPackaged', params)
export {
getWorkingGroupById,
@@ -254,5 +256,6 @@ export {
workingGroupEditAccount,
getAllDraftProjects,
- updatePackageEnterprise
+ updatePackageEnterprise,
+ judgeCompanyIsPackaged
}
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 234dd98..efee05d 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -55,4 +55,11 @@ export const IncomeMethod = {
export const YesOrNoEnums = {
yes: { name: '是', value: '1'},
no: { name: '否', value: '0'},
+}
+
+// 缴费方式
+export const PayMode = {
+ remittance: { name: '汇款', value: 1 },
+ onSitePayment: { name: '现场缴费', value: 2 },
+ pack: { name: '打包', value: 3 },
}
\ No newline at end of file
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index 1f653da..a0c848c 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -10,7 +10,7 @@
@change="changePayMode">
汇款
现场缴费(仅支持扫码支付)
- 打包
+ 打包
@@ -242,6 +242,12 @@ export default {
meetingCostBool: {
type: Boolean,
required: false,
+ },
+ // 是否打包企业
+ isPackEnterprise: {
+ type: Boolean,
+ required: false,
+ default: false
}
},
data() {
@@ -446,7 +452,12 @@ export default {
clearFormItem() {
this.form.resetFields(['postContactId', 'postContactAddress', 'postCode'])
},
-
+ /**
+ * 清空缴费方式
+ */
+ clearPayMode () {
+ this.form.resetFields(['payMode'])
+ },
/*
* 选择了联系人后给邮寄联系人和地址赋值
* */
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index 2f8bfcf..69c5077 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -104,12 +104,14 @@
@@ -162,7 +164,7 @@ import SeminarPartnerForm from '@views/incomePayments/meetManage/modules/Seminar
import AddMeetingCompany from '@comp/company/AddMeetingCompany'
import {getContactsById} from '@api/api'
import {getSingUpUserInfo, validateStandard, getMeetInfoById, getLinkTopics} from '@api/incomeMeetingApi'
-import { judgeInternalEnterprise } from '../../../api/incomePaymentsApi'
+import {judgeCompanyIsPackaged, judgeInternalEnterprise} from '../../../api/incomePaymentsApi'
import {httpAction} from '@api/manage'
import pick from 'lodash.pick'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
@@ -290,6 +292,8 @@ export default {
title:'添加参会人',
// 当前参会企业是否是内部企业
isInternalEnterprise: false,
+ // 当前参会企业是否是打包企业
+ isPackEnterprise: false,
// 可选会议名称的数组
linkTopicsOptionArr: [],
// WASIC可选会议的数组-前端写死
@@ -696,6 +700,23 @@ export default {
console.log('-----this.selectedCompany-----', this.selectedCompany)
this.judgeInternalEnterprise(this.selectedCompany.id)
+ // 判断当前企业是否是打包企业
+ this.judgeCompanyIsPackaged(this.selectedCompany.id)
+ },
+ /**
+ * 判断当前的企业是否是打包企业,如果是修改isPackEnterprise
+ */
+ judgeCompanyIsPackaged (id) {
+ judgeCompanyIsPackaged({ companyId: id }).then(res => {
+ if (res.success) {
+ this.isPackEnterprise = res.result
+ }
+ }).finally(() => {
+ // 清空已选的缴费方式
+ if (this.$refs.formother) {
+ this.$refs.formother.clearPayMode()
+ }
+ })
},
/*
* 选择联系人获取信息