DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(wms): 移除钢卷追踪结果中已注释的回滚相关代码

Browse Source 
优化代码结构，删除不再使用的回滚专属代码块
同时改进操作时间和操作人的显示逻辑
This commit is contained in:
砂糖
2026-03-04 09:53:22 +08:00
parent 4a83a6ce2b
commit e5f034eb41
1 changed files with 3 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue
View File

@@ -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) {