This commit is contained in:
zlwu committed 2026-08-30 09:30:02 +08:00
1 parent 16986f443e
commit 63a1209620
83 files changed
+1083168 -11413

No files matched your search

+32 -7
View File
@@ -58,6 +58,18 @@ export function formatPlVehiclePlateDisplay(
return plate || trailer
}
/** 下拉选项:主车号(挂车号);无挂车号时仅主车号 */
export function formatPlVehiclePlateOptionLabel(
licensePlate?: string | null,
trailerNo?: string | null
) {
const plate = licensePlate?.trim() || ''
const trailer = trailerNo?.trim() || ''
if (!plate && !trailer) return '—'
if (plate && trailer) return `${plate}(${trailer})`
return plate || trailer
}
export function getPlCarrierStatusLabel(status: string) {
return status === '1' ? '合作中' : '已终止'
}
@@ -354,13 +366,13 @@ export const PL_PLAN_TYPE_TABS: { label: string; name: PlPlanTypeTab }[] = [
]
export const PL_PLAN_LIST_TABS: { label: string; name: PlPlanListTab }[] = [
...PL_PLAN_TYPE_TABS,
{ label: '待安排', name: 'pending_arrange' }
{ label: '待安排', name: 'pending_arrange' },
...PL_PLAN_TYPE_TABS
]
export const PL_PLAN_CERT_TABS: { label: string; name: PlPlanCertTab }[] = [
...PL_PLAN_TYPE_TABS,
{ label: '未上传证书', name: 'cert_incomplete' }
{ label: '未上传证书', name: 'cert_incomplete' },
...PL_PLAN_TYPE_TABS
]
export function plPlanTypeTabToFilter(tab: PlPlanTypeTab): string {
@@ -389,7 +401,11 @@ export function plPlanCertTabToFilters(tab: PlPlanCertTab): {
hazardCertReady?: string
} {
if (tab === 'cert_incomplete') {
return { planType: '', certUploadStatus: 'incomplete', hazardCertReady: '0' }
return {
planType: '',
certUploadStatus: 'incomplete',
hazardCertReady: '0'
}
}
return { planType: plPlanTypeTabToFilter(tab), hazardCertReady: '' }
}
@@ -410,6 +426,11 @@ export const PL_PLAN_FOLLOW_STATUS_OPTIONS = [
{ label: '已取消', value: 'cancelled' }
] as const
/** 运输计划/危化品证等列表:跟进状态默认勾选(不含已取消) */
export const PL_PLAN_DEFAULT_FOLLOW_STATUSES = PL_PLAN_FOLLOW_STATUS_OPTIONS.filter(
(opt) => opt.value !== 'cancelled'
).map((opt) => opt.value)
export function getPlPlanFollowStatusTagType(status?: string) {
const map: Record<string, string> = {
wait_notice: 'warning',
@@ -438,11 +459,15 @@ export function getPlPlanFollowStatusLabel(status?: string) {
}
export function getPlPlanArchiveStatusTagType(status?: string) {
return status === 'archived' ? 'info' : 'danger'
if (status === 'archived') return 'info'
if (status === 'draft') return 'warning'
return 'danger'
}
export function getPlPlanArchiveStatusLabel(status?: string) {
return status === 'archived' ? '已归档' : '未归档'
if (status === 'archived') return '已归档'
if (status === 'draft') return '已暂存'
return '未归档'
}
export function getPlPlanCompleteStatusLabel(status?: string) {
+41 -31
View File
@@ -111,12 +111,12 @@ export interface PlanDeliveryForm {
products: PlanStopProductFormRow[]
}
/** 地磅默认勾选以装货客户是否为内部客户(山峡/云栋)为准,与送货段客户无关。 */
/** 地磅默认勾选以本段客户是否为内部客户(山峡/云栋)为准。 */
export function resolveStopDibangDefaults(
loadCustomerName?: string | null,
customerName?: string | null,
stopType: 'load' | 'delivery' = 'load'
): { generateDibang: number; dibangDirection: string } {
if (!isPlInternalCustomerName(loadCustomerName)) {
if (!isPlInternalCustomerName(customerName)) {
return { generateDibang: 0, dibangDirection: 'none' }
}
if (stopType === 'load') {
@@ -125,16 +125,23 @@ export function resolveStopDibangDefaults(
return { generateDibang: 1, dibangDirection: 'inbound' }
}
export function syncDeliveryDibangFromLoad(
deliveries: PlanDeliveryForm[],
loadCustomerName?: string | null
): PlanDeliveryForm[] {
const defaults = resolveStopDibangDefaults(loadCustomerName, 'delivery')
return deliveries.map((row) => ({
...row,
generateDibang: defaults.generateDibang,
dibangDirection: defaults.dibangDirection
}))
function normalizeStopDibangFieldsFromApi(
customerName: string | null | undefined,
stopType: 'load' | 'delivery',
generateDibang?: number | null,
dibangDirection?: string | null
): { generateDibang: number; dibangDirection: string } {
const defaults = resolveStopDibangDefaults(customerName, stopType)
const gen = Number(generateDibang ?? defaults.generateDibang) === 1 ? 1 : 0
let direction = (dibangDirection || '').trim()
if (gen) {
if (direction !== 'outbound' && direction !== 'inbound') {
direction = defaults.dibangDirection
}
} else {
direction = 'none'
}
return { generateDibang: gen, dibangDirection: direction }
}
export function createStopProductsFromPlanProducts(
@@ -323,11 +330,7 @@ export function createEmptyLoadForm(): PlanLoadForm {
}
}
export function createEmptyDeliveryForm(
seq = 1,
loadCustomerName?: string | null
): PlanDeliveryForm {
const defaults = resolveStopDibangDefaults(loadCustomerName, 'delivery')
export function createEmptyDeliveryForm(seq = 1): PlanDeliveryForm {
return {
seq,
customerId: '',
@@ -338,8 +341,8 @@ export function createEmptyDeliveryForm(
deliveryTime: '',
contact: '',
notes: '',
generateDibang: defaults.generateDibang,
dibangDirection: defaults.dibangDirection,
generateDibang: 0,
dibangDirection: 'none',
contracts: [],
products: []
}
@@ -404,7 +407,12 @@ export function resolveDeliveryViewAddress(
export function mapLoadFromApi(load?: PlanLoad | null): PlanLoadForm {
if (!load) return createEmptyLoadForm()
const defaults = resolveStopDibangDefaults(load.customerName, 'load')
const dibang = normalizeStopDibangFieldsFromApi(
load.customerName,
'load',
load.generateDibang,
load.dibangDirection
)
return {
customerId: load.customerId || '',
customerName: load.customerName || '',
@@ -414,8 +422,8 @@ export function mapLoadFromApi(load?: PlanLoad | null): PlanLoadForm {
loadTime: (load.loadTime || '').slice(0, 10),
contact: load.contact || '',
notes: load.notes || '',
generateDibang: load.generateDibang ?? defaults.generateDibang,
dibangDirection: load.dibangDirection || defaults.dibangDirection,
generateDibang: dibang.generateDibang,
dibangDirection: dibang.dibangDirection,
contracts: (load.contracts || []).map((item) => ({
contractId: String(item.contractId || ''),
contractNo: item.contractNo
@@ -424,13 +432,15 @@ export function mapLoadFromApi(load?: PlanLoad | null): PlanLoadForm {
}
}
export function mapDeliveriesFromApi(
deliveries?: PlanDelivery[],
loadCustomerName?: string | null
): PlanDeliveryForm[] {
export function mapDeliveriesFromApi(deliveries?: PlanDelivery[]): PlanDeliveryForm[] {
if (!deliveries?.length) return [createEmptyDeliveryForm(1)]
return deliveries.map((row, index) => {
const defaults = resolveStopDibangDefaults(loadCustomerName, 'delivery')
const dibang = normalizeStopDibangFieldsFromApi(
row.customerName,
'delivery',
row.generateDibang,
row.dibangDirection
)
return {
seq: row.seq ?? index + 1,
customerId: row.customerId || '',
@@ -441,8 +451,8 @@ export function mapDeliveriesFromApi(
deliveryTime: (row.deliveryTime || '').slice(0, 10),
contact: row.contact || '',
notes: row.notes || '',
generateDibang: row.generateDibang ?? defaults.generateDibang,
dibangDirection: row.dibangDirection || defaults.dibangDirection,
generateDibang: dibang.generateDibang,
dibangDirection: dibang.dibangDirection,
contracts: (row.contracts || []).map((item) => ({
contractId: String(item.contractId || ''),
contractNo: item.contractNo
@@ -458,7 +468,7 @@ export function mapLegacyPlanToStops(plan: Plan): {
deliveries: PlanDeliveryForm[]
} {
const loadDefaults = resolveStopDibangDefaults(plan.supplierName, 'load')
const deliveryDefaults = resolveStopDibangDefaults(plan.supplierName, 'delivery')
const deliveryDefaults = resolveStopDibangDefaults(plan.customerName, 'delivery')
const stopProducts = createStopProductsFromPlanProducts(
(plan.products || []).map((item, index) => ({
id: item.id,