|
@@ -217,6 +217,7 @@ import { ref, reactive, onMounted, computed } from 'vue'
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
|
|
import { Check, Close, Switch, Plus, View } from '@element-plus/icons-vue'
|
|
import { Check, Close, Switch, Plus, View } from '@element-plus/icons-vue'
|
|
|
import { listTodo, approveTask, rejectTask, transferTask, addSignTask, batchApproveTask, batchRejectTask } from '@/api/flow/task'
|
|
import { listTodo, approveTask, rejectTask, transferTask, addSignTask, batchApproveTask, batchRejectTask } from '@/api/flow/task'
|
|
|
|
|
+import { listUsersByRole } from '@/api/system/role'
|
|
|
import { listUser } from '@/api/system/user'
|
|
import { listUser } from '@/api/system/user'
|
|
|
import { uploadFile } from '@/api/file'
|
|
import { uploadFile } from '@/api/file'
|
|
|
import { getInstanceAttachments } from '@/api/flow/instance'
|
|
import { getInstanceAttachments } from '@/api/flow/instance'
|
|
@@ -377,6 +378,16 @@ 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 任务查全部用户
|
|
|
|
|
+ if (row.assigneeType === 'ROLE' && row.assigneeId) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ userList.value = await listUsersByRole(row.assigneeId)
|
|
|
|
|
+ } catch {
|
|
|
|
|
+ userList.value = []
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ await loadUsers()
|
|
|
|
|
+ }
|
|
|
await loadPreviousAttachments(row.instanceId)
|
|
await loadPreviousAttachments(row.instanceId)
|
|
|
approveDrawerVisible.value = true
|
|
approveDrawerVisible.value = true
|
|
|
}
|
|
}
|