From fd33107c412decf4a72184558354314a9c82e92c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 23 七月 2024 11:00:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspect-order-plan.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 0ca77b4..22dc87d 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -233,16 +233,19 @@
font: '妫�楠�',
type: 'text',
method: 'handleInspection',
- disabFun: (row, index) => {
- return row.userId == null || row.insState == 3 || row.insState == 5
- }
+ // 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
+ // }
}, {
id: '',
font: '浜ゆ帴',
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 ||JSON.parse(localStorage.getItem("user")).name != row.userName
}
}, {
id: '',
--
Gitblit v1.9.3