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

王震

2024-01-25 36653c98622c8a74cb850575b2001457121b794c

 src/views/quality/rawMaterial/index.vue

@@ -375,7 +375,9 @@
            this.$router.push({
                name: 'rawMaterialForm',
                query: {
                    id: row == null ? null : row.id,
                    id: row == null ? null : row.id
                 },
                 params: {
                    resultVal: row == null ? null : row.judgeState
                 }
            })
@@ -389,7 +391,7 @@
            }
        },
        formatJudgeState(row, column, cellValue){
            if(cellValue != undefined || cellValue != null){
            if(cellValue != undefined && cellValue != null && cellValue != ''){
                if(cellValue == 0){
                    return "<span style='color:#E84738;'>不合格</span>"
                }