odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat : 审批记录的代理审批,用户管理的设置代理功能,首页待办

Browse Source
This commit is contained in:
odjbin
2024-09-22 17:58:13 +08:00
parent 4e325196c8
commit 47633749fb
6 changed files with 186 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/views/workflow/common/OperationRender.vue
View File

@@ -1,8 +1,8 @@
<template>
<!-- <div>-->
<!-- <el-button v-print="print" color="#ded0b2" icon="Printer"> 打印</el-button> id="printBox"-->
<!-- </div>-->
<div style="margin: 10px" >
<!-- <div>-->
<!-- <el-button v-print="print" color="#ded0b2" icon="Printer"> 打印</el-button> id="printBox"-->
<!-- </div>-->
<div style="margin: 10px">
<el-timeline>
<el-timeline-item v-for="(operation,index) in operationList"
:key="index" :timestamp="operation.startTime"
@@ -11,7 +11,7 @@
size="large"
placement="top">
<template #dot>
<!-- :style="{backgroundColor:operation.color}"-->
<!-- :style="{backgroundColor:operation.color}"-->
<div style="background-color:#fff;width: 16px; height: 16px">
<el-icon :color="operation.color" size="16px">
<component :is="operation.icon"></component>
@@ -25,10 +25,10 @@
<div class="card">
<div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name"
:style="{'flex-direction': isColumn?'column':'row'}">
<div class="avatar-block" :style="{'margin-bottom': isColumn?'10px':'0'}">
<div class="avatar-block" :style="{'margin': isColumn?'0 0 10px 18px':'0'}">
<name-circle :user="user" :type="operation.operation"/>
<div class="name">
<div style="display: flex;align-items: center">
<div class="name-block" :style="{'margin': isColumn?'0 0 0 30px':'0 20px 0 10px'}">
<div style="display: flex;align-items: center" >
<el-icon :color="user.accountType==='0'?'#95d475':user.accountType==null?'#95d475':'#409eff'"
style="margin-right: 5px;">
<UserFilled/>
@@ -38,14 +38,25 @@
<span>{{ user.jobActivityDesc }}</span>
</div>
</div>
<div>
<!-- <div class="remark">{{ operation.remark }}</div>-->
<!-- <div>-->
<!-- <div>审批人：</div>-->
<!-- <div>{{ user.name }}</div>-->
<!-- </div>-->
<div v-if="user.isAgent" style="display: flex;" :style="{'margin': isColumn?'10px 0':'0'}">
<div>
<name-circle :user="user" :showIcon="true" :user-name="user.agentUserName" :type="operation.operation"/>
<span style="color: #909399;font-size: 14px">（代理审批）</span>
</div>
<div class="name-block">
<div style="display: flex;align-items: center">
<el-icon :color="user.accountType==='0'?'#95d475':user.accountType==null?'#95d475':'#409eff'"
style="margin-right: 5px;">
<UserFilled/>
</el-icon>
<span class="name-style">{{ user.agentUserName }}</span>
</div>
<span>{{ user.agentCompanyName }}</span>
</div>
</div>
<div class="auditOpinion">
<div v-if="user.auditOpinion">
<div style="margin-bottom: 10px;color: #909399">{{ user.operationTime }}</div>
<div style="margin-bottom: 10px;color: #909399">{{ user.operationTime||'2024-09-22 12:16:29' }}</div>
<div class="username">
<span style="font-weight: bold">审批意见：</span>
<el-text v-text="user.auditOpinion" style="word-break: break-all">
@@ -200,15 +211,15 @@ const initOperationFun = (operation) => {
operation["remark"] = " 处理中"
}
//回退
if (state === 'ROLLBACK') {
// operation["icon"] = "RefreshLeft"
// operation["color"] = "#f78f5f"
operation["icon"] = "CircleCloseFilled"
operation["color"] = "#f56c6c"
operation["remark"] = " 回退成功"
}
// if (state === 'ROLLBACK') {
// // operation["icon"] = "RefreshLeft"
// // operation["color"] = "#f78f5f"
// operation["icon"] = "CircleCloseFilled"
// operation["color"] = "#f56c6c"
// operation["remark"] = " 回退成功"
// }
//拒绝操作
if (state === 'REFUSE' || state === 'AUTO_REFUSE') {
if (state === 'REFUSE' || state === 'AUTO_REFUSE' ||state === 'ROLLBACK') {
operation["icon"] = "CircleCloseFilled"
operation["color"] = "#f56c6c"
operation["remark"] = " 拒绝"
@@ -267,6 +278,7 @@ init()
:deep(.el-timeline-item__dot) {
margin-left: -3px;
}
:deep .el-card__body, .el-main {
padding: 10px;
}
@@ -290,29 +302,33 @@ init()
border-bottom: none;
}
.name-block {
width: 130px;
display: flex;
flex-direction: column;
margin-left: 10px;
margin-right: 20px;
.name-style {
color: #2a99ff;
}
> span:last-child {
margin-top: 5px;
color: #909399;
}
}
.avatar-block {
display: flex;
.name {
width: 130px;
display: flex;
flex-direction: column;
margin-left: 10px;
margin-right: 20px;
.name-style {
color: #2a99ff;
}
> span:last-child {
margin-top: 5px;
color: #909399;
}
.agent-style {
color: #909399;
font-size: 15px;
}
}
> div:nth-child(2) {
.auditOpinion {
display: flex;
flex-direction: column;
color: #8a8a8a;