From 9561f94074367e6e52e6831b1ec443f68eed32ed Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Wed, 21 Oct 2026 19:20:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E9=A1=B5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=BA=E4=B8=B0=E8=BF=90=E8=B4=B9=E6=97=B6=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=B9=B6=E5=A1=AB=E5=86=99=E9=A1=BA=E4=B8=B0?= =?UTF-8?q?=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- web-admin/src/api/sample-freight.ts | 11 +- .../sample-transport-form-section/index.vue | 140 ++++++++++-------- .../src/utils/sf-express-freight.test.ts | 48 ++++++ web-admin/src/utils/sf-express-freight.ts | 59 ++++++++ .../sample-freight/FreightConfigDialog.vue | 59 ++++++-- .../sample-freight/FreightEditDialog.vue | 52 +++++-- .../cell-storage/sample-freight/index.vue | 41 +++-- 7 files changed, 312 insertions(+), 98 deletions(-) create mode 100644 web-admin/src/utils/sf-express-freight.test.ts create mode 100644 web-admin/src/utils/sf-express-freight.ts diff --git a/web-admin/src/api/sample-freight.ts b/web-admin/src/api/sample-freight.ts index 2efa8d71..b21627b0 100644 --- a/web-admin/src/api/sample-freight.ts +++ b/web-admin/src/api/sample-freight.ts @@ -18,7 +18,11 @@ export type SampleFreight = { freightNo?: string transportMode: string transportModeLabel?: string - freightAmount: number + freightAmount: number | null + waybillNo?: string + settleStatus?: string + settleTime?: string + freightAmountLabel?: string linkedSampleCount?: number createBy?: string createByName?: string @@ -63,7 +67,8 @@ export function fetchSampleFreightDetail(id: string) { export function fetchCreateSampleFreight(data: { transportMode: string - freightAmount: number + freightAmount: number | null + waybillNo?: string items: SampleFreightItem[] }) { return request.post({ @@ -75,7 +80,7 @@ export function fetchCreateSampleFreight(data: { export function fetchUpdateSampleFreight( id: string, - data: { transportMode?: string; freightAmount?: number } + data: { transportMode?: string; freightAmount?: number | null; waybillNo?: string } ) { return request.put({ url: `/web/admin/sample-freights/${id}`, diff --git a/web-admin/src/components/business/sample-transport-form-section/index.vue b/web-admin/src/components/business/sample-transport-form-section/index.vue index 7b130eb7..0240e01f 100644 --- a/web-admin/src/components/business/sample-transport-form-section/index.vue +++ b/web-admin/src/components/business/sample-transport-form-section/index.vue @@ -6,19 +6,11 @@ 添加样本 - + 配置运费 - + 取消运费 @@ -104,12 +96,7 @@ - + @@ -209,11 +196,7 @@ - + @@ -318,9 +301,25 @@ /> - + + + + + + +
@@ -382,6 +381,12 @@ } from '@/components/business/freight-unlink-dialog/index.vue' import { sampleStatusLabel, sampleStatusTagType } from '@/utils/status-tag-registry' import { formatMoneyDisplay } from '@/utils/money-format' + import { + buildFreightHeaderPayload, + freightAmountText as formatFreightAmountText, + isSfExpress, + validateFreightHeader + } from '@/utils/sf-express-freight' import { partitionFreightConfigSamples, freightConfigSkipMessage, @@ -466,7 +471,8 @@ const freightSubmitting = ref(false) const freightForm = reactive({ transportMode: '' as string, - freightAmount: null as number | null + freightAmount: null as number | null, + waybillNo: '' }) const transportModeOptions = ref>([]) const existingFreightList = ref([]) @@ -487,9 +493,7 @@ const sampleDialogIndex = ref(-1) const sampleDraft = reactive>({}) - const canUnlinkFreight = computed(() => - selectedSamples.value.some((r) => sampleHasFreight(r)) - ) + const canUnlinkFreight = computed(() => selectedSamples.value.some((r) => sampleHasFreight(r))) function fmtMoney(v: unknown): string { if (v == null || v === '') return '—' @@ -506,11 +510,12 @@ } function freightAmountText(row: Record) { + const mode = row.freight?.transportMode || row.freightDraft?.transportMode const amount = row.freight?.freightAmount ?? row.freightDraft?.freightAmount - if (amount == null || amount === '') return '—' - const base = fmtMoney(amount) + const text = formatFreightAmountText(mode, amount) + if (!text) return '—' const n = Number(row.freight?.linkedSampleCount || 0) - return n > 1 ? `${base}（共用）` : base + return n > 1 ? `${text}（共用）` : text } function normalizeSampleRow(raw: Record, _index: number) { @@ -603,8 +608,7 @@ if (currentId && sc.id === currentId) return true if (sc.usedInProtocol) return false return !props.samples.some( - (s, i) => - (editingIndex < 0 || i !== editingIndex) && String(s.sampleCodeId || '') === sc.id + (s, i) => (editingIndex < 0 || i !== editingIndex) && String(s.sampleCodeId || '') === sc.id ) }) }) @@ -693,16 +697,21 @@ ? { id: freight.id, transportMode: freight.transportMode, - transportModeLabel: freight.transportModeLabel || transportModeLabelOf(String(freight.transportMode || '')), + transportModeLabel: + freight.transportModeLabel || + transportModeLabelOf(String(freight.transportMode || '')), freightAmount: freight.freightAmount, + waybillNo: freight.waybillNo, linkedSampleCount: freight.linkedSampleCount } : { id: '', transportMode: freight.transportMode, transportModeLabel: - freight.transportModeLabel || transportModeLabelOf(String(freight.transportMode || '')), + freight.transportModeLabel || + transportModeLabelOf(String(freight.transportMode || '')), freightAmount: freight.freightAmount, + waybillNo: freight.waybillNo, linkedSampleCount: freight.linkedSampleCount }, freightId: freight.id || '', @@ -764,7 +773,9 @@ keyword: existingFreightKeyword.value || undefined }) const data = (res as any)?.data || res - existingFreightList.value = data?.list || [] + existingFreightList.value = ((data?.list || []) as SampleFreight[]).filter( + (row) => row.settleStatus !== 'yjs' + ) } catch { existingFreightList.value = [] } finally { @@ -789,6 +800,7 @@ freightMode.value = 'create' freightForm.transportMode = '' freightForm.freightAmount = null + freightForm.waybillNo = '' selectedExistingFreight.value = null selectedFreightId.value = '' existingFreightKeyword.value = '' @@ -813,39 +825,52 @@ freightSubmitting.value = true try { if (freightMode.value === 'create') { - if (!freightForm.transportMode || freightForm.freightAmount == null) { - ElMessage.warning('请填写运输方式与运费') - return - } - const amount = Number(freightForm.freightAmount) - if (Number.isNaN(amount) || amount < 0) { - ElMessage.warning('运费须为不小于 0 的数字') + const message = validateFreightHeader({ + transportMode: freightForm.transportMode, + freightAmount: freightForm.freightAmount, + waybillNo: freightForm.waybillNo + }) + if (message) { + ElMessage.warning(message) return } + const header = buildFreightHeaderPayload({ + transportMode: freightForm.transportMode, + freightAmount: freightForm.freightAmount, + waybillNo: freightForm.waybillNo + }) let created: SampleFreight | null = null if (persisted.length) { const res = await fetchCreateSampleFreight({ - transportMode: freightForm.transportMode, - freightAmount: amount, + transportMode: header.transportMode, + freightAmount: header.freightAmount, + waybillNo: header.waybillNo, items: toFreightItems(persisted) }) created = ((res as any)?.data || res) as SampleFreight - applyFreightToRows(persisted, created) + applyFreightToRows(persisted, { + ...created, + transportMode: header.transportMode, + freightAmount: header.freightAmount, + waybillNo: header.waybillNo + }) } if (drafts.length) { const clientKey = `fd_${Date.now()}_${Math.random().toString(36).slice(2, 8)}` applyFreightToRows(drafts, { id: created?.id || '', - transportMode: freightForm.transportMode, - transportModeLabel: transportModeLabelOf(freightForm.transportMode), - freightAmount: amount, + transportMode: header.transportMode, + transportModeLabel: transportModeLabelOf(header.transportMode), + freightAmount: header.freightAmount, + waybillNo: header.waybillNo, linkedSampleCount: (created?.linkedSampleCount || 0) + drafts.length, freightDraft: created?.id ? undefined : { clientKey, - transportMode: freightForm.transportMode, - freightAmount: amount + transportMode: header.transportMode, + waybillNo: header.waybillNo, + freightAmount: header.freightAmount } }) } @@ -907,11 +932,11 @@ if (!persistedSeeds.length && draftOnly.length) { try { - await ElMessageBox.confirm( - '确定取消所选样本的运费吗？取消后可再次配置运费。', - '取消运费', - { type: 'warning', confirmButtonText: '确定', cancelButtonText: '取消' } - ) + await ElMessageBox.confirm('确定取消所选样本的运费吗？取消后可再次配置运费。', '取消运费', { + type: 'warning', + confirmButtonText: '确定', + cancelButtonText: '取消' + }) } catch { return } @@ -922,9 +947,7 @@ const freightIds = [ ...new Set( - persistedSeeds - .map((r) => String(r.freight?.id || r.freightId || '').trim()) - .filter(Boolean) + persistedSeeds.map((r) => String(r.freight?.id || r.freightId || '').trim()).filter(Boolean) ) ] const byKey = new Map() @@ -1077,8 +1100,7 @@ return } const dup = props.samples.some( - (s, i) => - i !== sampleDialogIndex.value && String(s.sampleCode || '').trim() === code + (s, i) => i !== sampleDialogIndex.value && String(s.sampleCode || '').trim() === code ) if (dup) { ElMessage.warning('样本编码重复，请重新添加') diff --git a/web-admin/src/utils/sf-express-freight.test.ts b/web-admin/src/utils/sf-express-freight.test.ts new file mode 100644 index 00000000..ba5b4e66 --- /dev/null +++ b/web-admin/src/utils/sf-express-freight.test.ts @@ -0,0 +1,48 @@ +import assert from 'node:assert/strict' +import test from 'node:test' +import { + buildFreightHeaderPayload, + buildSettlePayload, + freightAmountText, + validateFreightHeader +} from './sf-express-freight.ts' + +test('sf express hides amount and requires waybill', () => { + assert.equal( + validateFreightHeader({ transportMode: 'sfkd', freightAmount: null, waybillNo: ' SF1 ' }), + '' + ) + assert.match( + validateFreightHeader({ transportMode: 'sfkd', freightAmount: null, waybillNo: ' ' }), + /请填写顺丰单号/ + ) + assert.deepEqual( + buildFreightHeaderPayload({ transportMode: 'sfkd', freightAmount: 8, waybillNo: ' SF1 ' }), + { transportMode: 'sfkd', waybillNo: 'SF1', freightAmount: null } + ) + assert.equal(freightAmountText('sfkd', null), '月结') + assert.equal(freightAmountText('sfkd', 8), '8.00') +}) + +test('other transport still requires amount', () => { + assert.match( + validateFreightHeader({ transportMode: 'zxc', freightAmount: null, waybillNo: '' }), + /请填写运费/ + ) + assert.equal( + buildFreightHeaderPayload({ transportMode: 'zxc', freightAmount: 12.3, waybillNo: 'SF1' }) + .freightAmount, + 12.3 + ) + assert.equal( + buildFreightHeaderPayload({ transportMode: 'zxc', freightAmount: 12.3, waybillNo: 'SF1' }) + .waybillNo, + '' + ) +}) + +test('blank settle omits amount and batch settle never sends amount', () => { + assert.deepEqual(buildSettlePayload(['a'], ' '), { ids: ['a'] }) + assert.deepEqual(buildSettlePayload(['a'], '6.5'), { ids: ['a'], freightAmount: 6.5 }) + assert.deepEqual(buildSettlePayload(['a', 'b'], '6.5'), { ids: ['a', 'b'] }) +}) diff --git a/web-admin/src/utils/sf-express-freight.ts b/web-admin/src/utils/sf-express-freight.ts new file mode 100644 index 00000000..4773c13e --- /dev/null +++ b/web-admin/src/utils/sf-express-freight.ts @@ -0,0 +1,59 @@ +export const SF_TRANSPORT_MODE = 'sfkd' + +export function isSfExpress(mode: string | null | undefined) { + return String(mode || '').trim() === SF_TRANSPORT_MODE +} + +export function freightAmountText( + mode: string | null | undefined, + amount: number | string | null | undefined +) { + if (isSfExpress(mode) && (amount === null || amount === undefined || amount === '')) return '月结' + if (amount === null || amount === undefined || amount === '') return '' + const value = Number(amount) + if (!Number.isFinite(value)) return '' + return value.toFixed(2) +} + +export function validateFreightHeader(input: { + transportMode: string + freightAmount: number | null + waybillNo: string +}) { + if (!String(input.transportMode || '').trim()) return '请选择运输方式' + if (isSfExpress(input.transportMode)) { + const waybill = String(input.waybillNo || '').trim() + if (!waybill) return '请填写顺丰单号' + if (waybill.length > 64) return '顺丰单号不能超过 64 个字符' + return '' + } + if ( + input.freightAmount == null || + !Number.isFinite(Number(input.freightAmount)) || + Number(input.freightAmount) < 0 + ) { + return '请填写运费' + } + return '' +} + +export function buildFreightHeaderPayload(input: { + transportMode: string + freightAmount: number | null + waybillNo: string +}) { + const sf = isSfExpress(input.transportMode) + return { + transportMode: String(input.transportMode || '').trim(), + waybillNo: sf ? String(input.waybillNo || '').trim() : '', + freightAmount: sf ? null : Number(input.freightAmount) + } +} + +export function buildSettlePayload(ids: string[], freightAmount: string) { + const payload: { ids: string[]; freightAmount?: number } = { ids } + if (ids.length === 1 && String(freightAmount || '').trim()) { + payload.freightAmount = Number(String(freightAmount).trim()) + } + return payload +} diff --git a/web-admin/src/views/cell-storage/sample-freight/FreightConfigDialog.vue b/web-admin/src/views/cell-storage/sample-freight/FreightConfigDialog.vue index 01691d2c..078e038c 100644 --- a/web-admin/src/views/cell-storage/sample-freight/FreightConfigDialog.vue +++ b/web-admin/src/views/cell-storage/sample-freight/FreightConfigDialog.vue @@ -36,9 +36,25 @@ /> - + + + + + + +
@@ -200,6 +216,11 @@ type SampleFreightItem } from '@/api/sample-freight' import { receptionSourceLabel, receptionSourceTagType } from '@/utils/status-tag-registry' + import { + buildFreightHeaderPayload, + isSfExpress, + validateFreightHeader + } from '@/utils/sf-express-freight' defineOptions({ name: 'FreightConfigDialog' }) @@ -229,7 +250,8 @@ }) const form = reactive({ transportMode: '', - freightAmount: null as number | null + freightAmount: null as number | null, + waybillNo: '' }) async function loadTransportModeOptions() { @@ -258,7 +280,9 @@ keyword: existingKeyword.value || undefined }) const data = (res as any)?.data || res - existingFreightList.value = data?.list || [] + existingFreightList.value = ((data?.list || []) as SampleFreight[]).filter( + (row) => row.settleStatus !== 'yjs' + ) } catch { existingFreightList.value = [] } finally { @@ -316,6 +340,7 @@ mode.value = 'create' form.transportMode = '' form.freightAmount = null + form.waybillNo = '' selectedExisting.value = null selectedFreightId.value = '' existingKeyword.value = '' @@ -370,18 +395,24 @@ submitting.value = true try { if (mode.value === 'create') { - if (!form.transportMode || form.freightAmount == null) { - ElMessage.warning('请填写运输方式与运费') - return - } - const amount = Number(form.freightAmount) - if (Number.isNaN(amount) || amount < 0) { - ElMessage.warning('运费须为不小于 0 的数字') - return - } - await fetchCreateSampleFreight({ + const message = validateFreightHeader({ transportMode: form.transportMode, - freightAmount: amount, + freightAmount: form.freightAmount, + waybillNo: form.waybillNo + }) + if (message) { + ElMessage.warning(message) + return + } + const header = buildFreightHeaderPayload({ + transportMode: form.transportMode, + freightAmount: form.freightAmount, + waybillNo: form.waybillNo + }) + await fetchCreateSampleFreight({ + transportMode: header.transportMode, + freightAmount: header.freightAmount, + waybillNo: header.waybillNo, items: toItems(samples) }) } else { diff --git a/web-admin/src/views/cell-storage/sample-freight/FreightEditDialog.vue b/web-admin/src/views/cell-storage/sample-freight/FreightEditDialog.vue index f1cfefc8..d6245f8a 100644 --- a/web-admin/src/views/cell-storage/sample-freight/FreightEditDialog.vue +++ b/web-admin/src/views/cell-storage/sample-freight/FreightEditDialog.vue @@ -41,9 +41,25 @@ /> - + + + + + + + @@ -135,7 +144,12 @@ align="right" header-align="center" > - +