作者 朱兆平

Merge remote-tracking branch 'origin/message_bus' into message_bus

... ... @@ -44,7 +44,7 @@
<template slot-scope="scope">
<!-- 新增下级-->
<el-tooltip effect="dark" content="新增" placement="top-start" :enterable="false">
<el-button type="success" icon="el-icon-plus" size="mini"@click="handleAdd(scope.$index, scope.row)">新增下级
<el-button :disabled="scope.row.type == 3" type="success" icon="el-icon-plus" size="mini"@click="handleAdd(scope.$index, scope.row)">新增下级
</el-button>
</el-tooltip>
<!-- 编辑按钮-->
... ... @@ -105,7 +105,9 @@
:key="item.value"
:disabled="item.value == 1"
:label="item.label"
:value="item.value">
:value="item.value"
ref="typeRef"
>
<span style="float: left">{{ item.label }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
</el-option>
... ... @@ -243,13 +245,14 @@
//新增下级
if(util.checkNull(row)){
//传递上级ID
let parentId = Object.assign({}, row);
this.addForm.parentId = parentId.id;
this.addForm.parentName = parentId.name;
this.selectDisabled = false;
this.addForm.type = 2;
if(this.$refs.parent[type] = 2){
this.addForm.child[type] = 3;
if (parentId.type==2){
this.addForm.type = 3;
}
}
//数据初始化
... ...
... ... @@ -44,22 +44,25 @@
<el-table-column
prop="sndr"
label="帐户名称"
width="80"
width="95"
align="center"
sortable
>
</el-table-column>
<el-table-column
prop="btype"
label="消息大类"
width="80"
width="95"
align="center"
sortable
>
</el-table-column>
<el-table-column
prop="stype"
label="消息子类"
width="80"
width="95"
align="center"
sortable
>
</el-table-column>
<el-table-column
... ...
... ... @@ -820,8 +820,8 @@
}
},
mounted() {
this.selectServerAndHostList();
this.queue_getUserInfoList();
// this.selectServerAndHostList();
// this.queue_getUserInfoList();
},
computed: {},
}
... ...