diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
index 46561660..48ac7a80 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -44,9 +44,6 @@
:paperWidthMm="180"
:paperHeightMm="100"
/>
-
下载标签图片
@@ -70,10 +67,6 @@ import DuGeTag from './DuGeTag.vue';
import TuoZhiTag from './TuoZhiTag.vue';
-// import SampleTagPreview from './SampleTagPreview.vue';
-// import ForgeTagPreview from './ForgeTagPreview.vue';
-// import SaltSprayTagPreview from './SaltSprayTagPreview.vue';
-
export default {
name: 'LabelRender',
components: {
@@ -132,10 +125,6 @@ export default {
}
},
props: {
- // labelType: {
- // type: String,
- // required: true,
- // },
forceSpecialTag: {
type: String,
required: false,
@@ -162,6 +151,8 @@ export default {
this.labelType = '6';
} else if (itemType == 'raw_material') {
this.labelType = '2';
+ } else if (itemType == 'product') {
+ this.labelType = 'where';
} else if (itemType == 'product' && itemName == '冷硬卷') {
this.labelType = '3';
} else if (itemType == 'product' && itemName == '热轧卷板') {
diff --git a/klp-ui/src/views/wms/report/template/year.vue b/klp-ui/src/views/wms/report/template/year.vue
index c0ad0808..3515cf33 100644
--- a/klp-ui/src/views/wms/report/template/year.vue
+++ b/klp-ui/src/views/wms/report/template/year.vue
@@ -287,14 +287,13 @@ export default {
...this.baseQueryParams,
}),
]).then((resList) => {
- console.log(resList)
const list = resList.flatMap(res => res.rows)
// 按照createTime 降序排序
this.list = list.sort(
(a, b) => new Date(b.createTime) - new Date(a.createTime)
).map(item => {
// 计算宽度和厚度,将规格按照*分割,*前的是厚度,*后的是宽度
- const [thickness, width] = item.specification.split('*')
+ const [thickness, width] = item.specification?.split('*') || [0, 0]
return {
...item,
computedThickness: parseFloat(thickness),
@@ -320,7 +319,6 @@ export default {
}))
const actions = resultList.flatMap(item => item.rows)
const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
if (!coilIds) {
this.$message({
message: '暂无数据',
@@ -338,7 +336,7 @@ export default {
}).then(res => {
this.lossList = res.rows.map(item => {
// 计算宽度和厚度,将规格按照*分割,*前的是厚度,*后的是宽度
- const [thickness, width] = item.specification.split('*')
+ const [thickness, width] = item.specification?.split('*') || [0, 0]
return {
...item,
computedThickness: parseFloat(thickness),