fix(wms/coil): 修复钢卷领料和合并相关的逻辑问题

1. 新增根据酸洗动作类型设置锁值的逻辑
2. 修复合并页面钢卷选择器的筛选条件和匹配逻辑
This commit is contained in:
2026-06-15 13:21:54 +08:00
parent a2844ec54a
commit 9d679954fa
2 changed files with 13 additions and 3 deletions

View File

@@ -86,7 +86,7 @@
<span class="pending-value">{{ formatTime(pending.updateTime) }}</span>
</div>
</div>
<coil-selector @select="selectCoil($event, index)">
<coil-selector @select="selectCoil($event, index)" :filters="{ exclusiveStatus: 0 }">
<div class="pending-coil-item">
选择其他钢卷
</div>
@@ -510,7 +510,7 @@ export default {
renderPendingMergeList() {
// 从pendingMergeList中筛选出不好含在sourceCoils中的,通过enterCoilNo
if (this.pendingMergeList.length > 0) {
return this.pendingMergeList.filter(pending => !this.sourceCoils.some(source => source.enterCoilNo === pending.enterCoilNo))
return this.pendingMergeList.filter(pending => !this.sourceCoils.some(source => source.actionId === pending.actionId))
}
return [];
},