From 96e39f2c7bf5281e52389e55410cddca88f55bac Mon Sep 17 00:00:00 2001
From: caixiaofeng <1941338475@qq.com>
Date: Sat, 25 Nov 2023 20:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowDesign/nodes/Approval/content.vue     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/flowDesign/nodes/Approval/content.vue b/src/views/flowDesign/nodes/Approval/content.vue
index db7d530..33ec3ef 100644
--- a/src/views/flowDesign/nodes/Approval/content.vue
+++ b/src/views/flowDesign/nodes/Approval/content.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import {ApprovalNode} from './index'
-import {ref, watchEffect} from "vue";
+import {inject, Ref, ref, watchEffect} from "vue";
 import {getList, User} from '~/api/modules/user'
+import {getList as getRoles, Role} from '~/api/modules/role'
+import {Field} from "~/components/Render/interface";
 
 export interface ApprovalContentProps {
   node: ApprovalNode
@@ -9,6 +11,9 @@ export interface ApprovalContentProps {
 
 const $props = withDefaults(defineProps<ApprovalContentProps>(), {})
 const content = ref<string>('')
+const {fields} = inject<{
+  fields: Ref<Field[]>
+}>('nodeHooks')!
 watchEffect(() => {
   const props = $props.node
   if (props.assigneeType === 'choice') {
@@ -18,9 +23,11 @@ watchEffect(() => {
   } else if (props.assigneeType === 'leader') {
     content.value = props.leader === 1 ? '直属上级' : `${props.leader}级上级`
   } else if (props.assigneeType === 'formUser') {
-    content.value = '表单内人员'
+    const title = fields.value.find(e => e.id === props.formUser)?.title || props.formUser || '?'
+    content.value = `表单内（${title}）人员`
   } else if (props.assigneeType === 'formRole') {
-    content.value = '表单内角色'
+    const title = fields.value.find(e => e.id === props.formRole)?.title || props.formRole || '?'
+    content.value = `表单内（${title}）角色`
   } else if (props.assigneeType === 'user') {
     if (props.users.length > 0) {
       getList(props.users).then(res => {
@@ -33,7 +40,11 @@ watchEffect(() => {
     }
   } else if (props.assigneeType === 'role') {
     if (props.roles.length > 0) {
-      // 可以从异步后端查询出角色名,显示在content中
+      getRoles(props.roles).then(res => {
+        if(res.success){
+          content.value = res.data.map((item: Role) => item.name).join('、')
+        }
+      })
     } else {
       content.value = '未指定角色'
     }