Merge branch 'dev1023' into dev

解决 9 个冲突文件,并修复合并后遗留问题:

- 大厅候选集:采用 FIFO 窗口 + 全部置顶单 UNION(列表与抢单/拼单复核同源)
- 拼单份额:采用多次参与模型(每次参与 INSERT 新份额、requestId 幂等),
  取消后可重新参与;移除 HEAD 已废弃的单行 rejoin 逻辑与对应测试
- 工单迁移与成本中心 103–108 编号撞车:合并重写为
  109_work_order_share_participation / 110_work_order_hall_and_shop_indexes;
  临时库全量执行与重跑幂等验证通过(10 列、唯一键已删、7 个索引)
- 实时补丁:保留个性化字段、置顶重排、分页总数同步;补回 orderTimelineVisible 类型
- 打手大厅:保留 memo 组件化,移植「再拼一次」多份额按钮逻辑
- 全项目表格统一 PercentTable:WorkerOrderShareTable 改造

验证:backend typecheck/lint/check:sql/test(833 pass)、
frontend typecheck/lint/test(172 pass)/build 全绿。
This commit is contained in:
yml2213
2026-10-26 12:10:53 +08:00
94 changed files with 8991 additions and 744 deletions
+28
View File
@@ -1607,3 +1607,31 @@
grid-column: auto;
}
}
/* 拼单明细:操作按钮保持一行 */
.admin-share-actions {
flex-wrap: nowrap;
white-space: nowrap;
}
/* 拼单明细:问题单行强调、已撤单行弱化 */
.admin-share-row-problem > td {
background: #fff1f0 !important;
}
.admin-share-row-problem > td:first-child {
box-shadow: inset 3px 0 0 #ff4d4f;
}
.admin-share-row-problem:hover > td {
background: #ffe7e6 !important;
}
.admin-share-row-cancelled > td {
color: rgba(0, 0, 0, 0.45);
background: #fafafa;
}
.admin-share-row-cancelled:hover > td {
background: #f5f5f5 !important;
}
+72
View File
@@ -305,6 +305,78 @@ select {
.image-upload-hint {
font-size: 12px;
line-height: 1.5;
clear: both;
}
/* antd 的 picture-card 列表可能是浮动/行内块,让外层独占整行,避免相机按钮被挤到同一行 */
.image-upload-droppable > .ant-upload-wrapper {
display: block;
width: 100%;
}
/* 移动端系统相机入口:隐藏原生 file input,仅保留按钮 */
.image-upload-camera {
display: flex;
align-items: center;
gap: 8px;
width: 100%;
/* 强制独占一行:缩略图列表可能是行内块/浮动,clear + flex-basis 保证按钮落到下一行 */
clear: both;
flex: 1 0 100%;
justify-self: stretch;
margin-top: 8px;
}
/**
* 移动端系统相机入口:
* 原生 input 透明铺满按钮,用户手指直接点在 input 上(真实手势),
* 浏览器才更愿意按 capture="environment" 调起相机。
*
* 旧实现把 input 移到 left:-9999px 再由按钮脚本 .click():
* iOS Safari 会点了没反应,部分安卓 WebView 则把相机 intent 降级成文件选择
* (表现为点「拍照」却弹出文件浏览)。
*/
.image-upload-camera-input,
.worker-acceptance-video-camera-input {
position: absolute;
inset: 0;
width: 100%;
height: 100%;
opacity: 0;
cursor: pointer;
}
.camera-pick-trigger {
position: relative;
display: inline-flex;
align-items: center;
}
/* 视觉按钮只负责外观,点击统一由上层透明 input 接收(避免脚本 click 触发降级) */
.camera-pick-trigger .ant-btn {
pointer-events: none;
}
.worker-acceptance-video-preview {
display: flex;
flex-direction: column;
gap: 8px;
}
.worker-acceptance-video-player {
width: 100%;
max-width: 360px;
max-height: 240px;
border-radius: 6px;
background: #000;
}
.worker-acceptance-video-meta {
display: flex;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
gap: 8px;
}
.image-preview-list {
+41
View File
@@ -73,6 +73,24 @@
}
}
/* 公告弹窗:正文保留换行,长公告可滚动 */
.worker-announcement-popup-title {
display: inline-flex;
align-items: center;
gap: 6px;
}
.worker-announcement-popup-content {
margin: 0 !important;
max-height: 50vh;
overflow-y: auto;
color: #1f2937;
font-size: 14px;
line-height: 1.75;
white-space: pre-wrap;
word-break: break-word;
}
.worker-page-head h3,
.worker-page-head > .ant-typography {
margin: 0 !important;
@@ -4858,3 +4876,26 @@ body {
padding-top: 6px;
border-top: 1px dashed #bfdbfe;
}
/* 我的订单:一行一工单,展开后的份额子表 */
.worker-orders-table .ant-table-expanded-row > td {
background: #fafafa;
}
.worker-order-share-table .ant-table {
font-size: 12px;
}
.worker-order-share-table .ant-table-thead > tr > th {
background: #f5f5f5;
font-size: 12px;
}
.worker-order-mobile-shares {
display: flex;
flex-direction: column;
gap: 6px;
margin: 8px 12px 4px;
padding-top: 8px;
border-top: 1px dashed #f0f0f0;
}