From 2813f4c06279be82e705719ee77ec8355faacb97 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 14 Dec 2023 16:34:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=20okr=E7=BB=93=E6=9E=9C=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=20-=20=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/application.vue | 7 +++++++
 resources/assets/js/pages/manage/dashboard.vue   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index f3af9012d..aa55d6277 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -302,6 +302,7 @@ export default {
     },
     computed: {
         ...mapState([
+            'userInfo',
             'userIsAdmin',
             'reportUnreadNumber',
             'approveUnreadNumber',
@@ -354,6 +355,12 @@ export default {
                 return h;
             });
             //
+            if(this.userInfo.department_owner && !this.userIsAdmin){
+                adminApplyList = [
+                    { value: "okrAnalyze", label: "OKR结果", sort: 15, type: 'admin' },
+                ]
+            }
+            //
             this.applyList = [...applyList, ...appApplyList, ...adminApplyList].sort((a, b) => {
                 if (a.sort < b.sort) {
                     return -1;
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index 262bb58b8..833fcccc1 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -94,7 +94,7 @@
                         </li>
                     </ul>
                 </template>
-                <template v-if="columns.length <= 0">
+                <template v-if="columns.filter(h=>h.list.length > 0).length == 0">
                     <div class="nopage">
                         <div class="nopage-icon">
                             <img :src="$A.apiUrl(`../images/empty/complete.svg`)">