diff --git a/src/components/Process/UserNameDisplay.vue b/src/components/Process/UserNameDisplay.vue new file mode 100644 index 0000000..3791d2e --- /dev/null +++ b/src/components/Process/UserNameDisplay.vue @@ -0,0 +1,46 @@ + + + + {{ displayText || emptyText }} + + + + + + + diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue index 26aef91..5c17858 100644 --- a/src/components/Process/approvalRecord.vue +++ b/src/components/Process/approvalRecord.vue @@ -17,14 +17,9 @@ - + - - - {{ item }} - - - 无 + @@ -101,6 +96,7 @@ import { listByIds } from '@/api/system/oss'; import { flowHisTaskList } from '@/api/workflow/instance'; import FlowChart from '@/components/Process/flowChart.vue'; +import UserNameDisplay from '@/components/Process/UserNameDisplay.vue'; import download from '@/plugins/download'; import { useDict } from '@/utils/dict'; import { propTypes } from '@/utils/propTypes'; diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue index 93c995c..2069300 100644 --- a/src/views/workflow/task/allTaskWaiting.vue +++ b/src/views/workflow/task/allTaskWaiting.vue @@ -107,20 +107,13 @@ :show-overflow-tooltip="true" label="申请人" > - + - - - {{ name }} - - - - 无 - + - {{ scope.row.approveName }} + @@ -184,6 +177,7 @@ import workflowCommon from '@/api/workflow/workflowCommon'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; import messageType from '@/components/Process/MessageType.vue'; import processMeddle from '@/components/Process/processMeddle.vue'; +import UserNameDisplay from '@/components/Process/UserNameDisplay.vue'; import UserSelect from '@/components/UserSelect/index.vue'; import modal from '@/plugins/modal'; import { useDict } from '@/utils/dict'; diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue index 3441ffc..2eb6fbe 100644 --- a/src/views/workflow/task/taskFinish.vue +++ b/src/views/workflow/task/taskFinish.vue @@ -80,11 +80,9 @@ :show-overflow-tooltip="true" label="申请人" > - + - - {{ scope.row.approveName || '无' }} - + @@ -135,6 +133,7 @@ import { pageByTaskFinish } from '@/api/workflow/task'; import { TaskQuery, FlowTaskVO } from '@/api/workflow/task/types'; import workflowCommon from '@/api/workflow/workflowCommon'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; +import UserNameDisplay from '@/components/Process/UserNameDisplay.vue'; import UserSelect from '@/components/UserSelect/index.vue'; import { useDict } from '@/utils/dict'; diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index c91fb1a..0429bc4 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -72,16 +72,9 @@ - + - - - {{ name }} - - - - 无 - + @@ -121,6 +114,7 @@ import { pageByTaskWait } from '@/api/workflow/task'; import { TaskQuery, FlowTaskVO } from '@/api/workflow/task/types'; import workflowCommon from '@/api/workflow/workflowCommon'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; +import UserNameDisplay from '@/components/Process/UserNameDisplay.vue'; import UserSelect from '@/components/UserSelect/index.vue'; import { useDict } from '@/utils/dict';