957 修改

src/components/calendar.vue

@@ -388,6 +388,23 @@ export default {
                 content:`${CooperationName}`,
                 RoadshowType:RoadshowType
             }].filter(item=>item.RoadshowType===RoadshowType)
+         const SalonContent = [
+            {
+                key:'RoadshowPlatform',
+                label:'会议平台：',
+                content:`${RoadshowPlatform}`,
+                RoadshowType:'线上'
+            },{
+                key:'RoadshowCity',
+                label:'会议城市：',
+                content:`${Province}${City}`,
+                RoadshowType:'线下'
+            },{
+                key:'Theme',
+                label:'会议主题：',
+                content:`${Theme}`,
+                RoadshowType:RoadshowType
+            }].filter(item=>item.RoadshowType===RoadshowType)
         ////ActivityType不为空时，需要显示的内容
         const {ResearcherName,SysUserRealName} = this.selectEventInfo
         const SuppleContent=[{
@@ -415,6 +432,7 @@ export default {
         const contentMap = {
             '路演':RoadshowContent,
             '公开会议':MeetingContent,
+            '沙龙':SalonContent,
         }
         if(ActivityType){
             this.popContentArr = [...popContent,...contentMap[ActivityType]||[],...SuppleContent]

src/views/roadshow_manage/compononts/addActivityBtnDia.vue

@@ -683,7 +683,7 @@ export default {
       if(this.edit_id){
         this.$message.warning('提交成功')
       }else{
-        if(this.formData.activityType!=='路演'){
+        if(this.formData.activityType!=='路演'&& this.formData.activityType!=='沙龙' ){
             confirmDiaLink(text, content, query)
             this.$emit('ensureCallback');
             this.cancel();

src/views/roadshow_manage/compononts/addActivityCellDia.vue

@@ -627,7 +627,7 @@ export default {
       if(this.edit_id){
         this.$message.warning('提交成功')
       }else{
-        if(this.formData.activityType!=='路演'){
+        if(this.formData.activityType!=='路演' && this.formData.activityType!=='沙龙'){
             confirmDiaLink(text, content, query)
             this.$emit('ensureCallback');
             this.cancel();

src/views/roadshow_manage/roleConfig/mixins.js

@@ -71,8 +71,8 @@ export default {
           },
         }
 		case '沙龙' : return {
-			text: '活动申请已提交，请等待研究员处理',
-			content: `可前往【我的日历】-【待处理申请】查看`,
+			text: '研究员日程已添加成功',
+			content: `可前往【研究员日历】查看`,
 			query: {
 			  act_tab: 1
 			},