Merge branch 'debug' of http://8.136.199.33:3000/hongze/hz_crm_web into debug

src/views/roadshow_manage/myCalendar.vue

@@ -581,7 +581,11 @@ export default {
     /* 编辑活动 或事项 */
     editActivityHandle(row) {
       this.isRaiEditType ='RaiEdit'
-      this.raiEditMatterHandle(row)
+      if(this.default_tab==5){
+        this.editMatterHandle(row);
+      }else{
+        this.raiEditMatterHandle(row)
+      }
     },
 
     // 删除弹窗取消操作