From 27e70a514892acf1e2b3eb1d73c7fcd67d7cb0af Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 16 Mar 2025 14:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/controller/Ticket.php                 |  9 +++
 .../src/view/ticket/detail.html               | 67 +++++++++++++++++++
 .../src/view/ticket/index.html                |  2 +-
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/plugs/think-plugs-ticket/src/controller/Ticket.php b/plugs/think-plugs-ticket/src/controller/Ticket.php
index 7edc50b..2c67668 100644
--- a/plugs/think-plugs-ticket/src/controller/Ticket.php
+++ b/plugs/think-plugs-ticket/src/controller/Ticket.php
@@ -80,6 +80,14 @@ class Ticket extends Controller
         $this->title = '工单详情';
         ['id' => $id] = $this->_vali(['id.require' => '请指定工单ID！']);
         $this->vo = TicketTicket::mk()->with(['user', 'type', 'reply'])->append(['imgs_arr', 'status_text', 'type_name', 'last_reply'])->find($id);
+        $process = ApprovalProcess::where('type', '=', 'GDSH')->order('id', 'asc')->findOrEmpty();
+        $instance = ApprovalInstance::query()->with(['steps.approver', 'logs'])->where('process_id', '=', $process->id)->where('oid', '=', $id)->findOrEmpty();
+        $this->instance = $instance;
+        if ($instance->isEmpty()) {
+            $this->step_index = -1;
+        } else {
+            $this->step_index = $instance->current_step;
+        }
         $this->fetch();
     }
 
@@ -301,6 +309,7 @@ class Ticket extends Controller
                 if ($instance->current_step >= count($instance->steps)) {
                     $instance->status = 1;
                     $ticket->status = 0;
+                    $ticket->save();
                 } else {
                     $step = $instance->steps[$instance->current_step];
                     if ($step['approver_type'] == 3) {
diff --git a/plugs/think-plugs-ticket/src/view/ticket/detail.html b/plugs/think-plugs-ticket/src/view/ticket/detail.html
index 7d378e6..af6337a 100644
--- a/plugs/think-plugs-ticket/src/view/ticket/detail.html
+++ b/plugs/think-plugs-ticket/src/view/ticket/detail.html
@@ -1,6 +1,7 @@
 <div class="layui-tab layui-tab-brief">
     <ul class="layui-tab-title">
         <li class="layui-this">基本信息</li>
+        <li>审核情况</li>
         <li>现场核实情况</li>
         <li>关联随手拍</li>
     </ul>
@@ -57,6 +58,72 @@
                 </div>
             </div>
         </div>
+        <div class="layui-tab-item">
+            <div class="layui-card">
+                <div class="layui-card-header">审核情况</div>
+                <div class="layui-card-body">
+                    {empty name='instance'}
+                    <div class="layui-card-body">
+                        <div class="layui-alert layui-alert-danger">
+                            <i class="layui-icon">&#xe69c;</i>
+                            该工单没有提交审核流程
+                        </div>
+                    </div>
+                    {else}
+                    <div class="layui-timeline">
+                        <div class="layui-timeline-item">
+                            <i class="layui-icon layui-timeline-axis"></i>
+                            <div class="layui-timeline-content layui-text">
+                                <h3 class="layui-timeline-title">提交审核{if $step_index == -1}（当前步骤）{/if}</h3>
+                            </div>
+                        </div>
+                        {foreach $instance.steps as $index=>$step}
+                        <div class="layui-timeline-item">
+                            <i class="layui-icon layui-timeline-axis"></i>
+                            <div class="layui-timeline-content layui-text">
+                                <h3 class="layui-timeline-title">第{$index+1}步{if $step_index == $index}（当前步骤）{/if}</h3>
+                                <p>
+                                    {$step.title}
+                                </p>
+                                {if $step_index >= $index}
+                                {if $step.status == 2}
+                                <div class="layui-alert layui-alert-danger">
+                                    <i class="layui-icon">&#xe69c;</i>
+                                    审核未通过
+                                </div>
+                                {elseif $step.status == 1}
+                                <div class="layui-alert layui-alert-success">
+                                    <i class="layui-icon">&#xe6a6;</i>
+                                    审核通过
+                                </div>
+                                {elseif $step.status == 0}
+                                <div class="layui-alert layui-alert-warning">
+                                    审核中
+                                </div>
+                                {/if}
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">审核人</label>
+                                    <div class="layui-input-block">
+                                        {$step.approver.nickname|default=""}
+                                    </div>
+                                </div>
+                                {if $step.status != 0}
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">审核意见</label>
+                                    <div class="layui-input-block">
+                                        {$step.content|default=""}
+                                    </div>
+                                </div>
+                                {/if}
+                                {/if}
+                            </div>
+                        </div>
+                        {/foreach}
+                    </div>
+                    {/empty}
+                </div>
+            </div>
+        </div>
         <div class="layui-tab-item">
             <div class="layui-card">
                 <div class="layui-card-header">现场核实情况</div>
diff --git a/plugs/think-plugs-ticket/src/view/ticket/index.html b/plugs/think-plugs-ticket/src/view/ticket/index.html
index bdd4430..448f835 100644
--- a/plugs/think-plugs-ticket/src/view/ticket/index.html
+++ b/plugs/think-plugs-ticket/src/view/ticket/index.html
@@ -85,7 +85,7 @@
                             }
                         }
                         if(item.status < 0){
-                            return '<span style="color:red;">待提交审核</span>';
+                            return '<span style="color:red;">待审核</span>';
                         }else if(item.status == 0){
                             return '<span style="color:red;">待分配</span>';
                         }else if(item.status == 1){