From 32d56327d6f69373ada1c3447f542ec1a39282b1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 17:31:01 +0800
Subject: [PATCH] 合并冲突
---
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