From 632e113d63724dbd64242bd8135d7c2766afd578 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Wed, 16 Aug 2023 18:35:20 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E4=BC=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/apply.vue    | 20 +++++++----
 .../assets/js/pages/manage/approve/index.vue  | 33 +++++++++++--------
 resources/assets/sass/pages/common.scss       |  2 +-
 resources/assets/sass/pages/page-apply.scss   |  7 ++--
 resources/assets/sass/pages/page-approve.scss |  7 +++-
 .../assets/sass/pages/page-calendar.scss      |  2 +-
 resources/assets/sass/pages/page-file.scss    |  2 +-
 resources/assets/sass/pages/page-setting.scss |  2 +-
 8 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/resources/assets/js/pages/manage/apply.vue b/resources/assets/js/pages/manage/apply.vue
index 0a46443c4..68252547b 100644
--- a/resources/assets/js/pages/manage/apply.vue
+++ b/resources/assets/js/pages/manage/apply.vue
@@ -22,12 +22,14 @@
                             <div @click="applyClick(item)">
                                 <img :src="item.src">
                                 <p>{{ item.label }}</p>
-                                <!-- 审批中心 -->
-                                <Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" class="manage-box-top-report"
-                                    :overflow-count="999" :count="approveUnreadNumber" />
-                                <!-- 工作报告 -->
-                                <Badge v-if="item.value == 'report' && reportUnreadNumber > 0" class="manage-box-top-report"
-                                    :overflow-count="999" :count="reportUnreadNumber" />
+                                <div @click.stop="applyClick(item,'badge')" class="apply-box-top-report">
+                                    <!-- 审批中心 -->
+                                    <Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" 
+                                        :overflow-count="999" :count="approveUnreadNumber"/>
+                                    <!-- 工作报告 -->
+                                    <Badge v-if="item.value == 'report' && reportUnreadNumber > 0"
+                                        :overflow-count="999" :count="reportUnreadNumber"/>
+                                </div>
                             </div>
                         </div>
                     </Col>
@@ -298,7 +300,7 @@ export default {
             }
         },
         // 点击应用
