From 8d4c67323bee47d6225f150e9f61868c6434a358 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 03 九月 2025 17:48:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/tms/combinationKnife/ToolCombinationList.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/tms/combinationKnife/ToolCombinationList.vue b/src/views/tms/combinationKnife/ToolCombinationList.vue
index 439b967..7b731e7 100644
--- a/src/views/tms/combinationKnife/ToolCombinationList.vue
+++ b/src/views/tms/combinationKnife/ToolCombinationList.vue
@@ -69,7 +69,7 @@
         </template>
 
         <span slot='action' slot-scope='text, record'>
-              <a-popconfirm title='纭畾鎷嗗嵏鍚�?' @confirm='() => handleDelete(record.id)'>
+              <a-popconfirm title='纭畾鎷嗗嵏鍚�?' v-if="record.status == '1'" @confirm='() => handleDelete(record.id)'>
                   <a>鍒�鍏锋媶鍗�</a>
                 </a-popconfirm>
         </span>

--
Gitblit v1.9.3