From e5b8552284d68998d0740bf24789275b14d35854 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 23 Jul 2025 14:49:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E5=90=8E=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_detail.vue | 6 +++---
 src/views/wpm_gx/mlogs.vue       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 06781730..408fb848 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -142,13 +142,13 @@
 								link
 								type="primary"
 								@click="table_in_edit(scope.row)"
-								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1)"
+								:disabled="mlogItem.submit_time !== null||(mlogItem.ticket!==null&&mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1)"
 							>
 								编辑
 							</el-button>
 							<el-button
 								link
-								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1)"
+								:disabled="mlogItem.submit_time !== null||(mlogItem.ticket!==null&&mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1)"
 								type="danger"
 								@click="table_in_del(scope.row)"
 							>
@@ -302,7 +302,7 @@
 							<el-button
 								link
 								type="primary"
-								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1)"
+								:disabled="mlogItem.submit_time !== null||(mlogItem.ticket!==null&&mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1)"
 								@click="table_out_check(scope.row)"
 							>
 								检验
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 1ae58329..4cfd2043 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -143,7 +143,7 @@
 							size="small"
 							v-auth="'mlog.delete'"
 							type="danger"
-							v-if="scope.row.ticket== null&&scope.row.submit_time == null"
+							v-if="scope.row.submit_time == null&&(scope.row.ticket== null||(scope.row.ticket_&&scope.row.ticket_.state_.type==1))"
 							@click.stop="table_del(scope.row, scope.$index)"
 						>删除</el-button>
 						<el-button