fix : 修复新增分摊表格数据校验及矩阵审批加箭头

This commit is contained in:
2024-06-05 22:03:49 +08:00
parent ca64562059
commit 2e86683f41
6 changed files with 187 additions and 142 deletions

View File

@@ -19,7 +19,6 @@ import {useProcessStore} from '@/stores/processStore.js'
const processStore = useProcessStore()
const emit = defineEmits()
const props = defineProps({
mode: {
type: String,

View File

@@ -5,16 +5,23 @@
<slot name="pre"></slot>
<div style="display: flex;flex-wrap: wrap;">
<div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
<div class="circle-user">
<Tooltip :content="user.name" placement="bottom-start" width="45">
</Tooltip>
</div>
<div v-if="user.icon"
class="el-timeline-item__node" :style="{
<div class="user">
<div class="circle-user">
<Tooltip :content="user.name" placement="bottom-start" width="45">
</Tooltip>
</div>
<div v-if="user.icon && mode === 'preview'"
class="el-timeline-item__node" :style="{
backgroundColor: user.color
}">
<el-icon v-if="user.icon" size="15" :class="user.class">
<component :is="user.icon"/>
<el-icon v-if="user.icon" size="15" :class="user.class">
<component :is="user.icon"/>
</el-icon>
</div>
</div>
<div class="arrow" v-if="(index+1)%3!==0&&userInfo.length!==1&&(index+1)!==userInfo.length">
<el-icon size="20">
<Right/>
</el-icon>
</div>
</div>
@@ -23,7 +30,7 @@
</template>
<script setup>
import {Loading, Close, CircleCheckFilled, MoreFilled} from '@element-plus/icons-vue'
import {Loading, Close, CircleCheckFilled, MoreFilled, Right} from '@element-plus/icons-vue'
import {defineProps} from "vue";
const props = defineProps({
@@ -107,11 +114,17 @@ init()
.avatar_name {
display: flex;
flex-direction: column;
align-items: center;
margin-right: 1px;
/*width: 45px;*/
position: relative;
margin-bottom: 5px;
.user {
display: flex;
flex-direction: column;
align-items: center;
margin-right: 1px;
/*width: 45px;*/
position: relative;
}
}
.el-timeline-item__node {

View File

@@ -23,7 +23,7 @@
</template>
<template v-else-if="showAvatar">
<span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo" :mode="mode"/>
</template>
<template v-else>
<span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
@@ -250,7 +250,7 @@ const init = () => {
.node-body-content {
cursor: pointer;
padding: 18px;
padding: 18px 8px;
color: #656363;
font-size: 14px;