LK/income_payments_enterprise_terminal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update]-国际研讨会-进一步需求变更的优化

Browse Source
This commit is contained in:
fengchenchen
2023-10-26 16:52:15 +08:00
parent affe24ff12
commit c249b117e0
5 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/dict/JMultiSelectTag.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<a-checkbox-group v-if="tagType=='checkbox'" @change="onChange" :value="arrayValue" :disabled="disabled">
<a-checkbox v-for="item in dictOptions" :key="'a_checkbox_'+ item.value" :value="item.value">{{ item.text || item.label }}</a-checkbox>
<a-checkbox v-for="item in dictOptions" :key="'a_checkbox_'+ item.value" :value="item.value" :disabled="item.disabled">{{ item.text || item.label }}</a-checkbox>
</a-checkbox-group>
<a-select
src/enums/commonEnum.js
+3 -2
View File
@@ -53,7 +53,7 @@ export const InvoiceTypeEnums = {
plain: { name: '增值税普通发票', index: 1 },
special: { name: '增值税专用发票', index: 2 }
}
// 国际研讨会关联课题
// 国际研讨会关联会议
//汽车网络安全与数据安全标准合规专题,
// 智能网汽车标准化领航及标准路线图专题,
// 汽车地毯专题,
@@ -61,5 +61,6 @@ export const InvoiceTypeEnums = {
// 弱势道路交通参与者（VRU）保护专题,
// 免费专题
export const LinkTopicsEnums = {
free: { name: '免费专题', index: 6 }
free: { name: '免费专题', index: 6 },
default: {name: '114/22焦点论坛(默认专题)', index: 99}
}
src/views/MessagePage/MeetingDetailModal.vue
+28 -16
View File
@@ -22,16 +22,23 @@
</a-col>
</a-row>
<!--国际研讨会的判断-是否WASIC-->
<a-row :gutter="24" class="flex-col" v-if="model.meetingType === MeetingTypeEnums.internationalSeminar.index">
<a-col :span="12">
<label>是否WASIC：</label>
<span><j-ellipsis :value="model.isWasic_dictText || '否'" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12" v-if="model.isWasic">
<label>关联课题：</label>
<span><j-ellipsis :value="model.linkTopics_dictText" ></j-ellipsis></span>
</a-col>
</a-row>
<template v-if="model.meetingType === MeetingTypeEnums.internationalSeminar.index">
<a-row :gutter="24" class="flex-col" >
<a-col :span="12">
<label>是否WASIC：</label>
<span><j-ellipsis :value="model.isWasic_dictText || '否'" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<a-row :gutter="24" class="flex-col" v-if="model.isWasic">
<a-col :span="12">
<label>关联会议：</label>
<span>
<span class="block-span" v-for="item in (model.linkTopics_dictText || '').split(',')" :key="item">{{item}}</span>
</span>
</a-col>
</a-row>
</template>
<a-row :gutter="24" class="flex-col">
<a-col :span="12">
<label>召开时间：</label>
@@ -100,11 +107,11 @@
<a-row :gutter="24" class="flex-col">
<!--国际研讨会 且为WASIC-->
<template v-if="Number(model.meetingType) === MeetingTypeEnums.internationalSeminar.index && model.isWasic">
<a-col :xxl="8" :xl="12" :sm="24">
<label>会议费用（2个课题）：</label><span>{{ model.meetingCostsTwoTopic }} 元/人</span>
<a-col :span="12">
<label>114/22焦点论坛+国际发展论坛+ 1个及以下专题研讨：</label><span>{{ model.meetingCostsTwoTopic }} 元/人</span>
</a-col>
<a-col :xxl="8" :xl="12" :sm="24">
<label>会议费用（3个及以上）：</label><span>{{ model.meetingCostsThreeTopic }} 元/人</span>
<a-col :span="12">
<label>114/22焦点论坛+国际发展论坛+ 2个及以上专题研讨：</label><span>{{ model.meetingCostsThreeTopic }} 元/人</span>
</a-col>
</template>
<template v-else>
@@ -213,8 +220,10 @@
<a-row :gutter="24" class="flex-col">
<!--是否为WASIC字段判断-->
<a-col :span="12" v-if="model.isWasic">
<label>课题名称：</label>
<span><j-ellipsis :value="situationInfo.choiceTopic_dictText"></j-ellipsis></span>
<label>会议名称：</label>
<span>
<span class="block-span" v-for="item in (situationInfo.choiceTopic_dictText || '').split(',')" :key="item">{{item}}</span>
</span>
</a-col>
<a-col :span="12">
<label>手机号：</label>
@@ -1271,4 +1280,7 @@ h3.title::before {
.upload-div{
margin-bottom: 10px;
}
.block-span {
display: block;
}
</style>
src/views/signUp/SignUpEntrance.vue
+11 -5
View File
@@ -18,9 +18,9 @@
<label>会议类型：</label>
<span>{{ initMeetingType(currentMeetingInfo.meetingType) }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="flex-col">
<label>会议费用：</label>
<span>{{ meetingMoney }}</span>
<span><span class="word-beak block-span">{{ meetingMoney }}</span></span>
</a-col>
</a-row>
<a-row :gutter="24">
@@ -77,8 +77,10 @@
</a-row>
<a-row :gutter="24" v-if="isWasic">
<a-col :span="24" class="flex-col">
<label style="flex-shrink: 0">关联课题：</label>
<span class="word-beak">{{ currentMeetingInfo.linkTopics_dictText }}</span>
<label style="flex-shrink: 0">关联会议：</label>
<span>
<span class="word-beak block-span" v-for="item in currentMeetingInfo.linkTopics_dictText.split(',')" :key="item">{{item}}</span>
</span>
</a-col>
</a-row>
<a-row :gutter="24">
@@ -214,7 +216,8 @@ export default {
} else if (this.currentMeetingInfo.meetingType === '3' && this.currentMeetingInfo.isWasic){
this.isWasic = true
// 国际研讨会 且为WASIC 会议
this.meetingMoney = `会议费用（2个课题）(${this.currentMeetingInfo.meetingCostsTwoTopic}/人) 会议费用（3个及以上）(${this.currentMeetingInfo.meetingCostsThreeTopic}/人)`
this.meetingMoney = `114/22焦点论坛+国际发展论坛+ 2个及以上专题研讨(${this.currentMeetingInfo.meetingCostsTwoTopic}/人)
114/22焦点论坛+国际发展论坛+ 1个及以下专题研讨(${this.currentMeetingInfo.meetingCostsThreeTopic}/人)`
} else {
this.meetingMoney = ` ${this.currentMeetingInfo.meetingCosts}/人`
}
@@ -368,4 +371,7 @@ export default {
.word-beak {
word-break: break-all;
}
.block-span{
display: block;
}
</style>
src/views/signUp/SignUpPage.vue
+30 -12
View File
@@ -28,9 +28,9 @@
<label>会议类型：</label>
<span>{{ initMeetingType(currentMeetingInfo.meetingType) }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="flex-col">
<label>会议费用：</label>
<span>{{ meetingMoney }}</span>
<span><span class="word-beak block-span">{{ meetingMoney }}</span></span>
</a-col>
</a-row>
<a-row :gutter="24">
@@ -84,8 +84,10 @@
</a-row>
<a-row :gutter="24" v-if="isWasic">
<a-col :span="24" class="flex-col">
<label style="flex-shrink: 0">关联课题：</label>
<span class="word-beak">{{ currentMeetingInfo.linkTopics_dictText }}</span>
<label style="flex-shrink: 0">关联会议：</label>
<span>
<span class="word-beak block-span" v-for="item in currentMeetingInfo.linkTopics_dictText.split(',')" :key="item">{{item}}</span>
</span>
</a-col>
</a-row>
<a-row>
@@ -149,15 +151,15 @@
</a-form-item>
</a-col>
<template v-if="meetingType === '3' ">
<!-- 国际研讨会 WASIC 增加课题名称的选择-->
<!-- 国际研讨会 WASIC 增加会议名称的选择-->
<a-col :xxl="8" :xl="12" :sm="24" v-if="currentMeetingInfo.isWasic">
<a-form-item label="课题名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-multi-select-tag
v-decorator="['choiceTopic',validatorRules.choiceTopic]"
:trigger-change="true"
style="width: 100%"
dict-code="linkTopics"
placeholder="请选择课题名称"
placeholder="请选择会议名称"
type="checkbox"
class="meeting-form-multi-select"
:options="linkTopicsOptionArr"
@@ -306,7 +308,7 @@ export default {
meetingMoney: '',
// 是否为国际研讨会 WASIC会议
isWasic: false,
// 可选课题名称的数组
// 可选会议名称的数组
linkTopicsOptionArr: [],
// 召开时间
holdtime: '',
@@ -339,7 +341,7 @@ export default {
},
choiceTopic: {
rules: [
{required: true, message: '请选择课题名称'},
{required: true, message: '请选择会议名称'},
],
validateTrigger: ['change']
},
@@ -418,6 +420,16 @@ export default {
getLinkTopics({id: this.meetingId}).then(res =>{
if(res.success) {
this.linkTopicsOptionArr = res.result || []
// 操作默认的课题，默认的课题不能删除
this.linkTopicsOptionArr.map(item => {
if((item.value + '') === (LinkTopicsEnums.default.index + '')) {
item.disabled = true
}
})
// 给Form赋值
this.form.setFieldsValue({
choiceTopic: LinkTopicsEnums.default.index + ''
})
}
})
},
@@ -439,7 +451,9 @@ export default {
} else if (this.currentMeetingInfo.meetingType === '3' && this.currentMeetingInfo.isWasic){
// 国际研讨会 且为WASIC 会议
this.isWasic = true
this.meetingMoney = `会议费用（2个课题）(${this.currentMeetingInfo.meetingCostsTwoTopic}/人) 会议费用（3个及以上）(${this.currentMeetingInfo.meetingCostsThreeTopic}/人)`
this.meetingCostSum = this.currentMeetingInfo.meetingCostsTwoTopic
this.meetingMoney = `114/22焦点论坛+国际发展论坛+ 2个及以上专题研讨(${this.currentMeetingInfo.meetingCostsTwoTopic}/人)
114/22焦点论坛+国际发展论坛+ 1个及以下专题研讨(${this.currentMeetingInfo.meetingCostsThreeTopic}/人)`
this.getLinkTopicsOptionArr()
} else {
this.meetingMoney = `${this.currentMeetingInfo.meetingCosts}/人`
@@ -628,7 +642,7 @@ export default {
this.meetingCostSum = '0.00'
}else {
this.meetingCostSum = this.currentMeetingInfo.meetingCosts
// TODO 如果当前是WASIC会议 则需要通过课题名称判断会议的费用
// TODO 如果当前是WASIC会议 则需要通过会议名称判断会议的费用
if(this.isWasic) {
if(this.choiceTopicArr.length > 2) {
this.meetingCostSum = this.currentMeetingInfo.meetingCostsThreeTopic
@@ -1022,6 +1036,9 @@ export default {
.word-beak {
word-break: break-all;
}
.block-span{
display: block;
}
.flex-col {
display: flex;
@@ -1044,13 +1061,14 @@ export default {
}
// 国际研讨会-关联课题 多选样式的修改
// 国际研讨会-关联会议 多选样式的修改
.meeting-form-multi-select{
/deep/.ant-checkbox-wrapper + .ant-checkbox-wrapper {
margin-left: 0!important;
}
/deep/ .ant-checkbox-wrapper{
margin-right: 8px;
display: block;
}
}
</style>