查研观向11.0 联调

src/views/rai_manage/activityManage/activityManage.vue

@@ -14,7 +14,7 @@
           >
         </div>
         <div>
-          <el-button type="primary" @click="$router.push(routePath=='hongze'?'/addActivity':'/addPurchaserActivity')">添加活动</el-button>
+          <el-button type="primary" @click="$router.push(!isResearch?'/addActivity':'/addPurchaserActivity')">添加活动</el-button>
         </div>
       </div>
     </el-card>
@@ -24,7 +24,7 @@
       <div class="screen-box">
         <div>
           <el-select placeholder="行业" clearable v-model="industry" @change="conditionChange" style="margin-bottom: 20px"
-          v-if="routePath=='hongze'">
+          v-if="!isResearch">
             <el-option
               v-for="item in chartPermissionList"
               :label="item.PermissionName"
@@ -34,11 +34,7 @@
           </el-select>
           <el-select placeholder="活动类型" clearable v-model="cactivityTypeVal" @change="conditionChange">
             <el-option
-              v-for="item in routePath=='hongze'?cactivityTypeList:
-                                          [{ActivityTypeId:11,ActivityTypeName:'专家电话会'},
-                                          {ActivityTypeId:21,ActivityTypeName:'专家线下沙龙'},
-                                          {ActivityTypeId:31,ActivityTypeName:'公司调研电话会'},
-                                          {ActivityTypeId:41,ActivityTypeName:'买方线下交流'}]"
+              v-for="item in cactivityTypeList"
               :label="item.ActivityTypeName"
               :key="item.ActivityTypeId"
               :value="item.ActivityTypeId"
@@ -177,10 +173,10 @@ export default {
     sta() {
       return this.status >= 0 && typeof this.status == "number" ? this.status : 2;
     },
-    // 弘则 研选
-    routePath(){
-      return this.$route.path.indexOf("purchaser")!=-1?'purchaser':'hongze'
-    },
+    // 弘则 研选 是否是研选
+    isResearch(){
+      return this.$route.path.indexOf("purchaser")!=-1?true:false
+    }
   },
   created() {},
   mounted() {
@@ -196,7 +192,8 @@ export default {
       this.activityLabel = initialize.activityLabel;
       this.publishDate = initialize.publishDate;
     }
-    this.chartPermission();
+    // 研选下 没有行业的搜索框
+    !this.isResearch && this.chartPermission();
     this.activityType();
     this.getsummaryManageList();
   },
