Merge branch 'feature/5/11上线' into dev

src/components/dm-new-member-group/table.vue

@@ -164,7 +164,7 @@ export default {
       this.loading = true;
       this.tableData = [];
       this.totalCount = 0;
-      let url = `${this.baseUrl}/gic-member-tag-web/member-tag-group/findList.json?requestProject=${this.projectName}&fixedType=${this.fixedType}&creatorId=${this.creatorId}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}&effectiveStatus=1`;
+      let url = `${this.baseUrl}/gic-member-tag-web/member-tag-group/findList.json?requestProject=${this.projectName}&fixedType=${this.fixedType}&creatorId=${this.creatorId}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}&effectiveStatus=1&permissionType=1`;
       if (this.activeName == '2') {
         url = `${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeGroupListV2?requestProject=${this.projectName}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}`;
       }

src/views/ai/task/form.vue

@@ -288,7 +288,6 @@ import tagPop from '@/views/ai/task/tagPop.vue';
 import { formatDateTimeByType, _debounce } from '@/utils/index';
 import gicNewMemberGroup from '@/components/dm-new-member-group/index.vue';
 import ruleFilter from '@/components/dm-new-rule/ruleFilter.vue';
-import { enableAccessControl } from '@/utils/auth.js';
 export default {
   mixins: [filterAvater],
   data() {
@@ -468,12 +467,6 @@ export default {
       return str;
     }
   },
-  created() {
-    if (this.$store.state.marketing.superAdmin != 1 && enableAccessControl()) {
-      // 不是超管且开启分权 不展示金字塔分层
-      this.showTabs = [0, 1];
-    }
-  },
   mounted() {
     const { scene, id } = this.$route.params;
     this.form.scene = scene && Number(scene);
@@ -788,9 +781,12 @@ export default {
         beginDate: formatDateTimeByType(startDate, 'yyyy-MM-dd'),
         filterJson
       };
-
-      const { result } = await getMemberCount(data);
-      this.form.planMemberCount = result == -1 ? 0 : result;
+      try {
+        const { result } = await getMemberCount(data);
+        this.form.planMemberCount = result == -1 ? 0 : result;
+      } catch (err) {
+        this.$message.error('查询预计覆盖人数接口超时');
+      }
     },
     async getAiCalcSingle() {
       const { result } = await getAiCalcSingle();