提交 d02c7111 编写于 作者: alex.zhang's avatar alex.zhang

黑名单选中状态

上级 1d859fd3
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
top="5vh" top="5vh"
:before-close="handleClose" :before-close="handleClose"
> >
<checkBlackList :circleId="circleId" @addOrg="addOrg" @handleClose="handleClose"></checkBlackList> <checkBlackList v-if="dialogBlackList" :circleId="circleId" @addOrg="addOrg" @handleClose="handleClose"></checkBlackList>
<!-- :roleType="roleType" --> <!-- :roleType="roleType" -->
</el-dialog> </el-dialog>
</div> </div>
...@@ -112,9 +112,8 @@ export default { ...@@ -112,9 +112,8 @@ export default {
}, },
created() { created() {
vm = this; vm = this;
// this.circleId = this.$route.query.id; // this.circleId = 131;
this.circleId = 131; this.circleId = this.$route.query.circleId;
// this.circleId = this.$route.query.circleId;
this.idType = localStorage.getItem("storageIdType"); this.idType = localStorage.getItem("storageIdType");
this.circleName = this.$route.query.circleName; this.circleName = this.$route.query.circleName;
this.curmbSecond = "圈子管理-" + this.circleName; this.curmbSecond = "圈子管理-" + this.circleName;
......
...@@ -171,6 +171,7 @@ export default { ...@@ -171,6 +171,7 @@ export default {
this.tableOrganization = res.data.peoplesDtoList; this.tableOrganization = res.data.peoplesDtoList;
this.totalOrganization = res.data.total; this.totalOrganization = res.data.total;
this.initOrganizationStatus();
} else { } else {
// vm.$message.info(res.message); // vm.$message.info(res.message);
// vm.$message.info("操作失败,请重试"); // vm.$message.info("操作失败,请重试");
...@@ -184,6 +185,7 @@ export default { ...@@ -184,6 +185,7 @@ export default {
console.log("clear() enter") console.log("clear() enter")
clearBlackListCacheOrg(this.circleId) clearBlackListCacheOrg(this.circleId)
.then(()=>{ .then(()=>{
this.search();
}) })
.catch((err=>{console.log(err)})) .catch((err=>{console.log(err)}))
}, },
...@@ -411,6 +413,7 @@ export default { ...@@ -411,6 +413,7 @@ export default {
}, },
//机构table中勾选一个 //机构table中勾选一个
selectOrganization(selection, row) { selectOrganization(selection, row) {
console.log("selectOrganization() : " + row.name)
this.selectionList = selection; this.selectionList = selection;
let flag = false; let flag = false;
for (let i = 0; i < selection.length; i++) { for (let i = 0; i < selection.length; i++) {
...@@ -475,7 +478,7 @@ export default { ...@@ -475,7 +478,7 @@ export default {
let hashTable = {}; let hashTable = {};
let newArr = []; let newArr = [];
for(let i=0,l=arr.length;i<l;i++) { for(let i=0,l=arr.length;i<l;i++) {
if(!hashTable[arr[i].id]) { if(!hashTable[arr[i].id] && arr[i].status != 2) {
hashTable[arr[i].id] = true; hashTable[arr[i].id] = true;
newArr.push(arr[i]); newArr.push(arr[i]);
} }
...@@ -536,6 +539,9 @@ export default { ...@@ -536,6 +539,9 @@ export default {
display: table-caption; display: table-caption;
overflow-y: scroll; overflow-y: scroll;
max-height: 500px; max-height: 500px;
&::-webkit-scrollbar() {
width: 2px !important;
}
} }
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册