-        applyClick(item) {
+        applyClick(item,area='') {
             this.$emit("on-click", item.value)
             switch (item.value) {
                 case 'approve':
@@ -308,6 +310,10 @@ export default {
                     this.goForward({ name: 'manage-' + item.value });
                     break;
                 case 'report':
+                    this.workReportTabs = 'my';
+                    if(area=='badge'){
+                        this.workReportTabs = 'receive';
+                    }
                     this.workReportShow = true;
                     break;
                 case 'ai':
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index 0281becc9..f91ae72fe 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -8,24 +8,31 @@
                     <div class="common-nav-back" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{$L('审批中心')}}</h1>
                 </div>
-                <Button v-if="showType == 1" :loading="addLoadIng" type="primary" @click="addApply"> 
-                    <span v-if="!isShowIcon"> {{$L("添加申请")}} </span> 
-                    <i v-else class="taskfont">&#xe6f2;</i>
+
+                <Button v-if="showType == 1 && !isShowIcon" :loading="addLoadIng" type="primary" @click="addApply"> 
+                    <span> {{$L("添加申请")}} </span> 
                 </Button>
-                <Button v-if="showType == 1 && userIsAdmin" @click="exportApproveShow = true">
-                    <span v-if="!isShowIcon"> {{$L("导出审批数据")}} </span> 
-                    <i v-else class="taskfont">&#xe7a8;</i>
+                <Button v-if="showType == 1 && isShowIcon" :loading="addLoadIng" type="primary" @click="addApply" shape="circle"> 
+                    <i class="taskfont">&#xe6f2;</i>
                 </Button>
-                <Button v-if="userIsAdmin" @click="showType = showType == 1 ? 2 : 1">
-                    <span v-if="!isShowIcon"> {{ showType == 1 ? $L("流程设置") : $L("返回") }} </span> 
-                    <template v-else>
-                        <i v-if="showType == 1" class="taskfont">&#xe67b;</i>
-                        <i v-else class="taskfont">&#xe637;</i>
-                    </template>
+
+                <Button v-if="showType == 1 && userIsAdmin && !isShowIcon" @click="exportApproveShow = true">
+                    <span> {{$L("导出审批数据")}} </span> 
+                </Button>
+                <Button v-if="showType == 1 && userIsAdmin && isShowIcon" @click="exportApproveShow = true" shape="circle">
+                    <i class="taskfont">&#xe7a8;</i>
+                </Button>
+
+                <Button v-if="userIsAdmin && !isShowIcon" @click="showType = showType == 1 ? 2 : 1">
+                    <span> {{ showType == 1 ? $L("流程设置") : $L("返回") }} </span> 
+                </Button>
+                <Button v-if="userIsAdmin && isShowIcon" @click="showType = showType == 1 ? 2 : 1" shape="circle">
+                    <i v-if="showType == 1" class="taskfont">&#xe67b;</i>
+                    <i v-else class="taskfont">&#xe637;</i>
                 </Button>
             </div>
             
-            <Tabs v-if="showType==1" :value="tabsValue" @on-click="tabsClick" style="margin: 0 20px;height: 100%;" size="small">
+            <Tabs class="page-approve-tabs" v-if="showType==1" :value="tabsValue" @on-click="tabsClick" size="small">
                 <TabPane :label="$L('待办') + (unreadTotal > 0 ? ('('+unreadTotal+')') : '')" name="unread" style="height: 100%;">
                     <div class="approve-main-search">
                         <div>
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 7f701d7fe..ce25b5945 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -780,7 +780,7 @@ body {
 // 全局返回按钮 
 .common-nav-back{
     cursor: pointer;
-    padding-right: 5px;
+    padding-right: 10px;
     &.portrait{
         display: none;
     }
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index 860f271d8..8a35901fe 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/resources/assets/sass/pages/page-apply.scss
@@ -67,10 +67,11 @@
                         }
                     }
 
-                    .manage-box-top-report {
+                    .apply-box-top-report {
                         position: absolute;
-                        right: -6px;
-                        top: -6px;
+                        right: -16px;
+                        top: -16px;
+                        padding: 8px;
                     }
                 }
             }
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index 28b60527c..e47fe3037 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -63,6 +63,11 @@
             line-height: 150px;
         }
 
+        .page-approve-tabs{
+            margin: 0 20px;
+            height: 100%;
+        }
+
         .approve-mains {
             display: flex;
             flex: 1 1 auto;
@@ -477,7 +482,7 @@
 body.window-portrait {
     .page-approve{
         .approve-head {
-            margin: 20px 14px 16px;
+            margin: 24px 16px 6px 16px;
         }
         .approve-mains {
             height: calc(100vh - 250px);
diff --git a/resources/assets/sass/pages/page-calendar.scss b/resources/assets/sass/pages/page-calendar.scss
index 35de4a084..03b186dd6 100644
--- a/resources/assets/sass/pages/page-calendar.scss
+++ b/resources/assets/sass/pages/page-calendar.scss
@@ -194,7 +194,7 @@
 body.window-portrait {
     .page-calendar {
         .calendar-head {
-            margin: 24px 24px 16px;
+            margin: 24px 16px 16px;
             .calendar-titbox {
                 .calendar-title {
                     flex: 1;
diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss
index 3af276ee2..b9b6f597d 100644
--- a/resources/assets/sass/pages/page-file.scss
+++ b/resources/assets/sass/pages/page-file.scss
@@ -709,7 +709,7 @@ body.window-portrait {
     .page-file {
         .file-wrapper {
             .file-head {
-                margin: 24px 24px 16px;
+                margin: 24px 16px 16px;
             }
             .file-navigator {
                 margin: 0 24px 0;
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index a4c2de9d7..1472979cb 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -375,7 +375,7 @@
 body.window-portrait {
     .page-setting {
         .setting-head {
-            margin: 24px 24px 16px;
+            margin: 24px 16px 16px;
             .setting-titbox {
                 .setting-title {
                     .setting-more {