From 7c4b02892b24bc2d219217b5f9e352d0eb531c4e Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期六, 18 十一月 2023 10:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-print.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-print.vue b/src/views/quality/rawMaterial/rawMaterial-print.vue
index c61f311..e246703 100644
--- a/src/views/quality/rawMaterial/rawMaterial-print.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-print.vue
@@ -367,7 +367,9 @@
this.projectList.push(e)
if(e.children){
e.children.forEach(o =>{
- deviceNameList.push(o.deviceName)
+ if(o.deviceName){
+ deviceNameList.push(o.deviceName)
+ }
})
}
});
@@ -424,6 +426,8 @@
obj.testValueList.push("")
}
}
+ }else{
+ obj.testValueList = new Array(12)
}
})
}
--
Gitblit v1.9.3