Commit 75021e7c authored by hanfeng zhang's avatar hanfeng zhang

321

parent 4e8e8345
...@@ -132,7 +132,7 @@ export default Vue.extend({ ...@@ -132,7 +132,7 @@ export default Vue.extend({
if (data.code === this.$global.success) { if (data.code === this.$global.success) {
this.$toast('加入成功') this.$toast('加入成功')
this.$store.commit('acceptJoin', {}) this.$store.commit('acceptJoin', {})
this.$router.push('/team/team-management') this.$router.replace('/team/team-frame')
}else { }else {
this.$toast(data.msg) this.$toast(data.msg)
} }
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
/> />
</div> </div>
<!-- 底部操作 --> <!-- 底部操作 -->
<div class="py-2 px-4 bg-white w-screen fixed bottom-0 left-0 z-30"> <div class="py-2 px-4 bg-white w-screen fixed bottom-0 left-0 z-30" v-if="getRole ">
<div class="grid grid-cols-3 gap-2.5"> <div class="grid grid-cols-3 gap-2.5">
<c-button round @click="addMember">添加成员</c-button> <c-button round @click="addMember">添加成员</c-button>
<c-button round @click="addDep">添加部门</c-button> <c-button round @click="addDep">添加部门</c-button>
...@@ -96,11 +96,13 @@ export default Vue.extend({ ...@@ -96,11 +96,13 @@ export default Vue.extend({
preDep: {}, preDep: {},
// 是否显示check // 是否显示check
checkedMemberId: [], checkedMemberId: [],
fromPath: '' fromPath: '',
role:null
} }
}, },
mounted() { mounted() {
const res = JSON.parse(getUserInfo() || "{}") const res = JSON.parse(getUserInfo() || "{}")
this.role = process.env.NODE_ENV==='production'&&res.role
this.entId = process.env.NODE_ENV==='production'?res.entId : '166961152260050944' this.entId = process.env.NODE_ENV==='production'?res.entId : '166961152260050944'
localStorage.setItem('USR_INFO', getUserInfo()) localStorage.setItem('USR_INFO', getUserInfo())
this.getEntInfo() this.getEntInfo()
...@@ -108,7 +110,8 @@ export default Vue.extend({ ...@@ -108,7 +110,8 @@ export default Vue.extend({
computed: { computed: {
isDepDetail(): boolean { isDepDetail(): boolean {
return this.currentDep.parentId !== '-1' return this.currentDep.parentId !== '-1'
} },
}, },
methods: { methods: {
goPre(dep: Department) { goPre(dep: Department) {
......
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