From e5f034eb415448f0f452505c26bb8a3c56016320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 4 Mar 2026 09:53:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E7=A7=BB=E9=99=A4=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E8=BF=BD=E8=B8=AA=E7=BB=93=E6=9E=9C=E4=B8=AD=E5=B7=B2?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E7=9A=84=E5=9B=9E=E6=BB=9A=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化代码结构，删除不再使用的回滚专属代码块
同时改进操作时间和操作人的显示逻辑
---
 .../views/wms/coil/panels/CoilTraceResult.vue | 60 +------------------
 1 file changed, 3 insertions(+), 57 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue b/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue
index ee45f910..b2f1f4e3 100644
--- a/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue
+++ b/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue
@@ -104,60 +104,6 @@
                   </div>
                 </el-col>
               </el-row>
-
-              <!-- 回滚专属：删除/恢复钢卷信息（优化为关键信息展示） -->
-              <!-- <el-row class="detail-row" v-if="step.action === '回滚'">
-                <el-col :span="8" class="detail-label">删除钢卷：</el-col>
-                <el-col :span="16" class="detail-value">
-                  <div class="coil-info-item" v-if="step.deletedCoilInfo">
-                    <el-popover
-                      placement="right"
-                      trigger="hover"
-                      width="400"
-                      :loading="loadingCoilDetails"
-                    >
-                      <div class="coil-detail-item">
-                        <p><b>物料类型：</b>{{ step.deletedCoilInfo.materialType || '-' }}</p>
-                        <p><b>物料名称：</b>{{ step.deletedCoilInfo.itemName || '-' }}</p>
-                        <p><b>规格：</b>{{ step.deletedCoilInfo.specification || '-' }}</p>
-                        <p><b>材质：</b>{{ step.deletedCoilInfo.material || '-' }}</p>
-                        <p><b>净重：</b>{{ step.deletedCoilInfo.netWeight }} kg</p>
-                        <p><b>创建时间：</b>{{ step.deletedCoilInfo.createTime || '-' }}</p>
-                      </div>
-                      <div slot="reference" class="coil-info-summary">
-                        {{ step.deletedCoilInfo.currentCoilNo || '-' }} {{ step.deletedCoilInfo.itemName }}（{{ step.deletedCoilInfo.specification }}）- {{ step.deletedCoilInfo.materialType }}
-                      </div>
-                    </el-popover>
-                  </div>
-                  <span v-else>无</span>
-                </el-col>
-              </el-row>
-              <el-row class="detail-row" v-if="step.action === '回滚'">
-                <el-col :span="8" class="detail-label">恢复钢卷：</el-col>
-                <el-col :span="16" class="detail-value">
-                  <div class="coil-info-item" v-if="step.restoredCoilInfo">
-                    <el-popover
-                      placement="right"
-                      trigger="hover"
-                      width="400"
-                      :loading="loadingCoilDetails"
-                    >
-                      <div class="coil-detail-item">
-                        <p><b>物料类型：</b>{{ step.restoredCoilInfo.materialType || '-' }}</p>
-                        <p><b>物料名称：</b>{{ step.restoredCoilInfo.itemName || '-' }}</p>
-                        <p><b>规格：</b>{{ step.restoredCoilInfo.specification || '-' }}</p>
-                        <p><b>材质：</b>{{ step.restoredCoilInfo.material || '-' }}</p>
-                        <p><b>净重：</b>{{ step.restoredCoilInfo.netWeight }} kg</p>
-                        <p><b>创建时间：</b>{{ step.restoredCoilInfo.createTime || '-' }}</p>
-                      </div>
-                      <div slot="reference" class="coil-info-summary">
-                        {{ step.restoredCoilInfo.currentCoilNo || '-' }} {{ step.restoredCoilInfo.itemName }}（{{ step.restoredCoilInfo.specification }}）- {{ step.restoredCoilInfo.materialType }}
-                      </div>
-                    </el-popover>
-                  </div>
-                  <span v-else>无</span>
-                </el-col>
-              </el-row> -->
             </div>
           </el-card>
         </el-timeline-item>
@@ -303,14 +249,14 @@ export default {
       }
 
       // 2. 操作时间（优先取更新时间/回滚时间）
-      if (originalStep.update_time) {
-        standardStep.time = this.formatTime(originalStep.update_time);
+      if (originalStep.update_time || originalStep.create_time) {
+        standardStep.time = this.formatTime(originalStep.update_time || originalStep.create_time);
       } else if (originalStep.rollback_time) {
         standardStep.time = this.formatTime(originalStep.rollback_time);
       }
 
       // 3. 操作人（优先昵称，其次账号）
-      standardStep.operation = originalStep.operator_nickname || originalStep.operator || '-';
+      standardStep.operation = originalStep.operator_nickname || originalStep.operator || originalStep.create_by || '-';
 
       // 4. 核心ID映射：oldCoilIds（操作前钢卷ID列表）
       switch (standardStep.action) {