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 | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index c20f6ed..ea39299 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -303,14 +303,14 @@
font: '鏁版嵁鏌ョ湅',
type: 'text',
method: 'handleDataLook',
- disabFun: (row, index) => {
- const user = JSON.parse(localStorage.getItem('user'))
- let currentUserName = ''
- if(user){
- currentUserName = user.name
- }
- return row.userName!=currentUserName && row.checkName!=currentUserName
- }
+ //disabFun: (row, index) => {
+ //const user = JSON.parse(localStorage.getItem('user'))
+ // let currentUserName = ''
+ // if(user){
+ // currentUserName = user.name
+ //}
+ //return row.userName.indexOf(currentUserName)<0 && row.checkName.indexOf(currentUserName)<0
+ //}
},{
id: '',
font: '妫�楠�',
--
Gitblit v1.9.3