YG-Soft/X-Financial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(web): 差旅领导意见事件结构化与申请审批信息增强

Browse Source 
- applicationApproval 新增按日期/时间/审批角色拆分格式化，buildLeaderApprovalEvents 补充 dateLabel/timeLabel/roleLabel 字段
- TravelRequestDetailView 领导意见事件改为日期+时间+审批人结构化展示，travel-request-detail-view.css 重构对应样式
- travelReimbursementAttachmentModel 微调附件标识，同步更新 application-approval-info、travel-request-detail-leader-approval、attachment-association-confirmation 测试
- 更新公司通信费报销规则表
This commit is contained in:
caoxiaozhu
2026-06-21 23:24:09 +08:00
parent 88e91a5900
commit 669d22e71f
8 changed files with 329 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

344
web/src/assets/styles/views/travel-request-detail-view.css
View File

@@ -718,11 +718,10 @@
.application-leader-opinion {
display: grid;
gap: 12px;
margin-top: 14px;
padding: 14px;
border: 1px solid rgba(var(--theme-primary-rgb, 58, 124, 165), .16);
background: linear-gradient(180deg, rgba(248, 251, 255, .98) 0%, #ffffff 100%);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .86);
margin-top: 12px;
padding: 14px 0 4px;
border-top: 1px solid #e5edf5;
background: #ffffff;
}
.application-leader-opinion-head {
@@ -730,8 +729,6 @@
align-items: center;
justify-content: space-between;
gap: 12px;
padding-bottom: 10px;
border-bottom: 1px solid #e2e8f0;
color: #334155;
font-size: 14px;
line-height: 1.5;
@@ -742,209 +739,238 @@
align-items: center;
gap: 8px;
color: #0f172a;
font-weight: 850;
font-size: 16px;
font-weight: 700;
font-size: 15px;
}
.application-leader-opinion-head span i {
width: 28px;
height: 28px;
display: inline-flex;
align-items: center;
justify-content: center;
color: var(--theme-primary-active, #255b7d);
border: 1px solid rgba(var(--theme-primary-rgb, 58, 124, 165), .22);
border-radius: 999px;
background: rgba(var(--theme-primary-rgb, 58, 124, 165), .08);
font-size: 18px;
color: #64748b;
font-size: 17px;
line-height: 1;
}
.application-leader-opinion-head strong {
padding: 4px 10px;
border: 1px solid rgba(var(--theme-primary-rgb, 58, 124, 165), .18);
border-radius: 999px;
background: rgba(var(--theme-primary-rgb, 58, 124, 165), .08);
color: var(--theme-primary-active);
font-weight: 800;
color: #64748b;
font-weight: 600;
font-size: 13px;
}
.application-leader-opinion-timeline {
position: relative;
display: grid;
gap: 10px;
padding-left: 18px;
}
.application-leader-opinion-timeline::before {
content: "";
position: absolute;
top: 6px;
bottom: 6px;
left: 5px;
width: 1px;
background: #dbe4ee;
}
.application-leader-opinion-timeline.is-single {
padding-left: 0;
}
.application-leader-opinion-timeline.is-single::before,
.application-leader-opinion-timeline.is-single .application-leader-opinion-event::before {
display: none;
gap: 0;
padding: 2px 0 0;
}
.application-leader-opinion-event {
--leader-opinion-tone: var(--theme-primary, #3a7ca5);
--leader-opinion-soft-bg: #f8fbff;
--leader-opinion-soft-border: #dbeafe;
--leader-opinion-tone: #16a34a;
position: relative;
display: grid;
gap: 10px;
padding: 14px 16px 14px 18px;
border: 1px solid #dbe4ee;
border-left: 4px solid var(--leader-opinion-tone);
border-radius: 4px;
background: linear-gradient(180deg, #ffffff 0%, #f8fafc 100%);
box-shadow: 0 14px 30px rgba(15, 23, 42, .08);
overflow: hidden;
grid-template-columns: 104px 28px minmax(0, 1fr);
gap: 12px;
padding: 0 0 16px;
}
.application-leader-opinion-event::before {
.application-leader-opinion-event:last-child {
padding-bottom: 0;
}
.application-leader-opinion-event-time {
display: grid;
gap: 3px;
justify-items: end;
padding-top: 1px;
color: #64748b;
font-variant-numeric: tabular-nums;
line-height: 1.35;
}
.application-leader-opinion-event-time strong {
color: #334155;
font-size: 13px;
font-weight: 700;
}
.application-leader-opinion-event-time em {
color: #94a3b8;
font-size: 12px;
font-style: normal;
font-weight: 600;
}
.application-leader-opinion-event-rail {
position: relative;
display: flex;
justify-content: center;
padding-top: 1px;
}
.application-leader-opinion-event-rail::after {
content: "";
position: absolute;
top: 17px;
left: -18px;
width: 9px;
height: 9px;
border: 2px solid #ffffff;
top: 24px;
bottom: -16px;
left: 50%;
width: 2px;
transform: translateX(-50%);
border-radius: 999px;
background: var(--theme-primary, #3a7ca5);
box-shadow: 0 0 0 1px rgba(var(--theme-primary-rgb, 58, 124, 165), .34);
background: #e2e8f0;
}
.application-leader-opinion-event:last-child .application-leader-opinion-event-rail::after {
display: none;
}
.application-leader-opinion-event.danger {
--leader-opinion-tone: #dc2626;
--leader-opinion-soft-bg: #fff7f7;
--leader-opinion-soft-border: #fecaca;
}
.application-leader-opinion-event.danger::before {
background: #dc2626;
box-shadow: 0 0 0 1px rgba(220, 38, 38, .32);
}
.application-leader-opinion-event.success {
--leader-opinion-tone: #16a34a;
--leader-opinion-soft-bg: #f0fdf4;
--leader-opinion-soft-border: #bbf7d0;
}
.application-leader-opinion-event.success::before {
background: #16a34a;
box-shadow: 0 0 0 1px rgba(22, 163, 74, .32);
}
.application-leader-opinion-event-head {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
}
.application-leader-opinion-event-head span {
display: inline-flex;
align-items: center;
gap: 6px;
color: #0f172a;
font-size: 14px;
font-weight: 850;
}
.application-leader-opinion-event-status {
min-height: 30px;
padding: 4px 10px;
border: 1px solid var(--leader-opinion-soft-border);
position: relative;
z-index: 1;
width: 22px;
height: 22px;
display: inline-flex;
align-items: center;
justify-content: center;
border: 1px solid var(--leader-opinion-tone);
border-radius: 999px;
background: var(--leader-opinion-soft-bg);
color: var(--leader-opinion-tone);
background: var(--leader-opinion-tone);
color: #ffffff;
box-shadow: 0 0 0 4px #ffffff;
}
.application-leader-opinion-event-head i {
color: currentColor;
font-size: 16px;
.application-leader-opinion-event-status i {
font-size: 13px;
line-height: 1;
}
.application-leader-opinion-event.danger .application-leader-opinion-event-head i {
color: #dc2626;
}
.application-leader-opinion-event.success .application-leader-opinion-event-head i {
color: #16a34a;
}
.application-leader-opinion-event-head time,
.application-leader-opinion-event footer {
color: #64748b;
font-size: 12px;
font-weight: 720;
}
.application-leader-opinion-event-head time {
padding: 4px 9px;
border: 1px solid #e2e8f0;
border-radius: 999px;
background: #ffffff;
color: #475569;
white-space: nowrap;
}
.application-leader-opinion-event-body {
.application-leader-opinion-record {
min-width: 0;
display: grid;
gap: 5px;
padding: 10px 12px;
border: 1px solid var(--leader-opinion-soft-border);
border-radius: 4px;
background: var(--leader-opinion-soft-bg);
gap: 9px;
padding: 0 0 16px;
border-bottom: 1px solid #edf2f7;
background: #ffffff;
}
.application-leader-opinion-event-body span {
.application-leader-opinion-event:last-child .application-leader-opinion-record {
padding-bottom: 0;
border-bottom: 0;
}
.application-leader-opinion-record-head {
display: grid;
gap: 6px;
}
.application-leader-opinion-record-title {
min-width: 0;
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 6px;
}
.application-leader-opinion-record-title strong {
color: #0f172a;
font-size: 14px;
font-weight: 700;
line-height: 1.35;
}
.application-leader-opinion-record-title::after {
content: "";
width: 6px;
height: 6px;
border-radius: 999px;
background: var(--leader-opinion-tone);
}
.application-leader-opinion-record-meta {
display: flex;
flex-wrap: wrap;
gap: 6px 16px;
margin: 0;
}
.application-leader-opinion-record-meta div {
display: inline-flex;
align-items: center;
gap: 6px;
}
.application-leader-opinion-record-meta dt,
.application-leader-opinion-record-meta dd {
margin: 0;
color: #64748b;
font-size: 12px;
font-style: normal;
font-weight: 600;
line-height: 1.45;
}
.application-leader-opinion-record-meta dt {
color: #94a3b8;
}
.application-leader-opinion-record-meta dd {
color: #475569;
}
.application-leader-opinion-record p {
margin: 0;
padding: 9px 10px;
border: 1px solid #edf2f7;
border-radius: 4px;
background: #f8fafc;
color: #334155;
font-size: 14px;
font-weight: 500;
line-height: 1.6;
}
.application-leader-opinion-event-foot {
display: flex;
flex-wrap: wrap;
gap: 10px;
color: #64748b;
font-size: 12px;
font-weight: 850;
line-height: 1.4;
}
.application-leader-opinion-event-body p {
margin: 0;
color: #0f172a;
font-size: 15px;
font-weight: 850;
line-height: 1.65;
}
.application-leader-opinion-event footer {
display: flex;
flex-wrap: wrap;
gap: 8px;
}
.application-leader-opinion-event-foot span {
min-height: 26px;
display: inline-flex;
align-items: center;
gap: 5px;
padding: 3px 9px;
border: 1px solid #e2e8f0;
border-radius: 999px;
background: #ffffff;
color: #475569;
color: inherit;
}
.application-leader-opinion-event-foot i {
color: var(--leader-opinion-tone);
font-size: 14px;
@media (max-width: 720px) {
.application-leader-opinion {
padding-top: 12px;
}
.application-leader-opinion-event {
grid-template-columns: 76px 24px minmax(0, 1fr);
gap: 8px;
}
.application-leader-opinion-event-status {
width: 20px;
height: 20px;
}
.application-leader-opinion-event-time strong {
font-size: 12px;
}
.application-leader-opinion-event-time em {
font-size: 11px;
}
}
.detail-expense-table {

41
web/src/utils/applicationApproval.js
View File

@@ -37,6 +37,42 @@ function formatDateTime(value) {
return `${year}-${month}-${day} ${hours}:${minutes}`
}
function formatDateLabel(value) {
const date = toDate(value)
if (!date) {
return ''
}
const year = date.getFullYear()
const month = String(date.getMonth() + 1).padStart(2, '0')
const day = String(date.getDate()).padStart(2, '0')
return `${year}-${month}-${day}`
}
function formatTimeLabel(value) {
const date = toDate(value)
if (!date) {
return ''
}
const hours = String(date.getHours()).padStart(2, '0')
const minutes = String(date.getMinutes()).padStart(2, '0')
return `${hours}:${minutes}`
}
function resolveApprovalRole(event, returned) {
return resolveDisplayName(
event?.operator_position,
event?.operatorPosition,
event?.operator_title,
event?.operatorTitle,
event?.approver_position,
event?.approverPosition,
event?.approval_role,
event?.approvalRole,
event?.previous_approval_stage,
event?.previousApprovalStage
) || (returned ? '直属领导审批节点' : '直属领导')
}
function getRiskFlags(request) {
const flags = request?.riskFlags || request?.risk_flags_json || []
return Array.isArray(flags) ? flags : []
@@ -102,6 +138,8 @@ export function buildLeaderApprovalEvents(request) {
request?.managerName
) || '直属领导'
const time = formatDateTime(rawTime)
const dateLabel = formatDateLabel(rawTime) || '待记录'
const timeLabel = formatTimeLabel(rawTime)
const opinion = normalizeText(event.opinion)
|| normalizeText(event.leader_opinion || event.leaderOpinion)
|| normalizeText(event.reason)
@@ -115,7 +153,10 @@ export function buildLeaderApprovalEvents(request) {
tone: returned ? 'danger' : 'success',
title: returned ? '领导退回' : '领导审批通过',
operator,
role: resolveApprovalRole(event, returned),
time,
dateLabel,
timeLabel,
sortAt: rawTime,
opinion,
returnCount,

38
web/src/views/TravelRequestDetailView.vue
View File

@@ -164,24 +164,36 @@
class="application-leader-opinion-event"
:class="event.tone"
>
<div class="application-leader-opinion-event-head">
<span class="application-leader-opinion-event-status">
<time class="application-leader-opinion-event-time" :datetime="event.time || undefined">
<strong>{{ event.dateLabel }}</strong>
<em v-if="event.timeLabel">{{ event.timeLabel }}</em>
</time>
<div class="application-leader-opinion-event-rail">
<span class="application-leader-opinion-event-status" :title="event.title">
<i :class="event.type === 'returned' ? 'mdi mdi-arrow-u-left-top' : 'mdi mdi-check-circle-outline'"></i>
{{ event.title }}
</span>
<time v-if="event.time">{{ event.time }}</time>
</div>
<div class="application-leader-opinion-event-body">
<span>意见</span>
<div class="application-leader-opinion-record">
<header class="application-leader-opinion-record-head">
<div class="application-leader-opinion-record-title">
<strong>{{ event.title }}</strong>
</div>
<dl class="application-leader-opinion-record-meta">
<div>
<dt>审批人</dt>
<dd>{{ event.operator }}</dd>
</div>
<div>
<dt>节点</dt>
<dd>{{ event.role }}</dd>
</div>
</dl>
</header>
<p>{{ event.opinion }}</p>
<footer v-if="event.returnCount" class="application-leader-opinion-event-foot">
<span v-if="event.returnCount">第 {{ event.returnCount }} 次退回</span>
</footer>
</div>
<footer class="application-leader-opinion-event-foot">
<span class="application-leader-opinion-operator">
<em>审批人</em>
{{ event.operator }}
</span>
<span v-if="event.returnCount">第 {{ event.returnCount }} 次退回</span>
</footer>
</article>
</div>
</div>

2
web/src/views/scripts/travelReimbursementAttachmentModel.js
View File

@@ -64,7 +64,7 @@ export function normalizeOcrDocuments(payload) {
return documents.slice(0, MAX_OCR_DOCUMENTS).map((item) => ({
filename: item.filename,
summary: item.summary,
text: String(item.text || '').slice(0, 240),
text: String(item.text || ''),
avg_score: Number(item.avg_score || 0),
line_count: Number(item.line_count || 0),
document_type: String(item.document_type || 'other').trim() || 'other',