diff --git a/klp-ui/src/views/wms/coil/components/CoilInfo.vue b/klp-ui/src/views/wms/coil/components/CoilInfo.vue index b0bf216b..63c54682 100644 --- a/klp-ui/src/views/wms/coil/components/CoilInfo.vue +++ b/klp-ui/src/views/wms/coil/components/CoilInfo.vue @@ -77,6 +77,7 @@ export default { { label: '理论', key: 'theoreticalThickness' } ] }, + { label: '排产厚度[mm]', key: 'scheduleThickness' }, { label: '实测宽度[mm]', key: 'actualWidth' }, { label: '毛重[t]', key: 'grossWeight' }, { label: '净重[t]', key: 'netWeight' }, diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index acebb64e..831bbe4c 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -190,10 +190,10 @@
- - - + + + @@ -211,9 +211,9 @@
- - + + @@ -272,13 +272,14 @@
+ :class="['abnormal-item', { inherited: abnormal._inherited }]" @click="editAbnormal(index)">
{{ getAbnormalPositionText(abnormal.position) }}
{{ getAbnormalCodeText(abnormal.defectCode) }}
-
继承 · {{ abnormal.processSource }}
+
继承 · {{ abnormal.processSource + }} +
@@ -324,13 +325,11 @@ diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue index 1fb7ce95..e0a99d22 100644 --- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue +++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue @@ -7,25 +7,14 @@
- + 新增分条 - + 完成整体分条 @@ -36,12 +25,8 @@ {{ coilInfo.enterCoilNo || '-' }} {{ coilInfo.currentCoilNo || '-' }} @@ -63,14 +48,8 @@ - + @@ -122,7 +101,8 @@
- + @@ -139,12 +119,8 @@ - + @@ -159,30 +135,16 @@ - - + +
请先选择材料类型
- + @@ -208,44 +170,26 @@ - - + + - + - + - + - + @@ -255,21 +199,15 @@ - + - + @@ -285,25 +223,17 @@
-
+
{{ getAbnormalPositionText(abnormal.position) }}
{{ getAbnormalCodeText(abnormal.defectCode) }}
-
继承 · {{ abnormal.processSource }}
+
继承 · {{ abnormal.processSource }} +
- +
@@ -341,12 +271,8 @@ - +