Merge remote-tracking branch 'origin/master' into feature/hcs-api-p0-web

# Conflicts: # src/views/business/contract-manage-change.vue
2026-10-23 19:20:12 +08:00
parent e4ae1d3c77 2a5eca8393
commit f6621392b1
27 changed files with 1924 additions and 572 deletions
@@ -42,6 +42,7 @@ export const waybillStatusOptions = [
  { label: '草稿', value: 'draft' },
  { label: '待执行', value: 'pending' },
  { label: '进行中', value: 'running' },
+  { label: '待确认回单', value: 'pending_return' },
  { label: '已完成', value: 'completed' },
  { label: '已取消', value: 'cancelled' },
 ];