clay : 任意节点退回完成 #34

Merged
clay merged 5 commits from master into pro 2023-03-20 09:29:16 +00:00
4 changed files with 22 additions and 20 deletions
Showing only changes of commit 9285814edc - Show all commits

View File

@ -60,26 +60,26 @@ export default {
initUser(user) {
let state = user.state
//
if (state === 'create') {
if (state === 'CREATE') {
this.$set(user, "icon", "el-icon-check")
this.$set(user, "color", "#0bbd87")
}
//
if (state === 'agree') {
if (state === 'AGREE') {
this.$set(user, "icon", "el-icon-check")
this.$set(user, "color", "#0bbd87")
}
//
if (state === 'running') {
if (state === 'RUNNING') {
this.$set(user, "icon", "el-icon-loading")
this.$set(user, "color", "#f78f5f")
}
//
if (state === 'refuse') {
if (state === 'REFUSE') {
this.$set(user, "icon", "el-icon-close")
this.$set(user, "color", "#f56c6c")
}
if (state === 'pass') {
if (state === 'PASS') {
this.$set(user, "icon", "el-icon-more")
this.$set(user, "color", "#c0c4cc")
}

View File

@ -148,26 +148,26 @@ export default {
initUser(user) {
let state = user.state
//
if (state === 'create') {
if (state === 'CREATE') {
this.$set(user, "icon", "el-icon-check")
this.$set(user, "color", "#0bbd87")
}
//
if (state === 'agree') {
if (state === 'AGREE') {
this.$set(user, "icon", "el-icon-check")
this.$set(user, "color", "#0bbd87")
}
//
if (state === 'running') {
if (state === 'RUNNING') {
this.$set(user, "icon", "el-icon-loading")
this.$set(user, "color", "#f78f5f")
}
//
if (state === 'refuse') {
if (state === 'REFUSE') {
this.$set(user, "icon", "el-icon-close")
this.$set(user, "color", "#f56c6c")
}
if (state === 'pass'){
if (state === 'PASS'){
this.$set(user, "icon", "el-icon-more")
this.$set(user, "color", "#c0c4cc")
}
@ -177,47 +177,47 @@ export default {
let state = operation.state
let type = operation.operation
//
if (state === 'create') {
if (state === 'CREATE') {
this.$set(operation, "icon", "el-icon-check")
this.$set(operation, "color", "#0bbd87")
this.$set(operation, "remark", operation.userInfo.name)
}
//
if (state === 'agree') {
if (state === 'AGREE') {
this.$set(operation, "icon", "el-icon-check")
this.$set(operation, "color", "#0bbd87")
this.$set(operation, "remark", operation.userInfo.name + ' (已同意)')
}
if (state === 'pass'){
if (state === 'PASS'){
this.$set(operation, "icon", "el-icon-more")
this.$set(operation, "color", "#c0c4cc")
}
//
if (state === 'running') {
if (state === 'RUNNING') {
this.$set(operation, "icon", "el-icon-loading")
this.$set(operation, "color", "#f78f5f")
this.$set(operation, "remark", operation.userInfo.name + ' (处理中)')
}
//
if (type === 'cc') {
if (type === 'CC') {
this.$set(operation, "icon", "el-icon-s-promotion")
this.$set(operation, "color", "#3395f8")
this.$set(operation, "remark", operation.userInfo.name + ' (抄送成功)')
}
//
if (state === 'comment') {
if (state === 'COMMENT') {
this.$set(operation, "icon", "el-icon-chat-dot-round")
this.$set(operation, "color", "#0bbd87")
this.$set(operation, "remark", operation.userInfo.name + ' (添加了评论)')
}
//
if (state === 'refuse' && type === 'comment') {
if (state === 'REFUSE' && type === 'COMMENT') {
this.$set(operation, "icon", "el-icon-chat-dot-round")
this.$set(operation, "color", "#f56c6c")
this.$set(operation, "remark", operation.userInfo.name + ' (填写拒绝理由)')
}
//
if (state === 'refuse' && type === 'opinion') {
if (state === 'REFUSE' && type === 'OPINION') {
this.$set(operation, "icon", "el-icon-close")
this.$set(operation, "color", "#f56c6c")
this.$set(operation, "remark", operation.userInfo.name + ' (拒绝)')

View File

@ -27,7 +27,7 @@ export default {
computed:{
selectUser(){
return {
show: this.config.props.shouldAdd,
show: this.config.props.assignedType !== 'ASSIGN_USER',
multiple: true
};
},

View File

@ -120,10 +120,12 @@ export default {
// todo
submitForm(){
let processInstance = this.$refs.processInstance;
let selectUserMap = {}
this.$store.state.selectUserMap.forEach(((value, key) => {selectUserMap[key]=value}))
let paramsData = {
processDefinitionId: this.selectForm.processDefinitionId,
formData: JSON.stringify(processInstance.formData),
selectUserMap: this.$store.state.selectUserMap
optionalUser: selectUserMap
}
processInstance.validate(valid => {
if (valid) {