From 3c3afd7110c887dc6ddb34418794a44b1997f500 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 22 Jul 2023 17:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue | 10 ++++++++--
 pages/oaMy/oaMy.vue     | 13 +++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index ee1c12e..385b871 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -20,8 +20,14 @@
           </view>
         </view>
         <view v-else class="mesg_box">
-          <view class="name"><text class="nickname">姓名:{{ myOaInfo.nickname }}</text>所属公司:{{ myOaInfo.admin.company.company_name }}</view>
-          <view class="duty">({{ myOaInfo.did_name }}){{myOaInfo.label_name}}</view>
+          <view class="name">
+            <text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
+            
+          </view>
+          <view class="duty">
+            所属公司:<text class="" v-if="myOaInfo.admin.company">{{ myOaInfo.admin.company.company_name }}</text>
+            <!-- ({{ myOaInfo.did_name }}){{myOaInfo.label_name}} -->
+          </view>
         </view>
       </view>
       <view class="task_panel">
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 4eda48b..a970b88 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -28,10 +28,11 @@
             <view v-else class="name_work">
               <view class="name">
                 <text class="nickname">姓名:{{ oaUserInfo.nickname }}</text>
-                <text class="omit">所属公司:{{ oaUserInfo.admin.company.company_name }}</text>
+                <!-- <text class="omit" v-if="oaUserInfo.admin.company">所属公司:{{ oaUserInfo.admin.company.company_name }}</text> -->
               </view>
               <view class="work">
-                {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }})
+                所属公司:<text class="omit" v-if="oaUserInfo.admin.company">{{ oaUserInfo.admin.company.company_name }}</text>
+                <!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
               </view>
             </view>
           </view>
@@ -227,6 +228,14 @@
       .work {
         margin-top: 14.04rpx;
       }
+      .omit{
+        white-space: nowrap;
+        /* 禁止换行 */
+        overflow: hidden;
+        /* 溢出隐藏 */
+        text-overflow: ellipsis;
+        /* 使用省略号代表被截断的文本 */
+      }
     }
 
     .my_msg {