From 08ab4ebee26bb6c275b68c350bfa93ae770d6fee Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 30 Jan 2026 16:26:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
index 4a13918..11c31a3 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
@@ -31,12 +31,10 @@
 				<el-table-column prop="distributeUserName" show-overflow-tooltip label="分发人员" />
 				<el-table-column label="操作" class-name="operation-btns" width="140">
 					<template v-slot="{ row }">
-						<el-link  type="primary"
-											@click="openDistributeDialog(row)"
-											:disabled="!requester || (row.distributeStatus === 1 || currentRow.taskStatus !== '8')"
-						>
+						<el-link type="primary" @click="openDistributeDialog(row)" v-if="permission.clueEvents_distribute && (row.distributeStatus === 0 || row.distributeStatus === 2)">
 							转为事件并分发
 						</el-link>
+						<el-button disabled type="text" v-else>转为事件并分发</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -64,6 +62,9 @@
 const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
 const activeName = ref('all')
 
+const permission = computed(() => store.state.user.permission)
+console.log(permission.value.clueEvents_distribute, 'permission')
+
 const visible = defineModel()
 const loading = ref(false)
 const list = ref([])
@@ -75,7 +76,7 @@
 const distributeStatusOptions = [
 	{ label: '未分发', value: 0 },
 	{ label: '已分发', value: 1 },
-	{ label: '已驳回', value: 2 },
+	{ label: '已退回', value: 2 },
 	{ label: '已确认', value: 3 },
 ]
 

--
Gitblit v1.9.3