bding 1 год назад
Родитель
Сommit
78729f587c

+ 2 - 2
src/views/custom_manage/customList/applyTurn.vue

@@ -259,7 +259,7 @@ export default {
 						/* 处理数据把复选框 拆分成三个*/
 						res.Data.Item.PermissionList.length&&res.Data.Item.PermissionList.forEach(item => {
 						let arr = item.Items.filter(key=> [22,21,20,19,23,30].includes(key.ChartPermissionId))
-						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032,52].includes(key.ChartPermissionId))
+						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032,52,53,54].includes(key.ChartPermissionId))
 						let ItemsUp = item.Items.filter(key=> key.PermissionName.includes('升级'))
 						let ItemsBig = item.Items.filter(key=> key.ChartPermissionId==0)
 							let obj = {
@@ -300,7 +300,7 @@ export default {
 						/* 处理数据把复选框 拆分成三个*/
 						res.Data.List.length&&res.Data.List.forEach(item => {
 						let arr = item.Items.filter(key=> [22,21,20,19,23,30].includes(key.ChartPermissionId))
-						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032,52].includes(key.ChartPermissionId))
+						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032,52,53,54].includes(key.ChartPermissionId))
 						let ItemsUp = item.Items.filter(key=> key.PermissionName.includes('升级'))
 						let ItemsBig = item.Items.filter(key=> key.ChartPermissionId==0)
 							let obj = {

+ 3 - 2
src/views/custom_manage/customList/components/raiPermissionbox.vue

@@ -65,7 +65,7 @@
   export default {
     name:'raiPermissionbox',
     data() {
-		  this.itemsPrivateWidth=['84px','146px','260px']
+		  this.itemsPrivateWidth=['84px','146px','260px','84px']
       return {
         minus_sign_val:''
       }
@@ -271,10 +271,11 @@
 					display: flex;
 					align-items: center;
 					border: solid 1px #DCDFE6;
+          border-left: none;
 					height: 48px;
 					margin-right: -1px;
 					margin-left: -192px;
-					padding-left: 40px;
+					padding-left: 200px;
 					.rai-checkbox-notice {
 						color: #f00;
 					}

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

@@ -161,7 +161,9 @@ export default {
     },
     //获取行业
     async chartPermission() {
-      const res = await raiInterface.chartPermission();
+      const res = await raiInterface.chartPermission({
+        IsHideResearch: true,
+      });
       if (res.Ret === 200) {
         this.chartPermissionList = res.Data.List;
       }