1

src/views/team/team-frame.vue

@@ -175,14 +175,10 @@ export default Vue.extend({
       })
     },
     clickMember(member: Staff) {
-<<<<<<< HEAD
-      openCompanyUserInfo(JSON.stringify(member))
-=======
       console.log(member.id,'dfjdsfkl');
       
       openCompanyUserInfo(String(member.id))
       // this.$router.push(`/team/team-member/${member.id}`)
->>>>>>> origin/main
     },
     clickItem(val: Department) {
       this.parentId = val.id