Browse Source

查研观向11.0 测试bug修复

hbchen 1 year ago
parent
commit
d3c063b8f7

+ 1 - 1
src/views/rai_manage/activityManage/activityManage.vue

@@ -274,7 +274,7 @@ export default {
     },
     //获取行业
     chartPermission() {
-      raiInterface.chartPermission().then((res) => {
+      raiInterface.chartPermission({IsHideResearch:!this.isResearch}).then((res) => {
         if (res.Ret === 200) {
           this.chartPermissionList = res.Data.List;
         }

+ 2 - 2
src/views/rai_manage/activityManage/applyManage.vue

@@ -216,7 +216,7 @@ export default {
   created() {},
   mounted() {
     this.tableApplyColums = TableApplyColums(1);
-    this.chartPermission();
+    !this.isResearch && this.chartPermission();
     this.getsDataList();
   },
   methods: {
@@ -320,7 +320,7 @@ export default {
     },
     //获取行业
     chartPermission() {
-      raiInterface.chartPermission().then((res) => {
+      raiInterface.chartPermission({IsHideResearch:!this.isResearch}).then((res) => {
         if (res.Ret === 200) {
           this.chartPermissionList = res.Data.List;
         }

+ 2 - 2
src/views/rai_manage/activityManage/components/addActivity.vue

@@ -76,7 +76,7 @@
         </div>
         <!-- 复选 模块 -->
         <div style="margin-top: 20px">
-          <research-deduct ref="researchSelect" :cactivityType="cactivityType" />
+          <research-deduct ref="researchSelect" :cactivityType="cactivityType" :isResearch="isResearch" />
         </div>
         <div style="margin: 20px 0 0 98px" class="add-delete" v-for="(item, index) in addSubjectLabel" :key="index">
           <template v-if="subjectRadio == 2">
@@ -659,7 +659,7 @@ export default {
     },
     //获取行业
     chartPermission() {
-      raiInterface.chartPermissionList().then((res) => {
+      raiInterface.chartPermissionList({IsHideResearch:!this.isResearch}).then((res) => {
         if (res.Ret === 200) {
           this.chartPermissionList = res.Data.List;
         }

+ 5 - 1
src/views/rai_manage/activityManage/components/addComopnents/ResearchDeduct.vue

@@ -6,7 +6,7 @@
         <i class="el-icon-info" />
       </el-tooltip>
     </el-checkbox>
-    <el-checkbox v-if="[1,3,5].includes(cactivityType)" v-model="isShowHz"> 同时在弘则活动页展示 </el-checkbox>
+    <el-checkbox v-if="isResearch && [1,3,5].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">
@@ -74,6 +74,10 @@ export default {
       required: true,
       default: "",
     },
+    isResearch: {
+      type:Boolean,
+      default: false,
+    },
   },
   data() {
     return {

+ 3 - 2
src/views/rai_manage/activityManage/meetingManagement.vue

@@ -272,7 +272,7 @@ export default {
   },
   created() {},
   mounted() {
-    this.chartPermission();
+    !this.isResearch && this.chartPermission();
     this.getsDataList();
   },
   methods: {
@@ -283,7 +283,7 @@ export default {
     },
     //获取行业
     chartPermission() {
-      raiInterface.chartPermission().then((res) => {
+      raiInterface.chartPermission({IsHideResearch:!this.isResearch}).then((res) => {
         if (res.Ret === 200) {
           this.chartPermissionList = res.Data.List;
         }
@@ -320,6 +320,7 @@ export default {
           ChartPermissionId: this.industry,
           ActivityTypeId: this.cactivityTypeVal,
           MeetType: this.meetingTab,
+          IsResearch:this.isResearch
         })
         .then((res) => {
           if (res.Ret !== 200) return;

+ 2 - 2
src/views/rai_manage/components/apply/applyTableColums.js

@@ -125,11 +125,11 @@ export const purchaserListTitle = [
   },
   {
     PermissionName: "专家线下沙龙",
-    ChartPermissionId: 4,
+    ChartPermissionId: 2,
   },
   {
     PermissionName: "买方线下交流",
-    ChartPermissionId: 2,
+    ChartPermissionId: 5,
   },
   {
     PermissionName: "公司调研",