diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index 6b7b0f59..9ae8f9e5 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -303,21 +303,29 @@
-
-
-
-
-
{{ getAbnormalPositionText(abnormal.position) }}
-
{{ getAbnormalCodeText(abnormal.defectCode) }}
+
+
+
+
+
+
{{ getAbnormalPositionText(abnormal.position) }}
+
{{ getAbnormalCodeText(abnormal.defectCode) }}
+
继承 · {{ abnormal.processSource }}
+
+
- +
+
+
-
- -
+ + 继承异常 +
@@ -336,11 +344,61 @@ 确 定
+ + + +
+ + +
+ + 取消 + + 确认继承 ({{ selectedInheritCount }}) + + +
@@ -1343,4 +1491,43 @@ export default { transform: translateY(-2px); } } + +.abnormal-item.inherited { + background-color: #f0f9ff; + border-color: #1890ff; + + .abnormal-position { + color: #1890ff; + } +} + +.abnormal-inherit-tip { + font-size: 10px; + color: #909399; + line-height: 1.2; + margin-top: 1px; +} + +.parent-coil-section { + margin-bottom: 20px; + padding: 12px; + background-color: #fafafa; + border: 1px solid #e4e7ed; + border-radius: 4px; +} + +.parent-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 10px; + padding-bottom: 8px; + border-bottom: 1px solid #e4e7ed; +} + +.parent-title { + font-size: 14px; + font-weight: 600; + color: #303133; +} diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index d2521127..875917e7 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -280,21 +280,29 @@ -
-
-
-
-
{{ getAbnormalPositionText(abnormal.position) }}
-
{{ getAbnormalCodeText(abnormal.defectCode) }}
+
+
+
+
+
+
{{ getAbnormalPositionText(abnormal.position) }}
+
{{ getAbnormalCodeText(abnormal.defectCode) }}
+
继承 · {{ abnormal.processSource }}
+
+
- +
+
+
-
- -
+ + 继承异常 +
@@ -351,11 +359,61 @@ 使用暂存数据
+ + + +
+ + +
+ + 取消 + + 确认继承 ({{ selectedInheritCount }}) + + +