From aca0fd057e82d92446063c7995c91608af4a5237 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 14 Jul 2025 08:57:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=A1=E6=89=B9=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8F=90=E4=BA=A4=E4=BA=BA=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlogs.vue | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 1712577b..1ae58329 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -113,9 +113,7 @@
 				></el-table-column>
 				<el-table-column label="审批单号">
 					<template #default="scope">
-						<el-icon v-if="scope.row.ticket !== null" color="green">
-							{{ scope.row.ticket_.sn }}
-						</el-icon>
+						<span v-if="scope.row.ticket_!==null">{{ scope.row.ticket_.sn }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column
@@ -145,7 +143,7 @@
 							size="small"
 							v-auth="'mlog.delete'"
 							type="danger"
-							v-if="scope.row.submit_time == null"
+							v-if="scope.row.ticket== null&&scope.row.submit_time == null"
 							@click.stop="table_del(scope.row, scope.$index)"
 						>删除</el-button>
 						<el-button
@@ -157,7 +155,7 @@
 						>撤回</el-button>
 						<el-button
 							link
-							v-if="scope.row.ticket_!== null&&userId==scope.row.ticket_.create_by&&scope.row.ticket_.state_!==null&&scope.row.ticket_.state_.enable_retreat"
+							v-if="scope.row.ticket_!== null&&scope.row.ticket_.state_!==null&&scope.row.ticket_.state_.enable_retreat"
 							size="small"
 							type="danger"
 							@click.stop="mlogWf(scope.row)"
@@ -336,13 +334,21 @@ export default {
 			});
 		},
 		mlogWf(row){
-			this.$confirm(`确定撤回该日志审批吗？`, "提示", {
-				type: "warning",
-			}).then(() => {
-				this.$API.wf.ticket.ticketRetreat.req(row.ticket).then(res=>{
-					that.$refs.table.refresh();
+			let that = this;
+			if(that.userId!==row.ticket_.create_by){
+				this.$confirm(`需要日志提交人撤回该日志`, "提示", {
+					type: "warning",
+				}).then(() => {})
+			}else{
+				this.$confirm(`确定撤回该日志审批吗？`, "提示", {
+					type: "warning",
+				}).then(() => {
+					this.$API.wf.ticket.ticketRetreat.req(row.ticket).then(res=>{
+						that.$refs.table.refresh();
+					})
 				})
-			})
+			}
+			
 		},
 		customMethod(row,index){
 			let color = '',context = '';