Merge branch 'master' into crm_16.2.1

src/views/rai_manage/cygxManage/applyUserList.vue

@@ -65,7 +65,8 @@
         </el-table-column>
         <el-table-column prop="Title" label="申请内容" min-width="130" align="center">
           <template slot-scope="scope">
-            <span class="editsty" @click="applicationContent(scope.row)">{{ scope.row.Title }}</span>
+            <span v-if="scope.row.IsGray">{{ scope.row.Title }}</span>
+            <span v-else class="editsty" @click="applicationContent(scope.row)">{{ scope.row.Title }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="110">
@@ -196,7 +197,6 @@ export default {
     // 申请内容
     applicationContent(item) {
       window.open(item.HttpUrl, "_blank");
-      console.log(item);
     },
   },
   created() {},

src/views/rai_manage/reportManage/appletsReport.vue

@@ -549,8 +549,7 @@ export default {
     //文章详情
     async lookDetail(item) {
       if (item.PublishStatus === 1) {
-        let href = `${process.env.CYGX_WEB}/material/info/${item.ArticleId}`;
-        window.open(href, "_blank");
+        window.open(item.HttpUrl, "_blank");
       } else {
         const res = await raiInterface.reportArticleDetail({ ArticleId: item.ArticleId });
         if (res.Ret === 200) {

src/views/roadshow_manage/compononts/addActivityCellDia.vue

@@ -29,7 +29,7 @@
             v-model="formData.selectResearchers[0].researcherId"
             :options="researcherList"
             :show-all-levels="false"
-            disabled
+            :disabled="isEditType !='RaiEdit'"
             :props="{
               expandTrigger: 'hover',
               children: 'ResearcherList',
@@ -116,6 +116,7 @@
           <el-select
             v-model="formData.activityType"
             placeholder="请选择活动类型"
+            :disabled="isEditType =='RaiEdit'"
             @change="activityTypeChange"
           >
             <el-option
@@ -459,6 +460,10 @@ export default {
     edit_rs_id: {
       type: Number,
       default: 0,
+    },
+    isEditType:{
+      type: String,
+      default: '',
     }
   },
   mixins: [publicMixins],

src/views/roadshow_manage/myCalendar.vue

@@ -155,6 +155,11 @@
             </template>
             <!-- 提交/查看参会名单 按钮由后端控制 -->
             <template v-if="default_tab===2">
+              <span
+                  class="editsty"
+                  v-if="row.EditButton"
+                  @click="editActivityHandle(row)"
+                  >修改</span>
                   <span 
                     class="deletesty"
                     v-if="row.SubmitButton"
@@ -230,6 +235,7 @@
       :edit_rs_id="edit_rs_id"
       @ensureCallback="refreshData"
       ref="addActivityCellDia"
+      :isEditType='isRaiEditType'
     />
 
 
@@ -409,6 +415,7 @@ export default {
       },
       isReasonDiaShow:false,
       currentResearcherId:0,
+      isRaiEditType:''
     };
   },
   methods: {
@@ -573,7 +580,9 @@ export default {
 
     /* 编辑活动 或事项 */
     editActivityHandle(row) {
-
+      this.isRaiEditType ='RaiEdit'
+      this.raiEditMatterHandle(row)
+      return
       const { RsCalendarId,RsCalendarResearcherId,RsMattersId,MatterContent,StartDate,StartTime,EndTime,EndDate } = row;
       //编辑活动
       if(!RsMattersId) {
@@ -676,39 +685,42 @@ export default {
     /* 日历入口 编辑活动时 回显内容 */
     editCallback({ ActivityType,RoadshowType,RoadshowPlatform,City,Province,CompanyId,CompanyName,ResearcherId,RsCalendarResearcherId,Theme,CooperationName,ActivityCategory,StartDate,EndDate,RsCalendarId,RsMattersId,StartTime,EndTime,MatterContent,EnglishCompany}) {
       if(RsCalendarId) { // 编辑活动
-        this.sonData = {
-          activityType: ActivityType, // 活动类型
-          roadshowType: RoadshowType, // 路演形式
-          roadshowPlatform: RoadshowPlatform, // 路演平台
-          roadshowCity: Province ? [Province,City] : [], // 路演城市
-          companyId: CompanyId, // 客户id
-          companyName: CompanyName, // 客户名称
-          englishCompany:EnglishCompany,// 是否是海外客户
-          meetingType: RoadshowType, // 会议形式
-          meetingPlatform: RoadshowPlatform, // 会议平台
-          meetingCity: Province ? [Province,City] : [], // 会议城市
-          meetingTheme: Theme, // 会议主题
-          partnersName: CooperationName, // 合作方名称
-          activityClass: ActivityCategory, // 活动类别
-          selectResearchers: [
-            // 选择的研究员
-            {
-              researcherId: Number(ResearcherId),
-              startDate: new Date(StartDate),
-              startTime: new Date(`${StartDate} ${StartTime}`),
-              endDate: new Date(EndDate),
-              endTime: new Date(`${EndDate} ${EndTime}`),
-            },
-          ],
-        };
-        this.edit_id = RsCalendarId;
-        this.edit_rs_id = RsCalendarResearcherId;
-        this.isActivityCellDiaShow = true;
+       this.raiEditMatterHandle({ActivityType,RoadshowType,RoadshowPlatform,City,Province,CompanyId,CompanyName,ResearcherId,RsCalendarResearcherId,Theme,CooperationName,ActivityCategory,StartDate,EndDate,RsCalendarId,RsMattersId,StartTime,EndTime,MatterContent,EnglishCompany})
       }else { //编辑事项
         this.editMatterHandle({ RsMattersId,StartDate,StartTime,EndDate,EndTime,MatterContent });
       }
     },
 
+    raiEditMatterHandle({ ActivityType,RoadshowType,RoadshowPlatform,City,Province,CompanyId,CompanyName,ResearcherId,RsCalendarResearcherId,Theme,CooperationName,ActivityCategory,StartDate,EndDate,RsCalendarId,RsMattersId,StartTime,EndTime,MatterContent,EnglishCompany}){
+        this.sonData = {
+                  activityType: ActivityType, // 活动类型
+                  roadshowType: RoadshowType, // 路演形式
+                  roadshowPlatform: RoadshowPlatform, // 路演平台
+                  roadshowCity: Province ? [Province,City] : [], // 路演城市
+                  companyId: CompanyId, // 客户id
+                  companyName: CompanyName, // 客户名称
+                  englishCompany:EnglishCompany,// 是否是海外客户
+                  meetingType: RoadshowType, // 会议形式
+                  meetingPlatform: RoadshowPlatform, // 会议平台
+                  meetingCity: Province ? [Province,City] : [], // 会议城市
+                  meetingTheme: Theme, // 会议主题
+                  partnersName: CooperationName, // 合作方名称
+                  activityClass: ActivityCategory, // 活动类别
+                  selectResearchers: [
+                    // 选择的研究员
+                    {
+                      researcherId: Number(ResearcherId),
+                      startDate: new Date(StartDate),
+                      startTime: new Date(`${StartDate} ${StartTime}`),
+                      endDate: new Date(EndDate),
+                      endTime: new Date(`${EndDate} ${EndTime}`),
+                    },
+                  ],
+                };
+                this.edit_id = RsCalendarId;
+                this.edit_rs_id = RsCalendarResearcherId;
+                this.isActivityCellDiaShow = true;
+    },
     /* 编辑事项 */
     editMatterHandle({ RsMattersId,StartDate,StartTime,EndDate,EndTime,MatterContent }) {
       this.edit_matter_id = RsMattersId;

src/views/roadshow_manage/roleConfig/myCalendarConfig.js

@@ -164,6 +164,11 @@ export const tableColums = (type) => {
 			hidden: !ENUM_RESEARCHLIST.includes(role),
 			// widthsty: '100px',
 		},
+		{
+			label: '提交人',
+			key: 'SysUserRealName',
+			// widthsty: '100px',
+		},
 	] : type === 3 ? [
 		{
 			label: '活动时间',