BruceSun
/
SAMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 候选角色组可选表达式

rf
tony 2022-12-14 16:25:11 +08:00
parent be2171de98
commit f8a4d8f9a7
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/components/Process/components/nodePanel/task.vue
View File

@ -39,7 +39,9 @@
<!--候选角色--> <!--候选角色-->
<!-- <el-button slot="append" size="mini" icon="el-icon-user" @click="singleRoleCheck"></el-button>--> <!-- <el-button slot="append" size="mini" icon="el-icon-user" @click="singleRoleCheck"></el-button>-->
<!-- <el-divider direction="vertical"></el-divider>--> <!-- <el-divider direction="vertical"></el-divider>-->
<el-button slot="append" size="mini" icon="el-icon-tickets" @click="multipleRoleCheck"></el-button> <el-button slot="append" size="mini" icon="el-icon-user" @click="multipleRoleCheck"></el-button>
<!--选择表达式-->
<el-button slot="append" size="mini" icon="el-icon-tickets" @click="singleExpCheck('candidateGroups')"></el-button>
</el-input> </el-input>
</template> </template>
</x-form> </x-form>
@ -628,6 +630,8 @@ export default {
this.updateProperties({'flowable:assignee': selection.id.toString()}); this.updateProperties({'flowable:assignee': selection.id.toString()});
}else if ("candidateUsers" === this.expType) { }else if ("candidateUsers" === this.expType) {
this.updateProperties({'flowable:candidateUsers': selection.id.toString()}); this.updateProperties({'flowable:candidateUsers': selection.id.toString()});
}else if ("candidateGroups" === this.expType) {
this.updateProperties({'flowable:candidateGroups': selection.id.toString()});
} }
this.checkValues = selection.name; this.checkValues = selection.name;
this.expType = null; this.expType = null;

15
ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
View File

@ -443,18 +443,17 @@ export default {
}, },
/** 审批任务 */ /** 审批任务 */
taskComplete() { taskComplete() {
const that = this if (!this.taskForm.values && this.checkSendUser){
if (!that.taskForm.values && that.checkSendUser){ this.msgError("请选择流程接收人员");
that.msgError("请选择流程接收人员");
return; return;
} }
if (!that.taskForm.comment){ if (!this.taskForm.comment){
that.msgError("请输入审批意见"); this.msgError("请输入审批意见");
return; return;
} }
complete(that.taskForm).then(response => { complete(this.taskForm).then(response => {
that.msgSuccess(response.msg); this.msgSuccess(response.msg);
that.goBack(); this.goBack();
}); });
}, },
/** 委派任务 */ /** 委派任务 */