Merge branch 'xqc_994' into debug

src/views/roadshow_manage/compononts/addParticipateDia.vue

@@ -72,6 +72,10 @@ export default {
       type: String,
       default: "",
     },
+    addRoadShowTheme: {
+      type: String,
+      default: "",
+    },
   },
   watch: {
     isAddParticipateShow(newval) {
@@ -169,14 +173,14 @@ export default {
     confirmPerson() {
       //校验
       const useId = this.dynamicItem.map((i) => i.id).filter((i) => i);
-      if (!this.roadShowTheme && this.isType !== '查看') return this.$message.error("请输入路演主题名称");
+      if (!this.roadShowTheme && this.isType !== "查看") return this.$message.error("请输入路演主题名称");
       if (!useId.length) return this.$message.error("请输入姓名");
       roadshowInterence
         .addMeetingUser({
           RsCalendarId: this.RsCalendarId,
           UserId: useId,
           TagList: this.tagList,
-          RoadShowTheme: this.roadShowTheme,
+          RoadShowTheme: this.roadShowTheme || this.addRoadShowTheme,
         })
         .then((res) => {
           if (res.Ret !== 200) return;

src/views/roadshow_manage/compononts/showParticipateListDia.vue

@@ -43,6 +43,7 @@
       :isAddParticipateShow="isAddShow"
       :RsCalendarId="RsCalendarId"
       isType="查看"
+      :addRoadShowTheme="roadShowTheme"
       @close="isAddShow = false"
       @confirm="
         getTableData();