From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/product/producttraceability/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/product/producttraceability/index.vue b/src/views/product/producttraceability/index.vue
index 437b369..8685e96 100644
--- a/src/views/product/producttraceability/index.vue
+++ b/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>
--
Gitblit v1.9.3