From c146c0ae4e57b26e798157fe453426e9fc26db34 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 09 八月 2024 09:04:47 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspect-order-plan.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 03204c7..ea39299 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -345,7 +345,7 @@
type: 'text',
method: 'claimFun',
disabFun: (row, index) => {
- return row.userName != null||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
+ return row.userName != null || row.checkName!=null
}
}
],
--
Gitblit v1.9.3