From adeed9c2997994193ceb4d9667e7ef1bfe07de48 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 七月 2024 10:57:28 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b1-inspect-order-plan.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 0ca77b4..ca954d6 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -233,7 +233,10 @@
font: '妫�楠�',
type: 'text',
method: 'handleInspection',
- disabFun: (row, index) => {
+ // disabFun: (row, index) => {
+ // return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
+ // }
+ disabFun: (row, index) => {
return row.userId == null || row.insState == 3 || row.insState == 5
}
}, {
@@ -242,7 +245,7 @@
type: 'text',
method: 'handleConnect',
disabFun: (row, index) => {
- return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3
+ return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3||JSON.parse(localStorage.getItem("user")).name != row.userName
}
},
{
@@ -251,7 +254,7 @@
type: 'text',
method: 'handleReview',
disabFun: (row, index) => {
- return row.userId == null || row.insState != 3 || row.verifyUser != 1
+ return row.userId == null || row.insState != 3 || row.verifyUser != 1||JSON.parse(localStorage.getItem("user")).name != row.userName
}
}, {
id: '',
--
Gitblit v1.9.3