From 92d46e1da300b46950f252ea2eddc4aee71a9418 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 17 Apr 2025 10:34:32 +0800
Subject: [PATCH] no message

---
 .../assets/js/pages/manage/approve/details.vue     | 14 ++++++++------
 .../assets/sass/components/drawer-overlay.scss     |  1 +
 resources/assets/sass/pages/page-approve.scss      | 10 +++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index 15a528b1b..f64e09314 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -7,8 +7,9 @@
             </div>
             <h2>{{$L('审批详情')}}</h2>
         </div>
+
         <!-- 审批详情 -->
-        <div class="approve-details-box" ref="approveDetailsBox">
+        <div v-if="datas.id" class="approve-details-box" ref="approveDetailsBox">
             <h2 class="approve-details-title">
                 <span>{{$L(datas.proc_def_name || '- -')}}</span>
                 <Tag v-if="datas.state == 0" color="cyan">{{$L('待审批')}}</Tag>
@@ -17,8 +18,10 @@
                 <Tag v-if="datas.state == 3" color="red">{{$L('已拒绝')}}</Tag>
                 <Tag v-if="datas.state == 4" color="red">{{$L('已撤回')}}</Tag>
             </h2>
-            <h3 class="approve-details-subtitle" @click="onAvatar(datas.start_user_id)">
-                <Avatar :src="datas.userimg" size="24"/>
+            <h3 class="approve-details-subtitle">
+                <span @click="onAvatar(datas.start_user_id)">
+                    <Avatar :src="datas.userimg" size="24"/>
+                </span>
                 <span>{{datas.start_user_name}}</span>
             </h3>
             <h3 class="approve-details-subtitle"><span>{{$L('提交于')}} {{datas.start_time}}</span></h3>
@@ -182,7 +185,7 @@
         </div>
 
         <!--审批操作-->
-        <div class="approve-operation">
+        <div v-if="datas.id" class="approve-operation">
             <Button type="primary" v-if="isShowAgreeBtn && !loadIng" @click="approve(1)">{{$L('同意')}}</Button>
             <Button type="error" v-if="isShowAgreeBtn && !loadIng"  @click="approve(2)">{{$L('拒绝')}}</Button>
             <Button type="warning" v-if="isShowWarningBtn && !loadIng" @click="revocation">{{$L('撤销')}}</Button>
@@ -463,8 +466,7 @@ export default {
         // 滚动到容器底部
         scrollToBottom() {
             this.$nextTick(() => {
-                const container = this.$refs.approveDetailsBox
-                container.scrollTo({
+                this.$refs.approveDetailsBox?.scrollTo({
                     top: container.scrollHeight + 1000,
                     behavior: 'smooth'
                 });
diff --git a/resources/assets/sass/components/drawer-overlay.scss b/resources/assets/sass/components/drawer-overlay.scss
index a18558265..c70e21d0e 100644
--- a/resources/assets/sass/components/drawer-overlay.scss
+++ b/resources/assets/sass/components/drawer-overlay.scss
@@ -130,6 +130,7 @@
         max-width: 100%;
         max-height: 100%;
         position: relative;
+        z-index: 2;
     }
 }
 
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index 2761c481f..b4e31f3f0 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -198,7 +198,6 @@
     }
 }
 
-
 .approve-details {
     flex: 1 1 auto;
     display: flex;
@@ -244,6 +243,7 @@
         .approve-details-subtitle {
             margin-top: 8px;
             display: flex;
+            align-items: center;
 
             .ivu-avatar {
                 margin-right: 8px;
@@ -436,7 +436,6 @@
     }
 }
 
-
 .page-approve-setting{
 
     .approve-row {
@@ -514,7 +513,12 @@
     }
 }
 
-//
+.ivu-modal {
+    .approve-details {
+        border-width: 0;
+    }
+}
+
 body.window-portrait {
     .page-approve{
         .approve-head {