Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/components/business-crud-page.vue
This commit is contained in:
2026-08-25 00:11:14 +08:00
36 changed files with 560 additions and 330 deletions
+4 -2
View File
@@ -44,7 +44,7 @@
</template>
<template #status="{ row }">
<el-tag :type="statusTagType(row.status)">
<el-tag :type="statusTagType(row.status)" class="status-text">
{{ row.statusName || displayStatus(row.status) }}
</el-tag>
</template>
@@ -1198,7 +1198,9 @@ export default {
&__timeline-line {
position: absolute;
top: 22px;
// 圆点中心位置 = padding-top(12) + dot 半径(7) = 19px
// 线 height 3px,因此 top 需为 19 - 1.5 = 17.5px,使线视觉中心与圆点中心对齐
top: 17.5px;
right: 58px;
left: 58px;
height: 3px;