From 596594d8b39e27b7ec3ec90719d95b7e0924da89 Mon Sep 17 00:00:00 2001
From: weifs <605403358@qq.com>
Date: Tue, 18 Apr 2023 18:57:22 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B7=A5=E4=BD=9C=E6=B5=81=20-=20?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=BF=9B=E5=BA=A6=2090%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/WorkflowController.php    |  1 +
 .../pages/manage/components/DialogWrapper.vue | 30 ++++++-
 .../assets/js/pages/manage/review/details.vue | 23 ++++--
 .../assets/js/pages/manage/review/index.vue   |  7 +-
 .../assets/js/pages/manage/review/list.vue    |  4 +-
 resources/assets/sass/pages/page-review.scss  | 37 +--------
 resources/views/push/bot.blade.php            | 82 ++++++++++---------
 7 files changed, 96 insertions(+), 88 deletions(-)

diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php
index a391a29f4..d5482d179 100755
--- a/app/Http/Controllers/Api/WorkflowController.php
+++ b/app/Http/Controllers/Api/WorkflowController.php
@@ -653,6 +653,7 @@ class WorkflowController extends AbstractController
     public function workflowMsg($type, $dialog, $botUser, $toUser, $process, $action = null)
     {
         $data = [
+            'id' => $process['id'],
             'nickname' => User::userid2nickname($type == 'workflow_submitter' ? $toUser['userid'] : $process['start_user_id']),
             'proc_def_name' => $process['proc_def_name'],
             'department' => $process['department'],
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 55a06b918..9853494da 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -497,6 +497,11 @@
                 </div>
             </div>
         </DrawerOverlay>
+
+        <!--审批详情-->
+        <DrawerOverlay v-model="approveDetailsShow"  placement="right" :size="600">
+            <ReviewDetails v-if="approveDetailsShow" :data="approveDetails" style="height: 100%;border-radius: 10px;"></ReviewDetails>
+        </DrawerOverlay>
     </div>
 </template>
 
@@ -516,6 +521,8 @@ import DialogSelect from "./DialogSelect";
 import ImgUpload from "../../../components/ImgUpload.vue";
 import {choiceEmojiOne} from "./ChatInput/one";
 
+import ReviewDetails from "../../../pages/manage/review/details.vue";
+
 export default {
     name: "DialogWrapper",
     components: {
@@ -528,7 +535,8 @@ export default {
         DialogGroupInfo,
         DrawerOverlay,
         UserInput,
-        DialogUpload
+        DialogUpload,
+        ReviewDetails
     },
 
     props: {
@@ -639,6 +647,9 @@ export default {
             scrollTmp: 0,
 
             positionLoad: 0,
+
+            approveDetails:{id: 0},
+            approveDetailsShow: false
         }
     },
 
@@ -2358,6 +2369,22 @@ export default {
             if (this.operateVisible) {
                 return
             }
+
+            // 打开审批详情
+            let domAudits = $(target).parents(".open-review-details")
+            if( domAudits.length > 0 ){
+                let dataId = domAudits[0].getAttribute("data-id")
+                if( window.innerWidth < 425 ){
+                    this.goForward({name: 'manage-review-details', query: { id: domAudits[0].getAttribute("data-id") } });
+                }else{
+                    this.approveDetailsShow = true;
+                    this.$nextTick(()=>{
+                        this.approveDetails = {id:dataId};
+                    })
+                }
+                return;
+            }
+
             switch (target.nodeName) {
                 case "IMG":
                     if (target.classList.contains('browse')) {
@@ -2372,6 +2399,7 @@ export default {
                         this.$store.dispatch("openTask", $A.runNum(target.getAttribute("data-id")));
                     }
                     break;
+                
             }
         },
 
diff --git a/resources/assets/js/pages/manage/review/details.vue b/resources/assets/js/pages/manage/review/details.vue
index 5d24ed214..a1888ec68 100644
--- a/resources/assets/js/pages/manage/review/details.vue
+++ b/resources/assets/js/pages/manage/review/details.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="review-details">
+    <div class="review-details" :style="{'z-index':modalTransferIndex}">
         <div class="review-details-box">
             <h2 class="review-details-title">
                 <span>{{datas.proc_def_name}}</span>
@@ -26,7 +26,7 @@
             </div>
             <div class="review-details-text">
                 <h4>{{ $L('时长') }}（{{getTimeDifference(datas.var?.start_time,datas.var?.end_time)['unit']}}）</h4>
-                <p>{{ getTimeDifference(datas.var?.start_time,datas.var?.end_time)['time'] }}</p>
+                <p>{{ datas.var?.start_time ? getTimeDifference(datas.var?.start_time,datas.var?.end_time)['time'] : 0 }}</p>
             </div>
             <div class="review-details-text">
                 <h4>{{$L('请假事由')}}</h4>
@@ -130,14 +130,21 @@ export default {
 
     data() {
         return {
+            modalTransferIndex:window.modalTransferIndex,
             datas:{
 
             }
         }
     },
     watch: {
+        '$route' (to, from) {
+            if(to.name == 'manage-review-details'){
+                this.init()
+            }
+        },
         data: {
             handler(newValue,oldValue) {
+                console.log(newValue)
                 if(newValue.id){
                     this.getInfo()
                 }
@@ -146,12 +153,16 @@ export default {
         },
     },
     mounted() {
-        if(this.$route.query.id){
-            this.data.id = this.$route.query.id;
-            this.getInfo()
-        }
+        this.init()
     },
     methods:{
+        init(){
+            this.modalTransferIndex = window.modalTransferIndex = window.modalTransferIndex + 1
+            if(this.$route.query.id){
+                this.data.id = this.$route.query.id;
+                this.getInfo()
+            }
+        },
         // 把时间转成几小时前
         getTimeAgo(time,type) {
             const currentTime = new Date();
diff --git a/resources/assets/js/pages/manage/review/index.vue b/resources/assets/js/pages/manage/review/index.vue
index 49df643db..0ede944f5 100644
--- a/resources/assets/js/pages/manage/review/index.vue
+++ b/resources/assets/js/pages/manage/review/index.vue
@@ -177,7 +177,6 @@ export default {
             searchState:"all",
             searchStateList:[
                 {value:"all",label:"全部状态"},
-                {value:0,label:"待审批"},
                 {value:1,label:"审批中"},
                 {value:2,label:"已通过"},
                 {value:3,label:"已拒绝"},
@@ -206,7 +205,7 @@ export default {
                 endTime:{ type: 'string',required: true, message: this.$L('请选择结束时间！'), trigger: 'change' },
                 description:{ type: 'string',required: true, message: this.$L('请选择结束时间！'), trigger: 'change' },
             },
-            selectTypes:["年假","事假","病假","调休","产假","陪产假","婚假","例假","丧假","哺乳假"]
+            selectTypes:["年假","事假","病假","调休","产假","陪产假","婚假","丧假","哺乳假"]
         }
     },
     mounted() {
@@ -423,5 +422,7 @@ export default {
 </script>
 
 <style scoped>
-
+    .review-details{
+        border-radius: 8px;
+    }
 </style>
diff --git a/resources/assets/js/pages/manage/review/list.vue b/resources/assets/js/pages/manage/review/list.vue
index 4cca5d371..4d476d4d5 100644
--- a/resources/assets/js/pages/manage/review/list.vue
+++ b/resources/assets/js/pages/manage/review/list.vue
@@ -8,12 +8,12 @@
             <Tag v-if="data.state == 3" color="red">{{$L('已拒绝')}}</Tag>
             <Tag v-if="data.state == 4" color="red">{{$L('已撤回')}}</Tag>
         </h2>
-        <p>{{$L('假期类型')}}：<span>{{data.var?.type}}</span></p>
+        <p v-if="data.var?.type">{{$L('假期类型')}}：<span>{{data.var?.type}}</span></p>
         <p>{{$L('开始时间')}}：<span>{{data.var?.start_time}}</span></p>
         <p>{{$L('结束时间')}}：<span>{{data.var?.end_time}}</span></p>
         <div class="list-member">
             <span>
-                <Avatar :src="data.userimg" size="18"/>
+                <Avatar :src="data.userimg" size="20"/>
                 {{ data.start_user_name }}
             </span>
             <span>
diff --git a/resources/assets/sass/pages/page-review.scss b/resources/assets/sass/pages/page-review.scss
index 278bc88c8..8d146ca01 100644
--- a/resources/assets/sass/pages/page-review.scss
+++ b/resources/assets/sass/pages/page-review.scss
@@ -95,7 +95,7 @@
                             display: flex;
                             align-items: center;
                             justify-content: space-between;
-                            margin-top: 8px;
+                            margin-top: 10px;
                             > span {
                                 display: flex;
                                 align-items: center;
@@ -136,7 +136,6 @@
     flex: 1 1 auto;
     display: flex;
     flex-direction: column;
-    border-radius: 8px;
     border: 1px solid #eeeeee;
     background: #fff;
     .review-details-box{
@@ -194,40 +193,6 @@
         .review-details-text:nth-last-child(1){
             margin-bottom: 0;
         }
-        .review-details-process{
-            display: flex;
-            flex-direction: column;
-            margin-top: 16px;
-            position: relative;
-            .review-details-line{
-                position: absolute;
-                left: 23px;
-                top: 5px;
-                bottom: 5px;
-                width: 3px;
-                background: #19be6b;
-                z-index: 1;
-            }
-            .review-process{
-                display: flex;
-                justify-content: space-between;
-                position: relative;
-                z-index: 2;
-                margin-bottom: 32px;
-                .review-process-left{
-                    display: flex;
-                    align-items: center;
-                    .review-process-text{
-                        display: flex;
-                        flex-direction: column;
-                        margin-left: 8px;
-                    }
-                }
-            }
-            .review-process:nth-last-child(1){
-                margin-bottom: 0;
-            }
-        }
         .review-copy{
             margin-top: 8px;
             display: flex;
diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php
index 0f1d338d1..65a05fc93 100755
--- a/resources/views/push/bot.blade.php
+++ b/resources/views/push/bot.blade.php
@@ -109,48 +109,50 @@
 @elseif ($type === 'notice')
     {{$notice}}
 @elseif ($type === 'workflow_reviewer')
-<b>{{$data->nickname}}提交的「{{$data->proc_def_name}}」待你审批</b>
-
-申请人：<span style="color:#84c56a">{{$data->nickname}} {{$data->department}}</span>
-
-<b>审批事由</b>
-假期类型：<span style="color:#84c56a">{{$data->type}}</span>
-开始时间：<span style="color:#84c56a">{{$data->start_time}}</span>
-结束时间：<span style="color:#84c56a">{{$data->end_time}}</span>
-
-    @if ($action === 'pass')
-        <span style="color:#84c56a">已同意</span>
-    @elseif ($action === 'refuse')
-        <span style="color:#84c56a">已拒绝</span>
-    @elseif ($action === 'withdraw')
-        <span style="color:#84c56a">已撤销</span>
-    @else
-        <span style="color:#84c56a">同意</span>
-        <span style="color:#84c56a">拒绝</span>
-    @endif
-
+    <span class="open-review-details" data-id="{{$data->id}}"><b style="border-bottom: 1px solid #e3e3e3;padding-bottom: 10px;">{{$data->nickname}}提交的「{{$data->proc_def_name}}」待你审批</b>
+    <div style="border-bottom: 1px solid #e3e3e3;padding: 10px 0;"><span style="display: inline-block;padding:15px 0;">申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
+        <b>审批事由</b>
+        @if ($data->type)
+        <span>假期类型：{{$data->type}}</span>
+        @endif
+        <span>开始时间：{{$data->start_time}}</span>
+        <span>结束时间：{{$data->end_time}}</span>
+    </div><div style="display: flex;text-align: center;gap: 10px;padding: 10px 0 5px 0;">
+        @if ($action === 'pass')
+            <Button type="button" class="ivu-btn ivu-btn-small" style="flex: 1;">已同意</Button>
+        @elseif ($action === 'refuse')
+            <Button type="button" class="ivu-btn ivu-btn-small" style="flex: 1;">已拒绝</Button>
+        @elseif ($action === 'withdraw')
+            <Button type="button" class="ivu-btn ivu-btn-small" style="flex: 1;">已撤销</Button>
+        @else
+            <Button type="button" class="ivu-btn ivu-btn-primary ivu-btn-small" style="flex: 1;">同意</Button>
+            <Button type="button" class="ivu-btn ivu-btn-error ivu-btn-small" style="flex: 1;">拒绝</Button>
+        @endif
+    </div></span>
 @elseif ($type === 'workflow_notifier')
-<b>抄送{{$data->nickname}}提交的「{{$data->proc_def_name}}」记录</b>
-
-申请人：<span style="color:#84c56a">{{$data->nickname}} {{$data->department}}</span>
-
-<b>审批事由</b>
-假期类型：<span style="color:#84c56a">{{$data->type}}</span>
-开始时间：<span style="color:#84c56a">{{$data->start_time}}</span>
-结束时间：<span style="color:#84c56a">{{$data->end_time}}</span>
-<span style="color:#84c56a">查看详情</span>
+    <span class="open-review-details" data-id="{{$data->id}}"><b style="border-bottom: 1px solid #e3e3e3;padding-bottom: 10px;">抄送{{$data->nickname}}提交的「{{$data->proc_def_name}}」记录</b>
+    <div style="border-bottom: 1px solid #e3e3e3;padding: 10px 0;"><span style="display: inline-block;padding:15px 0;">申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
+        <b>审批事由</b>
+        @if ($data->type)
+        <span>假期类型：{{$data->type}}</span>
+        @endif
+        <span>开始时间：{{$data->start_time}}</span>
+        <span>结束时间：{{$data->end_time}}</span>
+    </div><div style="display: flex;text-align: center;gap: 10px;padding: 10px 0 5px 0;">
+        <Button type="button" class="ivu-btn ivu-btn-primary ivu-btn-small" style="flex: 1;">查看详情</Button>
+    </div></span>
 @elseif ($type === 'workflow_submitter')
-    @if ($action === 'pass')
-        <b>您发起的「{{$data->proc_def_name}}」已通过</b>
-    @else
-        <b>您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝</b>
-    @endif
-
-<b>审批事由</b>
-假期类型：<span style="color:#84c56a">{{$data->type}}</span>
-开始时间：<span style="color:#84c56a">{{$data->start_time}}</span>
-结束时间：<span style="color:#84c56a">{{$data->end_time}}</span>
-<span style="color:#84c56a">查看详情</span>
+    <span class="open-review-details" data-id="{{$data->id}}"><b style="border-bottom: 1px solid #e3e3e3;padding-bottom: 10px;"> @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif</b>
+    <div style="border-bottom: 1px solid #e3e3e3;padding: 10px 0;"><span style="display: inline-block;padding:15px 0;">申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
+        <b>审批事由</b>
+        @if ($data->type)
+        <span>假期类型：{{$data->type}}</span>
+        @endif
+        <span>开始时间：{{$data->start_time}}</span>
+        <span>结束时间：{{$data->end_time}}</span>
+    </div><div style="display: flex;text-align: center;gap: 10px;padding: 10px 0 5px 0;">
+        <Button type="button" class="ivu-btn ivu-btn-primary ivu-btn-small" style="flex: 1;">查看详情</Button>
+    </div></span>
 @else
     你好，我是你的机器人助理，你可以发送 <span style="color:#84c56a">/help</span> 查看帮助菜单。
 @endif