Merge branch 'main' of https://gitlab.33.cn/HF_web/OKR

src/util/Bridge/index.ts

@@ -7,7 +7,15 @@ import router from '@/router';
 import { AcceptJoinDTO } from '@/service/moudles/service.dto'
 import dsbridge from 'dsbridge'
 
-interface GETUSERINFO{
+export enum RoleType{
+  LEADER = 0,
+  SUPER_ADMIN = 1,
+  CUSTOMER_ADMIN = 2,
+  COMMON_MEMBER = 3,
+  CHILD_ADMIN = 4,
+}
+
+export interface GETUSERINFO{
   
         "company": any,
         "depId": string,
@@ -17,7 +25,7 @@ interface GETUSERINFO{
         "name": string,
         "phone": string,
         "position": string,
-        "role": number    
+        "role":RoleType    
 }
 
 
@@ -42,8 +50,9 @@ export function isAppEnv() {
 }
 
 export function appNavBack(){
-    const appEnv = isAppEnv()
   console.log(111);
+    const appEnv = isAppEnv()
+
     
     if(appEnv){
         goBack()
@@ -127,6 +136,8 @@ export function getSign(obj: object) {
 
 export function getPublicKey(){
   const data = dsbridge.call(BridgeMethods.GET_PUBLIC_KEY,{},res=>{
+    console.log(res);
+    
     return res
   })
   return data

src/views/team/join-team/confirm-join.vue

@@ -121,7 +121,7 @@ export default Vue.extend({
     this.loading = true
     const {depId,entId,expiration,hash,inviterId,joinTime,name,oaServer,phone,position} = this.info as AcceptJoinDTO
     let req = {
-    depId,entId,expiration: Number(expiration)/1000,hash,inviterId,joinTime:Number(joinTime)/1000,name,oaServer,phone,position
+    depId,entId,expiration:  Math.round(Number(expiration)/1000) ,hash,inviterId,joinTime: Math.round(Number(joinTime)/1000),name,oaServer,phone,position
     }
      this.$service.enterprise.acceptJoin(req)
         .then((res: any) => {

src/views/team/team-detail.vue

@@ -43,7 +43,7 @@
           <c-button round @click="$router.push('/team/team-management')">确定</c-button>
         </template>
         <template v-else>
-          <div class="grid grid-cols-3 gap-2.5">
+          <div class="grid grid-cols-3 gap-2.5" v-if="getUserInfo.role === 3" >
             <c-button round @click="$router.push('/team/add-member')">添加成员</c-button>
             <c-button round @click="$router.push('/team/add-department')">添加部门</c-button>
             <c-button round @click="setDepartment">部门设置</c-button>
@@ -59,7 +59,7 @@ import Vue from 'vue'
 import { team, contacts } from '@/DTO'
 import { Member } from '@/DTO'
 import { getContacts } from '@/util/Contact'
-import { openCompanyUserInfo } from '@/util/Bridge'
+import { openCompanyUserInfo ,appNavBack, getUserInfo} from '@/util/Bridge'
 
 export default Vue.extend({
   name: 'TeamDetail',
@@ -101,6 +101,11 @@ export default Vue.extend({
       immediate: false
     }
   },
+  computed:{
+    getUserInfo(){
+      return getUserInfo()
+    }
+  },
   created() {
     this.showRadio = this.$route.query.showRadio === '1'
     this.multiple = this.$route.query.multiple === '2'
@@ -109,6 +114,7 @@ export default Vue.extend({
     this.getStaff(this.parentId)
   },
   methods: {
+    appNavBack,
     // 获取成员
     getStaff(id: string) {
       this.loading = true

src/views/team/team-frame.vue

@@ -100,8 +100,9 @@ export default Vue.extend({
     }
   },
   mounted() {
-    this.entId = getUserInfo()?.entId || '166961152260050944'
-    console.log(this.entId)
+    this.entId = process.env.NODE_EN==='production'? getUserInfo()?.entId : '166961152260050944'
+    console.log('这里出来了么？',this.entId);
+    
     localStorage.setItem('USR_INFO', JSON.stringify(getUserInfo()))
     this.getEntInfo()
   },
@@ -115,10 +116,7 @@ export default Vue.extend({
       this.parentId = dep.id
       this.getStaff()
     },
-    appNavBack(){
-      // this.$router.go(-1)
-      appNavBack()
-    },
+    appNavBack,
     getEntInfo() {
       this.loading = true
       return this.$service.enterprise.getEnterpriseInfo({

src/views/team/two-code.vue

@@ -103,8 +103,9 @@ export default Vue.extend({
   async created() {
     // console.log(Mock, 'mock')
     this.joinInfo = this.$store.state.acceptJoin 
-    const urloutput = this.outputUrl(this.joinInfo)
+    console.log(this.joinInfo);
     
+    const urloutput = await this.outputUrl(this.joinInfo)
     this.qrCodeText = JSON.stringify(this.joinInfo) 
     let url = window.location.origin + '/team/confirm-join'
     this.qrCodeText = `${url}?${urloutput}`
@@ -129,7 +130,6 @@ export default Vue.extend({
           string = `${i[0]}=${encodeURIComponent(i[1])}`
         }
           
-          
          res += string
       })
       return res