fix : 修复审批记录主次账号显示, 年度计划详情显示
This commit is contained in:
@@ -37,6 +37,7 @@
|
||||
<div v-else>--</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="departmentName" label="承办部门" align="center"/>
|
||||
<el-table-column prop="investmentType" label="出资类型" align="center">
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.investmentType !== null">
|
||||
|
||||
@@ -12,11 +12,18 @@
|
||||
当前节点: {{ operation.operationName }}
|
||||
</div>
|
||||
<div class="card">
|
||||
<div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name" :style="{'flex-direction': isColumn?'column':'row'}">
|
||||
<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'}">
|
||||
<name-circle :user="user"/>
|
||||
<div class="name">
|
||||
<span>{{ user.name }}</span>
|
||||
<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.name }}</span>
|
||||
</div>
|
||||
<span>{{ user.jobActivityDesc }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -305,9 +312,10 @@ init()
|
||||
margin-left: 10px;
|
||||
margin-right: 20px;
|
||||
|
||||
> span:first-child {
|
||||
.name-style{
|
||||
color: #2a99ff;
|
||||
}
|
||||
|
||||
> span:last-child {
|
||||
margin-top: 5px;
|
||||
color: #909399;
|
||||
|
||||
Reference in New Issue
Block a user