Merge remote-tracking branch 'origin/master'

zss

2024-01-22 3469ab9c960629989bb4d54c109380cd55064b89

 src/views/quality/rawMaterial/index.vue

@@ -389,8 +389,9 @@
            }
        },
        formatJudgeState(row, column, cellValue){
            if(cellValue != undefined || cellValue != null){
            if(cellValue != undefined && cellValue != null && cellValue != ''){
                if(cellValue == 0){
                    console.log(cellValue);
                    return "<span style='color:#E84738;'>不合格</span>"
                }
                return "<span style='color:#34BD66;'>合格</span>"