打印
@@ -126,8 +138,8 @@
-
-
+
+
@@ -225,13 +237,13 @@
{{ selectedSplitItem.manufacturer || '-' }}
{{ selectedSplitItem.zincLayer || '-' }}
{{ selectedSplitItem.surfaceTreatmentDesc || '-'
- }}
+ }}
{{ selectedSplitItem.qualityStatus || '-' }}
{{ selectedSplitItem.trimmingRequirement || '-'
}}
- {{ selectedSplitItem.packingStatus || '-' }}
+ {{ selectedSplitItem.packingStatus || '-' }}
{{ selectedSplitItem.packagingRequirement || '-'
}}
{{ selectedSplitItem.actualThickness || '-' }}
@@ -246,12 +258,12 @@
{{ selectedSplitItem.temperGrade || '-' }}
{{ selectedSplitItem.coatingType || '-' }}
{{ selectedSplitItem.productionStartTime || '-'
- }}
+ }}
{{ selectedSplitItem.productionEndTime || '-'
- }}
+ }}
{{ selectedSplitItem.formattedDuration ||
(selectedSplitItem.productionDuration ? selectedSplitItem.productionDuration + ' 分钟' : '-')
- }}
+ }}
{{ selectedSplitItem.remark || '-' }}
@@ -287,6 +299,8 @@ import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect
import TimeInput from "@/components/TimeInput";
import AbnormalForm from '../components/AbnormalForm';
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
export default {
name: 'StepSplit',
@@ -314,7 +328,9 @@ export default {
WarehouseSelect,
ActualWarehouseSelect,
TimeInput,
- AbnormalForm
+ AbnormalForm,
+ ProductInfo,
+ RawMaterialInfo,
},
dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree'],
data() {
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index 026f66aa..35369a48 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -161,8 +161,8 @@
-
-
+
+
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index 884ef0f6..2c9f304a 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -48,6 +48,26 @@
物料名称:
{{ currentInfo.itemName || '—' }}
+
+ 规格:
+ {{ currentInfo.specification || '—' }}
+
+
+ 材质:
+ {{ currentInfo.material || '—' }}
+
+
+ 原料材质:
+ {{ currentInfo.packingStatus || '—' }}
+
+
+ 厂家:
+ {{ currentInfo.manufacturer || '—' }}
+
+
+ 表面处理:
+ {{ currentInfo.surfaceTreatmentDesc || '—' }}
+
毛重:
{{ currentInfo.grossWeight ? currentInfo.grossWeight + ' t' : '—' }}
@@ -136,8 +156,8 @@
-
-
+
+
diff --git a/klp-ui/src/views/wms/delivery/mycoil/index.vue b/klp-ui/src/views/wms/delivery/mycoil/index.vue
index 1dd45857..ef3e0466 100644
--- a/klp-ui/src/views/wms/delivery/mycoil/index.vue
+++ b/klp-ui/src/views/wms/delivery/mycoil/index.vue
@@ -80,7 +80,7 @@ export default {
showOverflowTooltip: true
},
{ label: '质量状态', prop: 'qualityStatus' },
- { label: '打包状态', prop: 'packingStatus' },
+ { label: '原料材质', prop: 'packingStatus' },
// 对应edgeType
{ label: '切边要求', prop: 'edgeRequirement' },
// 对应packaging
diff --git a/klp-ui/src/views/wms/delivery/permi/index.vue b/klp-ui/src/views/wms/delivery/permi/index.vue
index eb5889cb..0180bfb3 100644
--- a/klp-ui/src/views/wms/delivery/permi/index.vue
+++ b/klp-ui/src/views/wms/delivery/permi/index.vue
@@ -263,7 +263,7 @@ export default {
{ label: '毛重', prop: 'grossWeight' },
{ label: '备注', prop: 'remark' },
{ label: '质量状态', prop: 'qualityStatus' },
- { label: '打包状态', prop: 'packingStatus' },
+ { label: '原料材质', prop: 'packingStatus' },
{ label: '切边要求', prop: 'edgeRequirement' },
{ label: '包装要求', prop: 'packagingRequirement' },
{ label: '厂家', prop: 'itemManufacturer' }
diff --git a/klp-ui/src/views/wms/delivery/plan/index.vue b/klp-ui/src/views/wms/delivery/plan/index.vue
index c0fe797b..fb16f33b 100644
--- a/klp-ui/src/views/wms/delivery/plan/index.vue
+++ b/klp-ui/src/views/wms/delivery/plan/index.vue
@@ -89,7 +89,7 @@
+
{{ item.trimmingRequirement }}
- 打包状态:
+ 原料材质:
{{ item.packingStatus }}
@@ -311,8 +311,8 @@
-
-
+
+
diff --git a/klp-ui/src/views/wms/report/components/setting/columns.vue b/klp-ui/src/views/wms/report/components/setting/columns.vue
index aadf29f6..27c27e36 100644
--- a/klp-ui/src/views/wms/report/components/setting/columns.vue
+++ b/klp-ui/src/views/wms/report/components/setting/columns.vue
@@ -142,7 +142,7 @@ export default {
{ label: '质量状态', value: 'qualityStatus' },
{ label: '切边要求', value: 'trimmingRequirement' },
- { label: '打包状态', value: 'packingStatus' },
+ { label: '原料材质', value: 'packingStatus' },
{ label: '包装要求', value: 'packagingRequirement' },
{ label: '产品类型', value: 'itemId' },