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

王震

2023-12-29 b3cdb967634dddba8a88bca2550f7e07c9ac262c

 src/views/quality/processInspect/processInspect-form.vue

@@ -486,16 +486,22 @@
                        }
                    })
                    this.inspectionItems = result.children
                    let rVal = '1'
                    let rVal = ''
                    let passNum = 0
                    let unPassNum = 0
                    this.inspectionItems.forEach(item => {
                        if (item.children) {
                            item.children.forEach(obj => {
                                if (obj.iresult == 0) {
                                    rVal = '0'
                                if(obj.iresult == 0){
                                    unPassNum += 1
                                }
                                if(obj.iresult == 1){
                                    passNum+=1
                                }
                            })
                        }
                    })
                    rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
                    this.inspectionResultForm = [{
                        materialCode: result.materialCode,
                        material: result.material,