Merge branch 'dev' into 'dev-zn'

旧版流程详情页面报错修正

See merge request itc-framework/ma/2024/front!27
This commit is contained in:
周宁
2025-01-26 03:46:02 +00:00
2 changed files with 32 additions and 18 deletions

View File

@ -27,6 +27,8 @@
<div class="form-right" :style="{ paddingLeft: formRight }"> <div class="form-right" :style="{ paddingLeft: formRight }">
<div v-for="(item, index) in forms.configs" :key="index" :tab="item.formName"> <div v-for="(item, index) in forms.configs" :key="index" :tab="item.formName">
<div v-show="activeIndex == index"> <div v-show="activeIndex == index">
<div class="page-bg-wrap">
<div class="top-toolbar">
<SystemForm <SystemForm
class="form-box" class="form-box"
v-if="item.formType == FormType.SYSTEM" v-if="item.formType == FormType.SYSTEM"
@ -49,6 +51,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -469,4 +473,14 @@
padding-top: 20px; padding-top: 20px;
} }
} }
.page-bg-wrap {
background-color: #fff;
}
.top-toolbar {
min-height: 44px;
margin-bottom: 12px;
border-bottom: 1px solid #eee;
}
</style> </style>

View File

@ -2,7 +2,7 @@
<div style="margin:20px;"> <div style="margin:20px;">
当前流程审批人{{currentTaskAssigneeNames.replaceAll(",","、")}} 当前流程审批人{{currentTaskAssigneeNames.replaceAll(",","、")}}
</div> </div>
<div style="margin:20px;"> <div style="margin:20px;" v-if="currentTaskAssignees">
节点审批人 节点审批人
<div v-for="(assignees,taskKey) in currentTaskAssignees" :key="taskKey"> <div v-for="(assignees,taskKey) in currentTaskAssignees" :key="taskKey">
<span>{{assignees[0].taskName}}{{currentTaskInfo?.taskDefinitionKey==taskKey?'(当前审批节点)':''}}</span> <span>{{assignees[0].taskName}}{{currentTaskInfo?.taskDefinitionKey==taskKey?'(当前审批节点)':''}}</span>