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

licp

2024-05-22 d1c9ed2f38da64dc3e8ecc9507a2c1db668891a4

 src/views/product/producttraceability/index.vue

@@ -382,9 +382,9 @@
                    >
                      <template slot-scope="scope">
                        {{
                          scope.row.isQualified == 0
                          scope.row.result == 0
                            ? '不合格'
                            : (scope.row.isQualified==1?'合格':'')
                            : (scope.row.result==1?'合格':'')
                        }}
                      </template>
                    </el-table-column>
@@ -433,9 +433,9 @@
                    >
                      <template slot-scope="scope">
                        {{
                          scope.row.isQualified == 0
                          scope.row.result == 0
                            ? '不合格'
                            : (scope.row.isQualified==1?'合格':'')
                            : (scope.row.result==1?'合格':'')
                        }}
                      </template>
                    </el-table-column>