Merge branch 'ssbg_2.1' into debug

src/views/roadshow_manage/compononts/addActivityCellDia.vue

@@ -167,6 +167,9 @@
             hide-area
           ></v-distpicker> -->
           <search-dist-picker 
+            :provinceInfo="formData.roadshowCity[0]"
+            :cityInfo="formData.roadshowCity[1]"
+            :areaInfo="formData.District||''"
             :showArea="isRaiRole"
             @selected="onChangeCity($event,'roadshow')"/>
         </el-form-item>

src/views/roadshow_manage/myCalendar.vue

@@ -582,18 +582,6 @@ export default {
     editActivityHandle(row) {
       this.isRaiEditType ='RaiEdit'
       this.raiEditMatterHandle(row)
-      return
-      const { RsCalendarId,RsCalendarResearcherId,RsMattersId,MatterContent,StartDate,StartTime,EndTime,EndDate } = row;
-      //编辑活动
-      if(!RsMattersId) {
-        this.resubmitData = this.editInfoBack(row,2);
-        this.edit_id = RsCalendarId;
-        this.edit_rs_id = RsCalendarResearcherId;
-        this.isActivityBtnDiaShow = true;
-      } else {
-        //编辑事项
-        this.editMatterHandle({ RsMattersId,StartDate,StartTime,EndDate,EndTime,MatterContent });
-      }
     },
 
     // 删除弹窗取消操作
@@ -691,7 +679,7 @@ export default {
       }
     },
 
-    raiEditMatterHandle({ ActivityType,RoadshowType,RoadshowPlatform,City,Province,CompanyId,CompanyName,ResearcherId,RsCalendarResearcherId,Theme,CooperationName,ActivityCategory,StartDate,EndDate,RsCalendarId,RsMattersId,StartTime,EndTime,MatterContent,EnglishCompany}){
+    raiEditMatterHandle({ ActivityType,RoadshowType,RoadshowPlatform,City,Province,CompanyId,CompanyName,ResearcherId,RsCalendarResearcherId,Theme,CooperationName,ActivityCategory,StartDate,EndDate,RsCalendarId,RsMattersId,StartTime,EndTime,MatterContent,EnglishCompany,District=''}){
         this.sonData = {
                   activityType: ActivityType, // 活动类型
                   roadshowType: RoadshowType, // 路演形式
@@ -706,6 +694,8 @@ export default {
                   meetingTheme: Theme, // 会议主题
                   partnersName: CooperationName, // 合作方名称
                   activityClass: ActivityCategory, // 活动类别
+                  District: District || '',
+
                   selectResearchers: [
                     // 选择的研究员
                     {