From 71c4ece010f68a74eeff5e986caecb9a0bb2e36c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/b1-inspect-order-plan.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 874f946..838a1dc 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -229,7 +229,7 @@
 							type: 'text',
 							method: 'handleInspection',
 							disabFun: (row, index) => {
-								return row.userId == null || row.insState == 3
+								return row.userId == null || row.insState == 3 || row.insState == 5
 							}
 						}, {
 							id: '',
@@ -237,7 +237,7 @@
 							type: 'text',
 							method: 'handleConnect',
 							disabFun: (row, index) => {
-								return row.userId == null || row.insState == 3
+								return row.userId == null || row.orderUserId == null || row.insState == 5  || row.insState == 3
 							}
 						},
 						{

--
Gitblit v1.9.3