boyue2025/boyue-ui-admin-vue3
3
0
Fork 0
mirror of https://gitee.com/myxzgzs/boyue-ui-admin-vue3 synced 2025-08-08 08:22:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

!729 feat：添加simple设计器，分支条件下拉框非必填字段提示

Browse Source 
Merge pull request !729 from SamllNorth_Lee/feature/bpm
This commit is contained in:
芋道源码 2025-03-15 08:49:23 +00:00 committed by Gitee
commit d9db5818b8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue
View File

@ -12,7 +12,10 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="condition.conditionType === ConditionType.RULE && condition.conditionGroups" label="条件规则"> <el-form-item
v-if="condition.conditionType === ConditionType.RULE && condition.conditionGroups"
label="条件规则"
>
<div class="condition-group-tool"> <div class="condition-group-tool">
<div class="flex items-center"> <div class="flex items-center">
<div class="mr-4">条件组关系</div> <div class="mr-4">条件组关系</div>
@ -67,14 +70,23 @@
trigger: 'change' trigger: 'change'
}" }"
> >
<el-select style="width: 160px" v-model="rule.leftSide"> <el-select style="width: 160px" v-model="rule.leftSide" clearable>
<el-option <el-option
v-for="(field, fIdx) in fieldOptions" v-for="(field, fIdx) in fieldOptions"
:key="fIdx" :key="fIdx"
:label="field.title" :label="field.title"
:value="field.field" :value="field.field"
:disabled="!field.required" :disabled="!field.required"
/> >
<el-tooltip
content="表单字段非必填时不能作为流程分支条件"
effect="dark"
placement="right-start"
v-if="!field.required"
>
<span>{{ field.title }}</span>
</el-tooltip>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>

17
src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
View File

@ -749,19 +749,16 @@ const selectNextAssigneesConfirm = (id: string, userList: any[]) => {
} }
/** 审批通过时，校验每个自选审批人的节点是否都已配置了审批人 */ /** 审批通过时，校验每个自选审批人的节点是否都已配置了审批人 */
const validateNextAssignees = () => { const validateNextAssignees = () => {
// TODO @小北：可以考虑 Object.keys(nextAssigneesActivityNode.value).length === 0) return true；减少括号层级 if (Object.keys(nextAssigneesActivityNode.value).length === 0) return true
// 如果需要自选审批人，则校验自选审批人 // 如果需要自选审批人，则校验自选审批人
if (Object.keys(nextAssigneesActivityNode.value).length > 0) { // 校验每个节点是否都已配置审批人
// 校验每个节点是否都已配置审批人 for (const item of nextAssigneesActivityNode.value) {
for (const item of nextAssigneesActivityNode.value) { if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
if (isEmpty(approveReasonForm.nextAssignees[item.id])) { console.log('下一个节点【' + item.name + '】的审批人不能为空!')
// TODO @小北：可以打印下节点名，嘿嘿。 message.warning('下一个节点的审批人不能为空!')
message.warning('下一个节点的审批人不能为空!') return false
return false
}
} }
} }
return true
} }
/** 处理审批通过和不通过的操作 */ /** 处理审批通过和不通过的操作 */