refactor: 合并 biz_support_unit/biz_execution_unit/biz_service_org 为 biz_org, 删除 2 张孤儿表, 改 biz_person.work_unit → org_id FK
主要改动: - SQL: biz_support_unit → biz_org, 加 org_type, 加 business_nature; 删 biz_execution_unit, biz_service_org - SQL: biz_project.support_unit_id/name + service_org_id/name → org_id/name/type - SQL: biz_meeting.support_unit_name → org_name - SQL: biz_person.work_unit → org_id (FK) - 后端: 新 BizOrg entity/mapper/service/controller - 后端: BizProject/BizMeeting 字段重命名 - 后端: 删 12 个 BizSupportUnit/BizExecutionUnit/BizServiceOrg Java 文件 - 后端: BizPersonImportVO.workUnit → orgName (导入时查 biz_org 取 org_id) - 后端: BizAuthController.registerExecutor 完整实现 (原 registerSupplier stub) - 前端: 新 admin/Orgs.vue + manager/Orgs.vue (原 SupportUnits) - 前端: RegisterExecutor.vue (原 RegisterSupplier, 单页 2 步) - 前端: sponsor/executor/manager 多个文件 workUnit → orgId/orgName 重命名 - 前端: 统一 supplier → executor, 业务命名 sponsor(赞助方) / executor(执行方=供应商) - 前端: 全工程 execution → executor (company type / role / person unit_type)
This commit is contained in:
@@ -0,0 +1,84 @@
|
||||
<!DOCTYPE html>
|
||||
<!-- 角色:合规 父级:manager.html 原型:原型/结算-会务.html -->
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1.0"><title>结算-会务</title>
|
||||
<style>
|
||||
*{margin:0;padding:0;box-sizing:border-box}body{font-family:-apple-system,"PingFang SC","Microsoft YaHei",sans-serif;color:#333;background:#fafafa;min-height:100vh}
|
||||
.content{padding:24px 32px}
|
||||
.breadcrumb{font-size:13px;color:#8c8c8c;margin-bottom:16px}
|
||||
.breadcrumb a{color:#1890ff;text-decoration:none;cursor:pointer}.breadcrumb a:hover{text-decoration:underline}
|
||||
.breadcrumb .sep{margin:0 6px;color:#bfbfbf}.breadcrumb .current{color:#595959}
|
||||
.page-title{font-size:22px;font-weight:600;color:#1a1a1a;margin-bottom:20px}
|
||||
.card{background:#fff;border-radius:8px;padding:24px 32px;margin-bottom:16px;border:1px solid #f0f0f0}
|
||||
.info-row{display:flex;align-items:center;margin-bottom:14px}
|
||||
.info-label{flex:0 0 110px;font-size:14px;color:#595959;text-align:right;padding-right:16px}
|
||||
.info-value{font-size:14px;color:#1a1a1a;font-weight:500}
|
||||
.section-title{font-size:16px;font-weight:600;color:#1a1a1a;margin:24px 0 16px;padding-left:10px;border-left:3px solid #1890ff}
|
||||
.data-card{padding:0;overflow-x:auto}.data-table{width:100%;border-collapse:collapse;font-size:13px}
|
||||
.data-table th{background:#fafafa;padding:10px 12px;text-align:left;color:#1a1a1a;font-weight:600;border-bottom:1px solid #f0f0f0;white-space:nowrap}
|
||||
.data-table td{padding:10px 12px;border-bottom:1px solid #f5f5f5;color:#595959;vertical-align:middle}
|
||||
.data-table tr:hover{background:#fafcff}
|
||||
.col-money{text-align:right;font-family:ui-monospace,"Courier New",monospace}
|
||||
.summary-row{display:flex;justify-content:flex-end;gap:24px;padding:16px 0;border-top:1px solid #f0f0f0;margin-top:8px}
|
||||
.summary-item{display:flex;flex-direction:column;align-items:flex-end}
|
||||
.summary-label{font-size:12px;color:#8c8c8c}
|
||||
.summary-value{font-size:18px;font-weight:600;color:#1a1a1a;font-family:ui-monospace,"Courier New",monospace}
|
||||
.summary-value.total{color:#1890ff;font-size:20px}
|
||||
.form-actions{display:flex;gap:12px;justify-content:flex-start;margin-top:24px;padding-top:20px}
|
||||
.btn{height:40px;padding:0 24px;border-radius:5px;font-size:14px;cursor:pointer;min-width:140px}
|
||||
.btn-primary{background:#169bd5;color:#fff;border:1px solid #169bd5}.btn-primary:hover{background:#0f8db8}
|
||||
.btn-default{background:#fff;color:#333;border:1px solid #797979}.btn-default:hover{border-color:#1890ff;color:#1890ff}
|
||||
.status-tag{display:inline-block;padding:2px 8px;border-radius:10px;font-size:12px}
|
||||
.status-tag.approved{background:#f6ffed;color:#52c41a;border:1px solid #b7eb8f}
|
||||
.status-tag.pending{background:#fff7e6;color:#fa8c16;border:1px solid #ffd591}
|
||||
@media(max-width:768px){.content{padding:16px}.info-row{flex-direction:column;align-items:stretch}.info-label{text-align:left;padding-right:0;margin-bottom:4px}}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<main class="content">
|
||||
<div class="breadcrumb">
|
||||
<a href="javascript:void(0)" onclick="goBack()">首页</a>
|
||||
<span class="sep">/</span>
|
||||
<a href="javascript:void(0)" onclick="goBack()">会议管理</a>
|
||||
<span class="sep">/</span>
|
||||
<span class="current">结算会务费用</span>
|
||||
</div>
|
||||
<h1 class="page-title">结算-会务</h1>
|
||||
<div class="card">
|
||||
<div class="info-row"><span class="info-label">会议名称:</span><span class="info-value">小牛血清创新应用研讨会</span></div>
|
||||
<div class="info-row"><span class="info-label">项目编号:</span><span class="info-value">ZH-2026-658</span></div>
|
||||
<div class="info-row"><span class="info-label">执行单位:</span><span class="info-value">北京会务服务公司</span></div>
|
||||
<div class="info-row"><span class="info-label">会议期数:</span><span class="info-value">第 3 期</span></div>
|
||||
<div class="info-row"><span class="info-label">会议时间:</span><span class="info-value">2026-05-11 11:30 ~ 14:30</span></div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="section-title">会务费用明细</div>
|
||||
<div class="data-card">
|
||||
<table class="data-table">
|
||||
<thead><tr><th>费用项</th><th style="text-align:right">单价</th><th style="text-align:right">数量</th><th style="text-align:right">小计</th><th>备注</th><th>审核状态</th></tr></thead>
|
||||
<tbody>
|
||||
<tr><td>场地租赁</td><td class="col-money">¥ 5,000</td><td class="col-money">1</td><td class="col-money">¥ 5,000</td><td>会议室 A</td><td><span class="status-tag approved">已审核</span></td></tr>
|
||||
<tr><td>设备租赁</td><td class="col-money">¥ 3,000</td><td class="col-money">1</td><td class="col-money">¥ 3,000</td><td>投影+音响</td><td><span class="status-tag approved">已审核</span></td></tr>
|
||||
<tr><td>餐饮服务</td><td class="col-money">¥ 200</td><td class="col-money">30</td><td class="col-money">¥ 6,000</td><td>工作午餐</td><td><span class="status-tag approved">已审核</span></td></tr>
|
||||
<tr><td>资料印刷</td><td class="col-money">¥ 50</td><td class="col-money">40</td><td class="col-money">¥ 2,000</td><td>会议手册</td><td><span class="status-tag pending">待审核</span></td></tr>
|
||||
<tr><td>其他杂费</td><td class="col-money">¥ 1,000</td><td class="col-money">1</td><td class="col-money">¥ 1,000</td><td>茶水等</td><td><span class="status-tag approved">已审核</span></td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="summary-row">
|
||||
<div class="summary-item"><span class="summary-label">已审核</span><span class="summary-value">¥ 16,000</span></div>
|
||||
<div class="summary-item"><span class="summary-label">待审核</span><span class="summary-value">¥ 2,000</span></div>
|
||||
<div class="summary-item"><span class="summary-label">合计</span><span class="summary-value total">¥ 18,000</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<button type="button" class="btn btn-primary" onclick="alert('结算已提交')">提交结算</button>
|
||||
<button type="button" class="btn btn-default" onclick="goBack()">返回</button>
|
||||
</div>
|
||||
</main>
|
||||
<script>
|
||||
function goBack(){try{if(window.parent&&window.parent.document.getElementById('contentFrame')){window.parent.document.getElementById('contentFrame').src='meeting-manage.html'}else{history.back()}}catch(e){history.back()}}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user