diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index a97f752..90bc3ad 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -28,14 +28,15 @@ }) const showText = computed(() => { console.log('showText') - if (props.nodeConfig.type == 0) { - return userStore.name - // return $func.arrToStr(props.flowPermission) || '所有人' + if (props.nodeConfig.type == 0) { // 发起人 + // return userStore.name + // return $func.arrToStr(props.flowPermission) || userStore.name + return props.flowPermission.name || userStore.name } - if (props.nodeConfig.type == 1) { + if (props.nodeConfig.type == 1) { // 审批 return $func.setApproverStr(props.nodeConfig) } - return $func.copyerStr(props.nodeConfig) + return $func.copyerStr(props.nodeConfig) // 抄送 }) watch(() => props.nodeConfig, (val) => { console.log('watch nodeConfig') diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index a97f752..90bc3ad 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -28,14 +28,15 @@ }) const showText = computed(() => { console.log('showText') - if (props.nodeConfig.type == 0) { - return userStore.name - // return $func.arrToStr(props.flowPermission) || '所有人' + if (props.nodeConfig.type == 0) { // 发起人 + // return userStore.name + // return $func.arrToStr(props.flowPermission) || userStore.name + return props.flowPermission.name || userStore.name } - if (props.nodeConfig.type == 1) { + if (props.nodeConfig.type == 1) { // 审批 return $func.setApproverStr(props.nodeConfig) } - return $func.copyerStr(props.nodeConfig) + return $func.copyerStr(props.nodeConfig) // 抄送 }) watch(() => props.nodeConfig, (val) => { console.log('watch nodeConfig') diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue index 2de6650..457d9ab 100644 --- a/src/components/workFlow/nodeWrapBan.vue +++ b/src/components/workFlow/nodeWrapBan.vue @@ -25,11 +25,16 @@ }) const showText = computed(() => { console.log('showText') - if (props.nodeConfig.type == 0) { return $func.arrToStr(props.flowPermission) || '所有人' } - if (props.nodeConfig.type == 1) { - return $func.setApproverStr(props.nodeConfig) + if (props.nodeConfig.type == 0) { + console.log('pppppppp') + console.log(props.flowPermission) + // return $func.arrToStr(props.flowPermission) || '所有人' + return props.flowPermission.name || userStore.name } - return $func.copyerStr(props.nodeConfig) + if (props.nodeConfig.type == 1) { + return $func.setApproverStr(props.nodeConfig) // 审批 + } + return $func.copyerStr(props.nodeConfig) // 抄送 }) watch(() => props.nodeConfig, (val) => { console.log('watch nodeConfig') diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index a97f752..90bc3ad 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -28,14 +28,15 @@ }) const showText = computed(() => { console.log('showText') - if (props.nodeConfig.type == 0) { - return userStore.name - // return $func.arrToStr(props.flowPermission) || '所有人' + if (props.nodeConfig.type == 0) { // 发起人 + // return userStore.name + // return $func.arrToStr(props.flowPermission) || userStore.name + return props.flowPermission.name || userStore.name } - if (props.nodeConfig.type == 1) { + if (props.nodeConfig.type == 1) { // 审批 return $func.setApproverStr(props.nodeConfig) } - return $func.copyerStr(props.nodeConfig) + return $func.copyerStr(props.nodeConfig) // 抄送 }) watch(() => props.nodeConfig, (val) => { console.log('watch nodeConfig') diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue index 2de6650..457d9ab 100644 --- a/src/components/workFlow/nodeWrapBan.vue +++ b/src/components/workFlow/nodeWrapBan.vue @@ -25,11 +25,16 @@ }) const showText = computed(() => { console.log('showText') - if (props.nodeConfig.type == 0) { return $func.arrToStr(props.flowPermission) || '所有人' } - if (props.nodeConfig.type == 1) { - return $func.setApproverStr(props.nodeConfig) + if (props.nodeConfig.type == 0) { + console.log('pppppppp') + console.log(props.flowPermission) + // return $func.arrToStr(props.flowPermission) || '所有人' + return props.flowPermission.name || userStore.name } - return $func.copyerStr(props.nodeConfig) + if (props.nodeConfig.type == 1) { + return $func.setApproverStr(props.nodeConfig) // 审批 + } + return $func.copyerStr(props.nodeConfig) // 抄送 }) watch(() => props.nodeConfig, (val) => { console.log('watch nodeConfig') diff --git a/src/views/setting.vue b/src/views/setting.vue index 9775d61..fb59203 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -157,15 +157,21 @@ tipVisible.value = true return } - processConfig.value.flowPermission = flowPermission.value if (!props.isAddProcess) { + // processConfig.value.flowPermission = flowPermission.value //编辑时不允许改发起人 const res = await editProcess(processConfig.value) if (res.code == 200) { ElMessage.success('编辑流程成功') } } else { + processConfig.value.flowPermission = { // 新建时发起人是此时的用户 + name: user.name, // 用户名 + targetId: user.id, // 用户id + type: 1, // 成员 + } + const res = await addProcess(processConfig.value) if (res.code == 200) { ElMessage.success('创建流程成功') diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index a97f752..90bc3ad 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -28,14 +28,15 @@ }) const showText = computed(() => { console.log('showText') - if (props.nodeConfig.type == 0) { - return userStore.name - // return $func.arrToStr(props.flowPermission) || '所有人' + if (props.nodeConfig.type == 0) { // 发起人 + // return userStore.name + // return $func.arrToStr(props.flowPermission) || userStore.name + return props.flowPermission.name || userStore.name } - if (props.nodeConfig.type == 1) { + if (props.nodeConfig.type == 1) { // 审批 return $func.setApproverStr(props.nodeConfig) } - return $func.copyerStr(props.nodeConfig) + return $func.copyerStr(props.nodeConfig) // 抄送 }) watch(() => props.nodeConfig, (val) => { console.log('watch nodeConfig') diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue index 2de6650..457d9ab 100644 --- a/src/components/workFlow/nodeWrapBan.vue +++ b/src/components/workFlow/nodeWrapBan.vue @@ -25,11 +25,16 @@ }) const showText = computed(() => { console.log('showText') - if (props.nodeConfig.type == 0) { return $func.arrToStr(props.flowPermission) || '所有人' } - if (props.nodeConfig.type == 1) { - return $func.setApproverStr(props.nodeConfig) + if (props.nodeConfig.type == 0) { + console.log('pppppppp') + console.log(props.flowPermission) + // return $func.arrToStr(props.flowPermission) || '所有人' + return props.flowPermission.name || userStore.name } - return $func.copyerStr(props.nodeConfig) + if (props.nodeConfig.type == 1) { + return $func.setApproverStr(props.nodeConfig) // 审批 + } + return $func.copyerStr(props.nodeConfig) // 抄送 }) watch(() => props.nodeConfig, (val) => { console.log('watch nodeConfig') diff --git a/src/views/setting.vue b/src/views/setting.vue index 9775d61..fb59203 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -157,15 +157,21 @@ tipVisible.value = true return } - processConfig.value.flowPermission = flowPermission.value if (!props.isAddProcess) { + // processConfig.value.flowPermission = flowPermission.value //编辑时不允许改发起人 const res = await editProcess(processConfig.value) if (res.code == 200) { ElMessage.success('编辑流程成功') } } else { + processConfig.value.flowPermission = { // 新建时发起人是此时的用户 + name: user.name, // 用户名 + targetId: user.id, // 用户id + type: 1, // 成员 + } + const res = await addProcess(processConfig.value) if (res.code == 200) { ElMessage.success('创建流程成功') diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 3051061..a66f871 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -346,7 +346,14 @@