From 3415ef8336c12e22a049e167479b073489845917 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Tue, 17 Mar 2020 14:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkOrder/feedbackProcessLogStore.html    | 25 +++++++++++--------
 Application/Admin/View/WorkOrder/modify.html  |  9 +++++--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Application/Admin/View/WorkOrder/feedbackProcessLogStore.html b/Application/Admin/View/WorkOrder/feedbackProcessLogStore.html
index cc8cb0b32..e46470f92 100644
--- a/Application/Admin/View/WorkOrder/feedbackProcessLogStore.html
+++ b/Application/Admin/View/WorkOrder/feedbackProcessLogStore.html
@@ -105,17 +105,22 @@
 
         <div <?php if (empty($data['process_log']) || $data['type'] == 1):?>hidden<?php endif;?> >
             <div style="font-size:large;">工单进度</div>
-            <div style="width: 600px;border: 0.5px solid #000;height: 100%;padding-top: 20px;padding-right: 50px;padding-left: 50px;margin-bottom: 50px;">
+            <div style="width: 600px;border: 0.5px solid #000;height: 700px;padding-top: 20px;padding-right: 50px;padding-left: 50px;margin-bottom: 50px;overflow: scroll;">
                 <?php foreach($data['process_log'] as $index => $log):?>
-                <p style="font-weight: bold;font-size: medium;margin-top: 10px;">{$index+1}. {$log['title']}</p>
-                <?php if ($log['type'] == 2):?>
-                <?php foreach($log['detail'] as $detail):?>
-                <p style="margin-left: 20px;">--<?php echo $detail['key_name'] . " 旧值：".$detail['old']." 新值：".$detail['new'] ?></p>
-                <?php endforeach;?>
-                <?php elseif($log['type'] == 3):?>
-                    <p style="margin-left: 20px;"><label>内容：</label><span style="color: gray;">{$log['detail']}</span></p>
-                <?php endif;?>
-                <?php endforeach;?>
+                    <p style="font-weight: bold;font-size: medium;margin-top: 10px;">{$index+1}. {$log['title']}</p>
+                    <?php if ($log['type'] == 2):?>
+                    <?php foreach($log['detail'] as $detail):?>
+                    <p style="margin-left: 20px;word-break: break-all;">
+                        <span style="color: blue;">--<?php echo $detail['key_name'];?></span></br>
+                        <span style="color: red;font-size: x-small;">旧值：</span></br>
+                        <span><?php echo $detail['old'];?></span></br>
+                        <span style="color: red;font-size: x-small;">新值：</span></br>
+                        <span><?php echo $detail['new'];?></span>
+                    <?php endforeach;?>
+                    <?php elseif($log['type'] == 3):?>
+                        <p style="margin-left: 20px;"><label>内容：</label><span style="color: gray;">{$log['detail']}</span></p>
+                    <?php endif;?>
+                    <?php endforeach;?>
             </div>
         </div>
     </div>
diff --git a/Application/Admin/View/WorkOrder/modify.html b/Application/Admin/View/WorkOrder/modify.html
index 87087d5a5..cbd3504e1 100644
--- a/Application/Admin/View/WorkOrder/modify.html
+++ b/Application/Admin/View/WorkOrder/modify.html
@@ -240,12 +240,17 @@
 
             <div <?php if (empty($data['process_log']) || $data['type'] == 1):?>hidden<?php endif;?> >
                 <div style="font-size:large;">工单进度</div>
-                <div style="width: 600px;border: 0.5px solid #000;height: 100%;padding-top: 20px;padding-right: 50px;padding-left: 50px;margin-bottom: 50px;">
+                <div style="width: 600px;border: 0.5px solid #000;height: 700px;padding-top: 20px;padding-right: 50px;padding-left: 50px;margin-bottom: 50px;overflow: scroll;">
                     <?php foreach($data['process_log'] as $index => $log):?>
                     <p style="font-weight: bold;font-size: medium;margin-top: 10px;">{$index+1}. {$log['title']}</p>
                     <?php if ($log['type'] == 2):?>
                     <?php foreach($log['detail'] as $detail):?>
-                    <p style="margin-left: 20px;">--<?php echo $detail['key_name'] . " 旧值：".$detail['old']." 新值：".$detail['new'] ?></p>
+                    <p style="margin-left: 20px;word-break: break-all;">
+                        <span style="color: blue;">--<?php echo $detail['key_name'];?></span></br>
+                        <span style="color: red;font-size: x-small;">旧值：</span></br>
+                        <span><?php echo $detail['old'];?></span></br>
+                        <span style="color: red;font-size: x-small;">新值：</span></br>
+                        <span><?php echo $detail['new'];?></span>
                     <?php endforeach;?>
                     <?php elseif($log['type'] == 3):?>
                         <p style="margin-left: 20px;"><label>内容：</label><span style="color: gray;">{$log['detail']}</span></p>