完善我的日历 修改弹框

src/views/roadshow_manage/compononts/addActivityCellDia.vue

@@ -34,7 +34,6 @@
               expandTrigger: 'hover',
               children: 'ResearcherList',
               emitPath: false,
-              multiple:true,
             }"
             clearable
             placeholder="请选择研究员"
@@ -407,7 +406,7 @@
       </el-form>
       <div class="btn-group">
         <el-button type="primary" plain @click="cancel">取消</el-button>
-        <el-button type="primary" @click="confirm">确定1111</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -754,8 +753,6 @@ export default {
     // 默认数据改变时,重新赋值
     initData(val){
       this.formData={...this.formData,...val}
-      console.log(this.formData);
-      
     },
     isShow(newval) {
       newval && this.getResearcherList();

src/views/roadshow_manage/myCalendar.vue

@@ -580,10 +580,14 @@ export default {
 
     /* 编辑活动 或事项 */
     editActivityHandle(row) {
+      //编辑活动
       this.isRaiEditType ='RaiEdit'
       if(this.default_tab==5){
         this.editMatterHandle(row);
       }else{
+        if(!row.RsMattersId && row.ActivityType === '内部会议') {
+           this.resubmitData = this.editInfoBack(row,2);
+        } 
         this.raiEditMatterHandle(row)
       }
     },
@@ -699,11 +703,11 @@ export default {
                   partnersName: CooperationName, // 合作方名称
                   activityClass: ActivityCategory, // 活动类别
                   District: District || '',
-
+                  
                   selectResearchers: [
                     // 选择的研究员
                     {
-                      researcherId: ResearcherId.length > 1 ? ResearcherId.split(',').map(item => Number(item)) : Number(ResearcherId),
+                      researcherId: ResearcherId.split(',').length > 1 ? ResearcherId.split(',').map(item => Number(item)) : Number(ResearcherId),
                       startDate: new Date(StartDate),
                       startTime: new Date(`${StartDate} ${StartTime}`),
                       endDate: new Date(EndDate),
@@ -711,9 +715,13 @@ export default {
                     },
                   ],
                 };
-                this.edit_id = RsCalendarId;
-                this.edit_rs_id = RsCalendarResearcherId;
-                this.isActivityCellDiaShow = true;
+        this.edit_id = RsCalendarId;
+        this.edit_rs_id = RsCalendarResearcherId;
+        if(!RsMattersId && ActivityType === '内部会议') {
+          this.isActivityBtnDiaShow = true;
+        }else {
+          this.isActivityCellDiaShow = true;
+        }
     },
     /* 编辑事项 */
     editMatterHandle({ RsMattersId,StartDate,StartTime,EndDate,EndTime,MatterContent }) {