Commit d2d0e7bb d2d0e7bb9279abc56d5bf98ec8186b1179b6bdb5 by 张浩

commit

1 parent 385c607a
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
53 <el-table-column 53 <el-table-column
54 prop="userGroupType" 54 prop="userGroupType"
55 label="用户角色" 55 label="用户角色"
56 :filters="tvmUserGroup"
57 :filter-method="filterHandlerUserGroup"
56 min-width="1"> 58 min-width="1">
57 </el-table-column> 59 </el-table-column>
58 <el-table-column 60 <el-table-column
...@@ -398,6 +400,7 @@ ...@@ -398,6 +400,7 @@
398 tvmExtdata: [], 400 tvmExtdata: [],
399 tvmAwardId: [], 401 tvmAwardId: [],
400 tvmStartTime: [], 402 tvmStartTime: [],
403 tvmUserGroup: [],
401 activityInfosDrawer: false, 404 activityInfosDrawer: false,
402 activityInfosForm: { 405 activityInfosForm: {
403 id: '', 406 id: '',
...@@ -445,6 +448,7 @@ ...@@ -445,6 +448,7 @@
445 this.tvmExtdata=res.data.tvmExtdata 448 this.tvmExtdata=res.data.tvmExtdata
446 this.tvmAwardId=res.data.tvmAwardId 449 this.tvmAwardId=res.data.tvmAwardId
447 this.tvmStartTime=res.data.tvmStartTime 450 this.tvmStartTime=res.data.tvmStartTime
451 this.tvmUserGroup=res.data.tvmUserGroup
448 loading.close(); 452 loading.close();
449 }).catch(error=>{ 453 }).catch(error=>{
450 console.log(error); 454 console.log(error);
...@@ -530,6 +534,10 @@ ...@@ -530,6 +534,10 @@
530 filterHandlerStartTime(value, row, column) { 534 filterHandlerStartTime(value, row, column) {
531 const property = column['property']; 535 const property = column['property'];
532 return row[property] === value; 536 return row[property] === value;
537 },
538 filterHandlerUserGroup(value, row, column) {
539 const property = column['property'];
540 return row[property] === value;
533 } 541 }
534 } 542 }
535 } 543 }
......