@@ -263,7 +260,7 @@ export default {
     //编辑
     editBtn(id, show) {
       this.$router.push({
-        path: this.routePath=='hongze'?'/editActivity':'/editPurchaserActivity',
+        path: !this.isResearch?'/editActivity':'/editPurchaserActivity',
         query: {
           id: id,
           isShow: show,
@@ -285,7 +282,7 @@ export default {
     },
     //活动类型
     activityType() {
-      raiInterface.getActivityType().then((res) => {
+      raiInterface.getActivityType({IsResearch:this.isResearch}).then((res) => {
         if (res.Ret === 200) {
           this.cactivityTypeList = res.Data.List;
         }
@@ -298,7 +295,7 @@ export default {
           CurrentIndex: this.page_no,
           PageSize: this.PageSize,
           PublishStatus: this.sta - 0,
-          ChartPermissionId: this.routePath=="purchaser"?31:this.industry,
+          ChartPermissionId: this.industry,
           StartDate: this.issueTime[0],
           EndDate: this.issueTime[1],
           KeyWord: this.titleValue,
@@ -306,6 +303,7 @@ export default {
           ActiveState: this.activeStateId,
           ActivityLabel: this.activityLabel,
           PublishStartDate: this.publishDate,
+          IsResearch:this.isResearch
         })
         .then((res) => {
           if (res.Ret !== 200) return;

src/views/rai_manage/activityManage/applyManage.vue

@@ -42,7 +42,7 @@
         </div>
         <div>
           <el-select placeholder="行业" clearable v-model="industry" @change="conditionChange" style="margin-bottom: 20px"
-          v-if="routePath=='hongze'">
+          v-if="!isResearch">
             <el-option
               v-for="item in chartPermissionList"
               :label="item.PermissionName"
@@ -189,12 +189,12 @@ export default {
     };
   },
   computed: {
-    // 弘则 研选
-    routePath(){
-      return this.$route.path.indexOf("purchaser")!=-1?'purchaser':'hongze'
+    // 弘则 研选 是否是研选
+    isResearch(){
+      return this.$route.path.indexOf("purchaser")!=-1?true:false
     },
     listTitle() {
-      return this.routePath=='hongze'?ListTitle:purchaserListTitle;
+      return !this.isResearch?ListTitle:purchaserListTitle;
     },
     statusSelect() {
       return StatusSelect;
@@ -244,10 +244,11 @@ export default {
           EndDate: this.issueTime[1],
           KeyWord: this.titleValue,
           SearchType: this.tabsPitchonType,
-          ChartPermissionId: this.routePath=='purchaser'?31:this.industry,
+          ChartPermissionId: this.industry,
           ActivityTypeId: this.cactivityTypeVal,
           ActiveState: this.cactivityStatus,
           PublishStatus: this.publishStatus ? Number(this.publishStatus) : 2,
+          IsResearch:this.isResearch
         })
         .then((res) => {
           if (res.Ret !== 200) return;

src/views/rai_manage/activityManage/components/addActivity.vue

@@ -11,6 +11,7 @@
             clearable
             v-model="optionFormregion"
             style="width: 360px; margin-right: 30px"
+            v-if="!isResearch"
           >
             <el-option v-for="item in chartPermissionList" :label="item.PermissionName" :key="item.PermissionName" :value="item.PermissionName"></el-option>
           </el-select>
@@ -345,7 +346,12 @@ export default {
       isShowAddIcon: true, //主题标签的添加的iocn 是否显示
     };
   },
-  computed: {},
+  computed: {
+    // 弘则 研选 是否是研选
+    isResearch(){
+      return this.$route.path.indexOf("Purchaser")!=-1?true:false
+    }
+  },
   mixins: [richTextMixins],
   watch: {
     radio: {
@@ -383,7 +389,11 @@ export default {
   },
   created() {},
   mounted() {
-    this.chartPermission();
+    if(!this.isResearch){
+      this.chartPermission();
+    }else{
+      this.optionFormregion="买方研选"
+    }
     this.getActivityType();
     this.customerTypelist();
     this.getIndustry();
@@ -638,6 +648,8 @@ export default {
         IsBClass: RefPage.isBClass ? 1 : 0,
         SiginupDeadline: RefPage.SiginupDeadline,
         PointsSet,
+        IsResearch:this.optionFormregion.includes('研选')?true:false,
+        IsShowHz:RefPage.isShowHz?1:0
       });
 
       if (res.Ret !== 200) return;
@@ -654,7 +666,7 @@ export default {
     },
     //获取活动类型
     getActivityType() {
-      raiInterface.getActivityType().then((res) => {
+      raiInterface.getActivityType({IsResearch:this.isResearch}).then((res) => {
         if (res.Ret === 200) {
           this.isShowAddIcon = res.Data.IsShowAddIcon;
           this.cactivityTypeList = res.Data.List;

src/views/rai_manage/activityManage/components/addComopnents/ResearchDeduct.vue

@@ -6,7 +6,7 @@
         <i class="el-icon-info" />
       </el-tooltip>
     </el-checkbox>
-    <el-checkbox > 同时在弘则活动页展示 </el-checkbox>
+    <el-checkbox v-if="[1,3,5,8].includes(cactivityType)" v-model="isShowHz"> 同时在弘则活动页展示 </el-checkbox>
     <el-checkbox v-if="cactivityType == 3" v-model="isExternalLabel"> 外部资源 </el-checkbox>
     <template v-if="cactivityType == 7 || cactivityType == 2">
       <el-checkbox v-model="isYidongConduct">
@@ -96,6 +96,7 @@ export default {
         PointsType: "", //扣点形式，1:报名即扣点，2:到会即扣点
         CompanyPointsNum: "", //办会人扣点数量
       },
+      isShowHz:false
     };
   },
   computed: {

src/views/rai_manage/activityManage/meetingManagement.vue

@@ -21,7 +21,7 @@
       <div class="screen-box">
         <div>
           <el-select placeholder="行业" clearable v-model="industry" @change="conditionChange" style="margin-bottom: 20px"
-          v-if="routePath=='hongze'">
+          v-if="!isResearch">
             <el-option
               v-for="item in chartPermissionList"
               :label="item.PermissionName"
@@ -49,7 +49,7 @@
         <div class="top-buttons">
           <el-button type="primary" @click="searchCustomer = true" v-if="meetingTab==1">搜索流失客户</el-button>
           <el-button style="margin-left: 20px" type="primary" 
-          @click="$router.push(routePath=='purchaser'?'/purchaserAppointment':'/appointment')">查看客户爽约记录</el-button>
+          @click="$router.push(isResearch?'/purchaserAppointment':'/appointment')">查看客户爽约记录</el-button>
         </div>
       </div>
       <!-- 表格部分 -->
@@ -239,9 +239,9 @@ export default {
     };
   },
   computed: {
-    // 弘则 研选
-    routePath(){
-      return this.$route.path.indexOf("purchaser")!=-1?'purchaser':'hongze'
+    // 弘则 研选 是否是研选
+    isResearch(){
+      return this.$route.path.indexOf("purchaser")!=-1?true:false
     },
     exportUser() {
       return process.env.API_ROOT + "/cygx/activityMeet/meetingExport?" + localStorage.getItem("auth") || "";
@@ -294,6 +294,7 @@ export default {
       raiInterface
         .activityTypeMeetType({
           MeetType: this.meetingTab,
+          IsResearch:this.isResearch
         })
         .then((res) => {
           if (res.Ret === 200) {
@@ -316,7 +317,7 @@ export default {
           EndDate: this.issueTime[1],
           KeyWord: this.keyWord,
           SearchType: this.tabsPitchonType,
-          ChartPermissionId: this.routePath=='purchaser'?31:this.industry,
+          ChartPermissionId: this.industry,
           ActivityTypeId: this.cactivityTypeVal,
           MeetType: this.meetingTab,
         })