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

src/util/Contact/index.ts

@@ -114,3 +114,14 @@ export function getLeaders(arr: Array<Staff>) {
   if (typeof arr === 'undefined' || arr.length === 0) return []
   return arr.filter((item: Staff) => item.role !== Role.COMMON_MEMBER).sort((a, b) => a.role - b.role)
 }
+
+export function uniqueArr(arr: Array<Staff>) {
+  if (typeof arr === 'undefined' || arr.length === 0) return []
+  const res = new Map()
+  return arr.filter(item => {
+    if (!res.has(item.id)) {
+      res.set(item.id, true)
+      return item
+    }
+  })
+}

src/views/team/add-department.vue

@@ -3,7 +3,7 @@
   <main-page
     left-arrow
     :loading="loading"
-    @click-left="$router.push('/team/team-frame')"
+    @click-left="$router.replace('/team/team-frame')"
   >
     <member-selector
       :show.sync="showMemberSelector"

src/views/team/add-member.vue

@@ -196,7 +196,7 @@ export default Vue.extend({
       }
     },
     handleClickLeft() {
-      this.$router.go(-1)
+      this.$router.push('/team/team-frame')
     },
     // 入职日期
     selectJoinTime(date: Date) {

src/views/team/components/member-selector.vue

@@ -198,6 +198,9 @@ export default Vue.extend({
           this.currentDep = data.data.dep
           // 通讯录
           this.contacts = data.data.staffList || []
+          if (typeof data.data.leader !== 'undefined') {
+            this.contacts.push(data.data.leader)
+          }
           // 部门树
           const depTree = data.data.dep
           depTree.children = data.data.subDepList

src/views/team/components/team-contacts.vue

@@ -94,7 +94,7 @@
 import Vue, {PropType} from 'vue'
 import { Staff, Contacts } from '@/Interface'
 import { Role } from '@/service/moudles/service.dto'
-import { getContacts, getLeaders } from '@/util/Contact'
+import { getContacts, getLeaders, uniqueArr } from '@/util/Contact'
 
 export default Vue.extend({
   props: {
@@ -139,10 +139,10 @@ export default Vue.extend({
   },
   computed: {
     leaders() {
-      return getLeaders(this.contactList)
+      return getLeaders(uniqueArr(this.contactList))
     },
     filteredContacts() {
-      return getContacts(this.contactList.filter((staff: Staff) => staff.role === Role.COMMON_MEMBER) || [])
+      return getContacts(uniqueArr(this.contactList).filter((staff: Staff) => staff.role === Role.COMMON_MEMBER) || [])
     },
     navs() {
       let arr: Array<string> = []

src/views/team/department-management.vue

@@ -106,7 +106,7 @@ export default Vue.extend({
       memberSelectorTitle: '',
       multiple: false,
 
-      contacts: [],
+      contacts: [] as Array<Staff>,
       leaders: [] as Array<Staff>,
       showContactSelector: false,
       contactSelectorTitle: '',
@@ -164,8 +164,10 @@ export default Vue.extend({
         this.loading = false
         if (data.code === this.$global.success) {
           // 通讯录
-          console.log(data.data.staffList, 'lll')
           this.contacts = data.data.staffList || []
+          if (typeof data.data.leader !== 'undefined') {
+            this.contacts.push(data.data.leader)
+          }
           // 部门树
         } else {
           this.$toast(data.msg)
@@ -208,7 +210,7 @@ export default Vue.extend({
           this.loading=false
           if (data.code === this.$global.success) {
             this.$toast('删除成功')
-            this.$router.go(-1)
+            this.$router.push('/team/team-frame')
           } else {
             this.$toast(data.msg)
           }

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

@@ -17,21 +17,21 @@
         <!-- 背景图 -->
         <!-- <img class="w-82 absolute top-0 right-0" src="@/assets/images/header-bg.png" alt=""> -->
         <!-- logo -->
-        <div class="absolute top-20 left-1/2 border transform -translate-x-1/2 z-10 w-15 h-15 bg-white rounded-full overflow-hidden flex items-center justify-center">
-          <img src="@/assets/images/33.png" alt="" class="max-w-full">
+        <div class="absolute top-20 left-1/2 transform -translate-x-1/2 z-10 w-15 h-15 bg-white rounded overflow-hidden flex items-center justify-center">
+          <img src="@/assets/icons/team-icon.png" alt="" class="max-w-full">
         </div>
         <div class="top-28 px-4 w-full absolute top-10">
           <div class="bg-white w-full rounded pt-8 pb-4 flex flex-col items-center shadow-bg">
-            <div class="font-medium">杭州复杂美科技有限公司</div>
-            <div class="font-medium text-sm text-text-secondary mt-0.5">团队号 HZFZM0001</div>
+            <div class="font-medium">{{entName}}</div>
+            <!-- <div class="font-medium text-sm text-text-secondary mt-0.5">团队号 HZFZM0001</div> -->
             <!-- <div class="h-20 overflow-auto text-xs text-text-secondary px-4 mt-3.5">
               公司成立于2008年，2013 年启动区块链、智能合约的研发与创新，2014年申请区块链发明专利：钱包找回功能。已申请区块链相关专利500余项，其中已获得授权超80项，2019年据德温特专利家族统计，复杂美区块链发明专利排名位于全球第三，仅次于阿里巴巴和IBM。 公司总部位于杭州，并在南京、广州、海南设有分部。目前，公司员工100余人，其中80%左右为技术人员，吸引了一批甲骨文、阿里、华为程序员。公司与多家世界500强开展区块链项目合作，在票据、供应链金融、积分、仓单有区块链应用落地。 2018年11月，复杂美区块链Chain33在Github上开源，是较早落地运行的平行链架构系统，并基于模块设计可协作开发，大幅降低区块链的开发维护成本，实现快捷易用的跨链交易，有近100个平行链项目落地，去中心化交易、去中心化社交、去中心化电商、去中心化溯源存证、去中心化借贷等一系列应用。
             </div> -->
           </div>
         </div>
       </div>
-      <div class="px-4 pt-16 pb-20">
-        <group-cell title="">
+      <div class="px-4 pt-16 pb-28">
+        <group-cell title="个人信息">
           <c-cell
             title="真实姓名"
             title-class="text-sm text-text-secondary"
@@ -54,7 +54,7 @@
             title="入职时间"
             title-class="text-sm text-text-secondary"
           >
-            <div slot="content" class="text-text-primary">{{formatDate(Number(info.joinTime), 'YYYY-MM-DD')}}</div>
+            <div slot="content" class="text-text-primary">{{formatDate(Number(info.joinTime)*1000, 'YYYY-MM-DD')}}</div>
           </c-cell>
           <c-cell
             title="手机号"
@@ -106,13 +106,13 @@ export default Vue.extend({
       formatDate,
       info,
       departName: '',
+      entName: '',
       loading: false
     }
   },
   created() {
     this.info = this.$route.query as unknown as AcceptJoinDTO
-    console.log(this.info);
-    
+    this.entName = JSON.parse(localStorage.getItem('ENT_INFO') as string).name
     this.getDepInfo(this.info)
   },
   methods: {
@@ -137,7 +137,6 @@ export default Vue.extend({
             this.$toast(data.msg)
           }
         })
-
     },
     getDepInfo(item:AcceptJoinDTO) {
       this.loading = true
@@ -148,7 +147,6 @@ export default Vue.extend({
         this.loading = false
         const {data} = res
         if (data.code === this.$global.success) {
-          console.log(data.data.name, 'depIndo')
           this.departName = data.data.name
         }
       })

src/views/team/team-frame.vue

@@ -162,7 +162,10 @@ export default Vue.extend({
         if (data.code === this.$global.success) {
           this.currentDep = data.data.dep
           // 通讯录
-          this.contacts = data.data.staffList
+          this.contacts = data.data.staffList || []
+          if (typeof data.data.leader !== 'undefined') {
+            this.contacts.push(data.data.leader)
+          }
           // 部门树
           const depTree = data.data.dep
           depTree.children = data.data.subDepList

src/views/team/two-code.vue

@@ -36,7 +36,7 @@
                 <div class="flex-shrink-0 w-12">部门：</div>
                 <div class="flex-1"> {{depInfo.name}}</div>
               </div>              
-              <div>{{ formatDate(joinInfo.joinTime, 'YYYY-MM-DD') || '2021-09-05' }}</div>
+              <div>{{ formatDate(Number(joinInfo.joinTime)*1000, 'YYYY-MM-DD') || '2021-09-05' }}</div>
             </div>
           </div>
           <div class=" text-center text-gray-400 pb-8 pt-4">扫描二维码加入我们{{entName}}的团队</div>