Commit d08ba565 authored by 张莎莎's avatar 张莎莎

提交

parent 3931d459
...@@ -93,7 +93,10 @@ ...@@ -93,7 +93,10 @@
</el-table-column>--> </el-table-column>-->
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope" v-if="!scope.row.isAdministrator"> <template slot-scope="scope" v-if="!scope.row.isAdministrator">
<tableOpts @edit="addOrUpdateHandle(scope.row.id)" @del="handleDel(scope.row.id)"> <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
<el-button type="text" style="color:red;" v-if="account!=scope.row.mobilePhone" @click="handleDel(scope.row.id)">删除</el-button>
<!-- <tableOpts @edit="addOrUpdateHandle(scope.row.id)" @del="handleDel(scope.row.id)">-->
<!-- <el-dropdown hide-on-click> <!-- <el-dropdown hide-on-click>
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<el-button size="mini" type="text"> <el-button size="mini" type="text">
...@@ -109,7 +112,7 @@ ...@@ -109,7 +112,7 @@
v-if="scope.row.enabledMark == 2">解除锁定</el-dropdown-item> v-if="scope.row.enabledMark == 2">解除锁定</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
</tableOpts> <!-- </tableOpts>-->
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
...@@ -174,6 +177,7 @@ export default { ...@@ -174,6 +177,7 @@ export default {
data() { data() {
return { return {
account:'',
editdialogVisible:false, editdialogVisible:false,
deletedialogVisible:false, deletedialogVisible:false,
keysInfo:[], keysInfo:[],
...@@ -219,6 +223,7 @@ export default { ...@@ -219,6 +223,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.account=this.$store.state.user.userInfo.userAccount
this.getOrganizeList(true) this.getOrganizeList(true)
}, },
methods: { methods: {
...@@ -290,8 +295,6 @@ export default { ...@@ -290,8 +295,6 @@ export default {
this.organizeId=this.$store.state.user.userInfo.organizeId; this.organizeId=this.$store.state.user.userInfo.organizeId;
if(this.organizeId=='96240625-934F-490B-8AA6-0BC775B18468'){ if(this.organizeId=='96240625-934F-490B-8AA6-0BC775B18468'){
getOrganizeList().then(res => { getOrganizeList().then(res => {
this.$nextTick(() => {
let topItem = { let topItem = {
fullName: "全部", fullName: "全部",
hasChildren: true, hasChildren: true,
...@@ -304,13 +307,14 @@ export default { ...@@ -304,13 +307,14 @@ export default {
this.listLoading = false this.listLoading = false
return return
} }
if (isInit) this.listQuery.organizeId= this.treeData[0].id this.listQuery.organizeId= this.treeData[0].id
this.$nextTick(()=>{
this.$refs.treeBox.setCurrentKey(this.treeData[0].id)
})
this.$refs.treeBox.setCurrentKey(this.treeData[0].id) this.$refs.treeBox.setCurrentKey(this.treeData[0].id)
this.treeLoading = false this.treeLoading = false
if (isInit) this.initData() this.initData()
this.getcommontree() this.getcommontree()
})
}).catch(() => { }).catch(() => {
this.treeLoading = false this.treeLoading = false
}) })
...@@ -364,11 +368,7 @@ export default { ...@@ -364,11 +368,7 @@ export default {
}, },
getcommontree(){ getcommontree(){
this.treeData.map(firstLevel => { this.treeData.map(firstLevel => {
if (firstLevel.children) { this.expandedKeys.push(firstLevel.id);
firstLevel.children.forEach(secondLevel => {
this.expandedKeys.push(secondLevel.id);
});
}
}); });
}, },
personFormatter(row){ personFormatter(row){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment