diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
index a05b5484..a8e181f6 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
@@ -19,53 +19,54 @@
订货单位
-
+
{{ content.orderUnit || '' }}
+
合同号
-
+
{{ content.contractNumber || '' }}
产品名称
-
+
{{ content.itemName || '' }}
执行标准
-
+
{{ content.executionStandard || '' }}
钢卷号
-
+
{{ content.currentCoilNo || '' }}
原料卷号
-
+
{{ content.enterCoilNo || '' }}
规格
-
+
{{ content.specification || '' }}
材质
-
+
{{ content.materialWithManufacturer || '' }}
表面状态
-
+
{{ content.surfaceTreatmentDesc || '' }}
调制度
-
+
{{ content.temperGrade || '' }}
产品等级
-
+
{{ content.qualityStatus || '' }}
@@ -81,27 +82,27 @@
镀层质量
-
+
{{ content.zincLayer || '' }}
毛重
-
+
{{ content.grossWeight || '' }}
净重
-
+
{{ content.netWeight || '' }}
参考长度
-
+
{{ content.length || '' }}
生产日期
-
+
{{ parseTime(content.updateTime, '{y}-{m}-{d}') || '' }}
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
index 2eb6f316..c63f92ce 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
@@ -19,89 +19,91 @@
订货单位
-
+
+
{{ content.orderUnit || '' }}
合同号
-
+
{{ content.contractNumber || '' }}
产品名称
-
+
{{ content.itemName || '' }}
执行标准
-
+
{{ content.executionStandard || '' }}
钢卷号
-
+
{{ content.currentCoilNo || '' }}
原料卷号
-
+
{{ content.enterCoilNo || '' }}
规格
-
+
{{ content.specification || '' }}
材质
-
+
{{ content.materialWithManufacturer || '' }}
镀层种类
-
+
{{ content.coatingType || '' }}
锌层质量
-
+
{{ content.zincLayer || '' }}
质量状态
-
+
{{ content.qualityStatus || '' }}
表面处理
-
+
{{ content.surfaceTreatmentDesc || '' }}
切边要求
-
+
{{ content.trimmingRequirement || '' }}
包装要求
-
+
{{ content.packagingRequirement || '' }}
毛重
-
+
{{ content.grossWeight || '' }}
净重
-
+
{{ content.netWeight || '' }}
参考长度
-
+
{{ content.length || '' }}
生产日期
-
+
{{ parseTime(content.updateTime, '{y}-{m}-{d}') }}
+
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
index d7384576..02dc8909 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
@@ -96,11 +96,13 @@
| 规格 |
-
+ {{ content.specification || '' }}
+
|
班组 |
-
+ {{ content.team || '' }}
+
|
材质 |
-
+ {{ content.material || '' }}
+
|
| 时间 |
-
+
+ {{ content.updateTime || '' }}
|
下道 |
-
+
+ {{ content.nextProcess || '' }}
|
-
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
index 1effb3cf..bd71f9d0 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -19,81 +19,97 @@
订货单位
-
+
{{ content.orderUnit || '' }}
+
合同号
-
+
{{ content.contractNumber || '' }}
+
产品名称
-
+
{{ content.itemName || '' }}
+
执行标准
-
+
{{ content.executionStandard || '' }}
+
钢卷号
-
+
{{ content.currentCoilNo || '' }}
+
原料卷号
-
+
{{ content.enterCoilNo || '' }}
+
规格
-
+
{{ content.specification || '' }}
+
材质
-
+
{{ content.materialWithManufacturer || '' }}
+
质量要求
-
+
{{ content.qualityStatus || '' }}
+
表面处理
-
+
{{ content.surfaceTreatmentDesc || '' }}
+
切边要求
-
+
{{ content.trimmingRequirement || '' }}
+
包装要求
-
+
{{ content.packagingRequirement || '' }}
+
毛重
-
+
{{ content.grossWeight || '' }}
+
净重
-
+
{{ content.netWeight || '' }}
+
参考长度
-
+
{{ content.length || '' }}
+
生产日期
-
+
{{ parseTime(content.updateTime, '{y}-{m}-{d}') || '' }}
+
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
index 44411cc1..80515cd3 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
@@ -7,47 +7,47 @@
冷卷号
-
{{ content.currentCoilNo || '' }}
+
{{ content.currentCoilNo || '' }}
热卷号
-
{{ content.enterCoilNo || '' }}
+
{{ content.enterCoilNo || '' }}
规格
-
{{ content.specification || '' }}
+
{{ content.specification || '' }}
钢种
-
{{ content.material || '' }}
+
{{ content.material || '' }}
净重
-
{{ content.netWeight || '' }}
+
{{ content.netWeight || '' }}
下工序
-
{{ content.nextProcess || '冷轧' }}
+
{{ content.nextProcess || '冷轧' }}
包装要求
-
{{ content.packagingRequirement || '' }}
+
{{ content.packagingRequirement || '' }}
切边要求
-
{{ content.trimmingRequirement || '' }}
+
{{ content.trimmingRequirement || '' }}
班组
-
{{ content.team || '' }}
+
{{ content.team || '' }}
代码
@@ -58,7 +58,7 @@
生产日期
-
{{ content.createTime || '' }}
+
{{ content.createTime || '' }}
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
index 372d849e..0242ba6a 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
@@ -4,51 +4,51 @@
| 卷号 |
- {{ content.currentCoilNo || '' }}
+ {{ content.currentCoilNo || '' }}
|
来源 |
- {{ content.warehouseName || '' }}
+ {{ content.warehouseName || '' }}
|
| 班组 |
- {{ content.team || '' }}
+ {{ content.team || '' }}
|
净重 |
- {{ content.netWeight || '' }}
+ {{ content.netWeight || '' }}
|
| 规格 |
- {{ content.specification || '' }}
+ {{ content.specification || '' }}
|
材质 |
- {{ content.material || '' }}
+ {{ content.material || '' }}
|
| 卷名 |
- {{ content.itemName || '' }}
+ {{ content.itemName || '' }}
|
厂家 |
- {{ content.manufacturer || '' }}
+ {{ content.manufacturer || '' }}
|
| 时间 |
- {{ content.updateTime || '' }}
+ {{ content.updateTime || '' }}
|
去向 |
- {{ content.nextWarehouseName || '' }}
+ {{ content.nextWarehouseName || '' }}
|
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
index 90da999d..f61439ad 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
@@ -7,47 +7,47 @@
冷卷号
-
{{ content.currentCoilNo || '' }}
+
{{ content.currentCoilNo || '' }}
热卷号
-
{{ content.enterCoilNo || '' }}
+
{{ content.enterCoilNo || '' }}
规格
-
{{ content.specification || '' }}
+
{{ content.specification || '' }}
钢种
-
{{ content.material || '' }}
+
{{ content.material || '' }}
净重
-
{{ content.netWeight || '' }}
+
{{ content.netWeight || '' }}
下工序
-
{{ content.nextProcess || '镀锌卷' }}
+
{{ content.nextProcess || '镀锌卷' }}
包装要求
-
{{ content.packagingRequirement || '' }}
+
{{ content.packagingRequirement || '' }}
切边要求
-
{{ content.trimmingRequirement || '' }}
+
{{ content.trimmingRequirement || '' }}
班组
-
{{ content.team || '' }}
+
{{ content.team || '' }}
代码
@@ -58,7 +58,7 @@
生产日期
-
{{ content.createTime || '' }}
+
{{ content.createTime || '' }}
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 2a4cb9cd..08547b9f 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -59,10 +59,10 @@
-
+
+ 修正
追溯
@@ -329,12 +329,12 @@
style="width: 100%;" clearable />
请先选择材料类型
-
+
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index 42caddbb..b02b8b27 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -66,6 +66,9 @@
+
+
diff --git a/klp-ui/src/views/wms/report/merge/index.vue b/klp-ui/src/views/wms/report/merge/index.vue
index ecb4dd29..78334400 100644
--- a/klp-ui/src/views/wms/report/merge/index.vue
+++ b/klp-ui/src/views/wms/report/merge/index.vue
@@ -66,7 +66,7 @@
-
+
{{ mSummary.passRate }}
{{ mSummary.lossRate }}
-
{{ mSummary.abRate }}
-
{{ mSummary.passRate2 }}
-
+ -->
@@ -216,9 +213,9 @@ export default {
summary() {
return calcSummary(this.outList, this.lossList)
},
- mSummary() {
- return calcMSummary(this.outList, this.lossList)
- },
+ // mSummary() {
+ // return calcMSummary(this.outList, this.lossList)
+ // },
},
created() {
this.handleQuery()