clay
/
workflow-engine-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
邓洁 2023-03-21 22:59:39 +08:00
parent 2c8b9978e8 92e66c2f45
commit 08fe77cf2f
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flowable-engine-web/src/components/common/AvatarEllipsis.vue
View File

@ -66,7 +66,7 @@ export default {
this.$set(user, "color", "#0bbd87")
}
//审批通过
if (state === 'AGREE') {
if (state === 'AGREE' || state === 'AUTO_PASS') {
this.$set(user, "icon", "el-icon-check")
this.$set(user, "color", "#0bbd87")
}
@ -76,7 +76,7 @@ export default {
this.$set(user, "color", "#f78f5f")
}
//拒绝后评论
if (state === 'REFUSE') {
if (state === 'REFUSE' || state === 'AUTO_REFUSE') {
this.$set(user, "icon", "el-icon-close")
this.$set(user, "color", "#f56c6c")
}

48
flowable-engine-web/src/views/common/operation/OperationRender.vue
View File

@ -30,12 +30,12 @@
<div style="font-size: 14px; font-weight: bold;">{{ operation.remark }}</div>
</div>
</div>
<template v-if="operation.operation === 'comment' || operation.operation === 'refuse'">
<template v-if="operation.comment">
<div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">
<div>
{{ operation.comment.context }}
</div>
<div style="margin-top: 10px;" v-if="operation.comment.attachments.length > 0">
<div style="margin-top: 10px;" v-if="operation.comment.attachments && operation.comment.attachments.length > 0">
<template v-for="(item) in getAttachmentList(operation.comment.attachments,true)">
<el-image
style="width: 100px; height: 100px"
@ -125,11 +125,13 @@ export default {
for (let i = 0;i<this.operationList.length;i++) {
let operationNew = this.initOperationFun(this.operationList[i])
let userList = []
for (let user of operationNew.userInfo) {
let userNew = this.initUser(user)
userList.push(userNew)
if (operationNew.userInfo){
for (let user of operationNew.userInfo) {
let userNew = this.initUser(user)
userList.push(userNew)
}
operationNew.userInfo = userList
}
operationNew.userInfo = userList
// operationListNew.push(operationNew)
// this.operationList.push(operationNew)
this.operationList[i] = operationNew
@ -138,9 +140,12 @@ export default {
//获取到对应附件的地址
getAttachmentList(attachments, image) {
let result = [];
for (let attachment of attachments) {
if (attachment.isImage === image) {
result.push(attachment)
console.log(attachments)
if (attachments){
for (let attachment of attachments) {
if (attachment.isImage === image) {
result.push(attachment)
}
}
}
return result;
@ -153,7 +158,7 @@ export default {
this.$set(user, "color", "#0bbd87")
}
//审批通过
if (state === 'AGREE') {
if (state === 'AGREE' || state === 'AUTO_PASS') {
this.$set(user, "icon", "el-icon-check")
this.$set(user, "color", "#0bbd87")
}
@ -180,13 +185,12 @@ export default {
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' || state === 'AUTO_PASS') {
this.$set(operation, "icon", "el-icon-check")
this.$set(operation, "color", "#0bbd87")
this.$set(operation, "remark", operation.userInfo.name + ' (已同意)')
this.$set(operation, "remark", ' (已同意)')
}
if (state === 'PASS'){
this.$set(operation, "icon", "el-icon-more")
@ -196,31 +200,37 @@ export default {
if (state === 'RUNNING') {
this.$set(operation, "icon", "el-icon-loading")
this.$set(operation, "color", "#f78f5f")
this.$set(operation, "remark", operation.userInfo.name + ' (处理中)')
this.$set(operation, "remark",' (处理中)')
}
//回退
if (state === 'ROLLBACK') {
this.$set(operation, "icon", "el-icon-refresh")
this.$set(operation, "color", "#f78f5f")
this.$set(operation, "remark", ' (回退成功)')
}
//抄送
if (type === 'CC') {
this.$set(operation, "icon", "el-icon-s-promotion")
this.$set(operation, "color", "#3395f8")
this.$set(operation, "remark", operation.userInfo.name + ' (抄送成功)')
this.$set(operation, "remark", ' (抄送成功)')
}
//评论
if (state === 'COMMENT') {
this.$set(operation, "icon", "el-icon-chat-dot-round")
this.$set(operation, "color", "#0bbd87")
this.$set(operation, "remark", operation.userInfo.name + ' (添加了评论)')
this.$set(operation, "remark", ' (添加了评论)')
}
//拒绝后评论
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 + ' (填写拒绝理由)')
this.$set(operation, "remark", ' (填写拒绝理由)')
}
//拒绝操作
if (state === 'REFUSE' && type === 'OPINION') {
if ((state === 'REFUSE' || state === 'AUTO_REFUSE')&& type === 'OPINION') {
this.$set(operation, "icon", "el-icon-close")
this.$set(operation, "color", "#f56c6c")
this.$set(operation, "remark", operation.userInfo.name + ' (拒绝)')
this.$set(operation, "remark", ' (拒绝)')
}
return operation;
},