|
@@ -223,10 +223,12 @@ import { uploadFile } from '@/api/file'
|
|
|
import { getInstanceAttachments } from '@/api/flow/instance'
|
|
import { getInstanceAttachments } from '@/api/flow/instance'
|
|
|
import { beforeFileUpload, getUploadUrl, getFileName } from '@/utils/file'
|
|
import { beforeFileUpload, getUploadUrl, getFileName } from '@/utils/file'
|
|
|
import type { FlowTask, ApprovalAction, Attachment } from '@/types/flow'
|
|
import type { FlowTask, ApprovalAction, Attachment } from '@/types/flow'
|
|
|
|
|
+import { useUserStore } from '@/stores/user-store'
|
|
|
import type { User } from '@/types/system'
|
|
import type { User } from '@/types/system'
|
|
|
import InstanceDetail from '@/views/flow/execute/InstanceDetail.vue'
|
|
import InstanceDetail from '@/views/flow/execute/InstanceDetail.vue'
|
|
|
import FilePreview from '@/components/FilePreview/index.vue'
|
|
import FilePreview from '@/components/FilePreview/index.vue'
|
|
|
|
|
|
|
|
|
|
+const userStore = useUserStore()
|
|
|
const loading = ref(false)
|
|
const loading = ref(false)
|
|
|
const tableData = ref<FlowTask[]>([])
|
|
const tableData = ref<FlowTask[]>([])
|
|
|
const total = ref(0)
|
|
const total = ref(0)
|
|
@@ -344,7 +346,7 @@ function buildActionData(): ApprovalAction {
|
|
|
comment: form.comment
|
|
comment: form.comment
|
|
|
}
|
|
}
|
|
|
if (form.action === 'transfer' && form.transferTo) {
|
|
if (form.action === 'transfer' && form.transferTo) {
|
|
|
- data.transferTo = Number(form.transferTo)
|
|
|
|
|
|
|
+ data.transferToUserId = Number(form.transferTo)
|
|
|
}
|
|
}
|
|
|
if (attachmentList.value.length > 0) {
|
|
if (attachmentList.value.length > 0) {
|
|
|
data.attachmentUrls = JSON.stringify(attachmentList.value.map((f: any) => f.response || f.url).filter(Boolean))
|
|
data.attachmentUrls = JSON.stringify(attachmentList.value.map((f: any) => f.response || f.url).filter(Boolean))
|
|
@@ -378,15 +380,17 @@ async function openTransfer(row: FlowTask) {
|
|
|
currentTask.value = row
|
|
currentTask.value = row
|
|
|
form.action = 'transfer'
|
|
form.action = 'transfer'
|
|
|
batchMode.value = false
|
|
batchMode.value = false
|
|
|
- // 转办选人:ROLE 任务查同角色用户,USER 任务查全部用户
|
|
|
|
|
|
|
+ // 转办选人:ROLE 任务查同角色用户,USER 任务查全部用户,过滤掉自己
|
|
|
if (row.assigneeType === 'ROLE' && row.assigneeId) {
|
|
if (row.assigneeType === 'ROLE' && row.assigneeId) {
|
|
|
try {
|
|
try {
|
|
|
- userList.value = await listUsersByRole(row.assigneeId)
|
|
|
|
|
|
|
+ const users = await listUsersByRole(row.assigneeId)
|
|
|
|
|
+ userList.value = users.filter(u => u.id !== userStore.userInfo?.id)
|
|
|
} catch {
|
|
} catch {
|
|
|
userList.value = []
|
|
userList.value = []
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
await loadUsers()
|
|
await loadUsers()
|
|
|
|
|
+ userList.value = userList.value.filter(u => u.id !== userStore.userInfo?.id)
|
|
|
}
|
|
}
|
|
|
await loadPreviousAttachments(row.instanceId)
|
|
await loadPreviousAttachments(row.instanceId)
|
|
|
approveDrawerVisible.value = true
|
|
approveDrawerVisible.value = true
|