From 5e0cb69bb8954fe1736d06155715bee83d396735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Fri, 5 Jun 2026 10:45:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms/coil):=20=E4=B8=BA=E9=92=A2=E5=8D=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=BB=A7=E6=89=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本次修改在typing.vue、merge.vue、split.vue和stepSplit.vue四个钢卷相关页面中,新增了异常继承的完整功能: 1. 重构异常信息展示区域,添加继承标记样式 2. 新增继承异常按钮,打开异常选择弹窗 3. 实现从源钢卷拉取异常列表、批量选择继承异常的功能 4. 继承的异常会标记来源并使用特殊样式展示 --- klp-ui/src/views/wms/coil/merge.vue | 209 +++++++++++++++- .../src/views/wms/coil/panels/stepSplit.vue | 225 ++++++++++++++++-- klp-ui/src/views/wms/coil/split.vue | 211 +++++++++++++++- klp-ui/src/views/wms/coil/typing.vue | 207 +++++++++++++++- 4 files changed, 794 insertions(+), 58 deletions(-) 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 }}) + + +