冲突解决

src/views/rai_manage/activityManage/applyManage.vue

@@ -207,7 +207,7 @@ export default {
       this.tableApplyColums = TableApplyColums(item.ChartPermissionId);
       this.cactivityTypeVal = "";
       this.isResearchPoints = false;
-      this.tabsSelectionOne = item.ChartPermissionId == 2 ? false : true;
+      this.tabsSelectionOne = item.ChartPermissionId == 2 || item.ChartPermissionId == 5 ? false : true;
       this.page_no = 1;
       this.getsDataList();
     },
@@ -403,7 +403,7 @@ export default {
         let status = row[key] == 1 ? "未开始" : row[key] == 2 ? "进行中" : "已结束";
         return status;
       } else if (key == "PublishStatus") {
-        let status = row["PublishStatus"] == 1 ? "已发布" : "未发布";
+        let status = row["PublishStatus"] == 1 ? "已发布" : row["PublishStatus"] == 2 ?"未发布":"已取消";
         return status;
       } else {
         return row[key];