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/quality/processInspect/index.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 210b8f1..a109bf1 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -223,10 +223,15 @@
                     this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
                     return
                 }
+                let isAdd = true
+                if(!row) {
+                    isAdd = false
+                }
 				this.$router.push({
 					name: 'processInspectForm',
 					query: { id: row == null ? null : row.id },
-                    params: { resultVal : row == null ? null : row.result }
+                    params: { resultVal : row == null ? null : row.result },
+                    isAdd: isAdd
                 })
 			},
             formatResult(row, column, cellValue){

--
Gitblit v1.9.3