From adf4c23dbc077ed74835ca6c71cd48873c20fc4b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 23 Nov 2025 18:23:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E3=80=90antd/ele=E3=80=91=E3=80=90?=
 =?UTF-8?q?bpm=E3=80=91=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=AF=B9=E5=BA=94=20https://github.com/yudao?=
 =?UTF-8?q?code/yudao-ui-admin-vben/issues/142?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bpm/model/modules/category-draggable-model.vue    | 6 +++---
 apps/web-antd/src/views/bpm/processInstance/index.vue       | 2 +-
 .../views/bpm/model/modules/category-draggable-model.vue    | 6 +++---
 apps/web-ele/src/views/bpm/processInstance/index.vue        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
index 1188b4ea7..83df310b3 100644
--- a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
+++ b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue
@@ -669,7 +669,7 @@ function handleRenameSuccess() {
                   size="small"
                   class="px-1"
                   @click="modelOperation('update', row.id)"
-                  :disabled="!isManagerUser(row) || !hasPermiUpdate"
+                  :disabled="!isManagerUser(row) && !hasPermiUpdate"
                 >
                   修改
                 </Button>
@@ -678,7 +678,7 @@ function handleRenameSuccess() {
                   size="small"
                   class="px-1"
                   @click="handleDeploy(row)"
-                  :disabled="!isManagerUser(row) || !hasPermiDeploy"
+                  :disabled="!isManagerUser(row) && !hasPermiDeploy"
                 >
                   发布
                 </Button>
@@ -718,7 +718,7 @@ function handleRenameSuccess() {
                       <Menu.Item
                         danger
                         key="handleDelete"
-                        :disabled="!isManagerUser(row) || !hasPermiDelete"
+                        :disabled="!isManagerUser(row) && !hasPermiDelete"
                       >
                         删除
                       </Menu.Item>
diff --git a/apps/web-antd/src/views/bpm/processInstance/index.vue b/apps/web-antd/src/views/bpm/processInstance/index.vue
index 6a7492520..44c05463d 100644
--- a/apps/web-antd/src/views/bpm/processInstance/index.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/index.vue
@@ -137,7 +137,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
         <template
           v-if="
             row.status === BpmProcessInstanceStatus.RUNNING &&
-            row.tasks!.length > 0
+            row.tasks?.length! > 0
           "
         >
           <!-- 单人审批 -->
diff --git a/apps/web-ele/src/views/bpm/model/modules/category-draggable-model.vue b/apps/web-ele/src/views/bpm/model/modules/category-draggable-model.vue
index 575f81f21..bb6fd0058 100644
--- a/apps/web-ele/src/views/bpm/model/modules/category-draggable-model.vue
+++ b/apps/web-ele/src/views/bpm/model/modules/category-draggable-model.vue
@@ -665,7 +665,7 @@ function handleRenameSuccess() {
                   link
                   size="small"
                   @click="modelOperation('update', row.id)"
-                  :disabled="!isManagerUser(row) || !hasPermiUpdate"
+                  :disabled="!isManagerUser(row) && !hasPermiUpdate"
                 >
                   修改
                 </ElButton>
@@ -673,7 +673,7 @@ function handleRenameSuccess() {
                   link
                   size="small"
                   @click="handleDeploy(row)"
-                  :disabled="!isManagerUser(row) || !hasPermiDeploy"
+                  :disabled="!isManagerUser(row) && !hasPermiDeploy"
                 >
                   发布
                 </ElButton>
@@ -717,7 +717,7 @@ function handleRenameSuccess() {
                       </el-dropdown-item>
                       <el-dropdown-item
                         @click="handleModelCommand('handleDelete', row)"
-                        :disabled="!isManagerUser(row) || !hasPermiDelete"
+                        :disabled="!isManagerUser(row) && !hasPermiDelete"
                       >
                         删除
                       </el-dropdown-item>
diff --git a/apps/web-ele/src/views/bpm/processInstance/index.vue b/apps/web-ele/src/views/bpm/processInstance/index.vue
index 776e2c1a2..52936bcbc 100644
--- a/apps/web-ele/src/views/bpm/processInstance/index.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/index.vue
@@ -138,7 +138,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
         <template
           v-if="
             row.status === BpmProcessInstanceStatus.RUNNING &&
-            row.tasks!.length > 0
+            row.tasks?.length! > 0
           "
         >
           <!-- 单人审批 -->