Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-11-17 99794b94db96667ba2a6eb75cb1e31ee6c86376b

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 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)
                            }
                        })
                    }