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

src/util/FormatDate/index.ts

 import moment from 'moment'
 
-export function formatDate(date: Date, type: string = 'YYYY-MM-DD HH:mm:ss') {
+export function formatDate(date: Date | number, type: string = 'YYYY-MM-DD HH:mm:ss') {
   return moment(date).format(type)
 }

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

@@ -31,7 +31,7 @@
         </div>
       </div>
       <div class="px-4 pt-16 pb-20">
-        <group-cell title="个人信息">
+        <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(info.joinTime, 'YYYY-MM-DD')}}</div>
+            <div slot="content" class="text-text-primary">{{formatDate(Number(info.joinTime), 'YYYY-MM-DD')}}</div>
           </c-cell>
           <c-cell
             title="手机号"
@@ -89,7 +89,7 @@ export default Vue.extend({
     'c-cell': () => import('@/components/common/c-cell.vue')
   },
   data() {
-    const info: AcceptJoinDTO = {
+    const info:AcceptJoinDTO = {
       expiration: 0,
       inviterId: '',
       name: '',
@@ -109,9 +109,11 @@ export default Vue.extend({
     }
   },
   created() {
-    const query = this.$route.query.query || '{}'
-    this.info = JSON.parse(query as string)
-    this.getDepInfo()
+    this.info = this.$route.query as unknown as AcceptJoinDTO
+
+
+    // item = JSON.parse(query as string)
+    this.getDepInfo(this.info)
   },
   methods: {
     submit() {
@@ -130,11 +132,11 @@ export default Vue.extend({
         })
 
     },
-    getDepInfo() {
+    getDepInfo(item:AcceptJoinDTO) {
       this.loading = true
       this.$service.department.getDep({
-        entId: this.info.entId,
-        id: this.info.depId
+        entId: item.entId,
+        id: item.depId
       }).then((res: any) => {
         this.loading = false
         const {data} = res

src/views/team/two-code.vue

@@ -39,9 +39,9 @@
         <div class=" flex-initial mx-3">
           <code-icon :path="require('@/assets/icons/y-chat33.png')" class-name="h-9 w-9"/> Chat33     
         </div>
-        <div class="flex-initial mx-3">
+        <!-- <div class="flex-initial mx-3">
           <code-icon :path="require('@/assets/icons/y-weixin.png')" class-name="h-9 w-9"/>微信
-        </div>
+        </div> -->
         <div class="flex-initial mx-3" @click="saveQrcode">
           <code-icon :path="require('@/assets/icons/y-downlode.png')" class-name="h-9 w-9"/>保存
         </div>