diff --git a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue index dc4d3d72..8509cc68 100644 --- a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue +++ b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue @@ -16,7 +16,7 @@ - + {{ formatWeight(row.weighing_weight) }} @@ -46,7 +46,7 @@ - + props.row?.id) function formatWeight(value: unknown) { if (value === null || value === undefined || value === '') return '—' const num = Number(value) - return Number.isFinite(num) ? String(num) : String(value) + return Number.isFinite(num) ? String(num) + 'g' : String(value) } function formatTime(value: unknown) { diff --git a/src/views/order/orderManagement/component/WorkbenchOrderDetail.vue b/src/views/order/orderManagement/component/WorkbenchOrderDetail.vue index 80b64602..6557de8a 100644 --- a/src/views/order/orderManagement/component/WorkbenchOrderDetail.vue +++ b/src/views/order/orderManagement/component/WorkbenchOrderDetail.vue @@ -43,7 +43,7 @@ - + {{ formatWeight(row.weighing_weight) }} @@ -97,7 +97,7 @@ function formatAmount(value: unknown) { function formatWeight(value: unknown) { if (value === null || value === undefined || value === '') return '—' const num = Number(value) - return Number.isFinite(num) ? String(num) : String(value) + return Number.isFinite(num) ? String(num) + 'g' : String(value) } function formatExpressTime(value: unknown) { diff --git a/src/views/order/orderWeighing/ExpressWeighingForm.vue b/src/views/order/orderWeighing/ExpressWeighingForm.vue index 13e64ff9..60521994 100644 --- a/src/views/order/orderWeighing/ExpressWeighingForm.vue +++ b/src/views/order/orderWeighing/ExpressWeighingForm.vue @@ -14,7 +14,7 @@ class="weighing-form-alert" > - 支持运单号模式(order_id=0)与订单模式(order_id 为正整数)。称重重量单位为 kg,须大于 0,最多 3 位小数。 + 支持运单号模式(order_id=0)与订单模式(order_id 为正整数)。称重重量单位为 g,须大于 0 的整数。 --> @@ -66,19 +66,12 @@ - - - kg - g - - - - + 1e-9) { - callback(new Error('kg 单位最多 3 位小数')) - return - } + if (!Number.isInteger(num)) { + callback(new Error('称重重量必须为整数(g)')) + return } callback() } @@ -192,34 +181,12 @@ function resetForm() { formModel.waybill_code = props.initialWaybillCode?.trim() || '' formModel.order_id = undefined formModel.order_waybill_code = '' - formModel.weight_unit = loadWeightUnit() formModel.weighing_weight = undefined formRef.value?.clearValidate() } -function loadWeightUnit(): 'kg' | 'g' { - try { - const unit = localStorage.getItem('order_weighing_unit') - return unit === 'g' ? 'g' : 'kg' - } catch { - return 'kg' - } -} - -function saveWeightUnit(unit: 'kg' | 'g') { - try { - localStorage.setItem('order_weighing_unit', unit) - } catch { - /* ignore */ - } -} - function buildPayload(): UpdateExpressWeighingWeightParams { - const rawWeight = Number(formModel.weighing_weight) - const weighingWeight = - formModel.weight_unit === 'g' - ? Number((rawWeight / 1000).toFixed(3)) - : Number(rawWeight.toFixed(3)) + const weighingWeight = Number(formModel.weighing_weight) if (formModel.weighing_mode === 'waybill') { return { @@ -257,7 +224,7 @@ async function handleSubmit() { if (!isOrderIndexApiSuccess(res)) { throw new Error(res?.message || '称重保存失败') } - saveWeightUnit(formModel.weight_unit) + const detail = parseUpdateExpressWeighingWeightResponse(res) ElMessage.success(res?.message || '称重保存成功') applySuccessResult(payload, detail) diff --git a/src/views/order/orderWeighing/index.vue b/src/views/order/orderWeighing/index.vue index 60c5d6a2..55cd3198 100644 --- a/src/views/order/orderWeighing/index.vue +++ b/src/views/order/orderWeighing/index.vue @@ -9,11 +9,11 @@ {{ lastResult.wave_no || lastResult.waybill || '称重结果' }} - {{ lastResult.weighing_weight }} kg + {{ lastResult.weighing_weight }} g 称重 - {{ lastResult.total_weight }} kg + {{ lastResult.total_weight }} g 系统 @@ -40,7 +40,7 @@ :class="{ 'has-waybill': s.waybill_code }" > {{ s.business_key }} - {{ s.weighing_weight }} kg + {{ s.weighing_weight }} g {{ s.waybill_code }} 待分配 @@ -88,7 +88,7 @@ @refresh="loadList" > - {{ row.weighing_weight }} kg + {{ row.weighing_weight }} g 未称重 diff --git a/src/views/order/orderreview/index.vue b/src/views/order/orderreview/index.vue index 94bf3114..d9d09137 100644 --- a/src/views/order/orderreview/index.vue +++ b/src/views/order/orderreview/index.vue @@ -178,7 +178,7 @@ @closed="resetWeighingForm" > - + @@ -1769,7 +1769,7 @@ async function submitWeighing() { payload.recheck_status, payload.recheck_time ].filter((x) => x != null && String(x) !== '') - ElMessage.success(parts.length ? `复核成功:${parts.join(' / ')},称重 ${weight} kg` : `复核已记录,称重 ${weight} kg`) + ElMessage.success(parts.length ? `复核成功:${parts.join(' / ')},称重 ${weight} g` : `复核已记录,称重 ${weight} g`) weighingDialogVisible.value = false weighingBeforeConfirm.value = false await finishConfirmAndAdvance() diff --git a/src/views/order/orderreview/recheck-config.ts b/src/views/order/orderreview/recheck-config.ts index d1190a81..1091ccf8 100644 --- a/src/views/order/orderreview/recheck-config.ts +++ b/src/views/order/orderreview/recheck-config.ts @@ -17,7 +17,7 @@ export const recheckOrderSingleListColumns = [ { prop: 'recheck_status', label: '复核状态', width: '96' }, { prop: 'items_count', label: 'SKU数', width: '72', align: 'right' }, { prop: 'items_total', label: '件数', width: '72', align: 'right' }, - { prop: 'items_weight', label: '重量', width: '80', align: 'right' }, + { prop: 'items_weight', label: '重量(g)', width: '80', align: 'right' }, { prop: 'pick_time', label: '拣货时间', width: '150' }, { prop: 'recheck_time', label: '复核时间', width: '150' } ] diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 0dd3e7e6..37dde278 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -249,7 +249,7 @@ export const fallbackOrderColumns = applyWaveListCopyActions([ { prop: 'province', label: '省份', minWidth: 100 }, { prop: 'items_count', label: '商品种数', minWidth: 100 }, { prop: 'items_total', label: '商品总数', minWidth: 100 }, - { prop: 'items_weight', label: '商品重量kg', minWidth: 110 }, + { prop: 'items_weight', label: '商品重量(g)', minWidth: 110 }, { prop: 'item_snapshot', label: '商品快照', minWidth: 260 }, { prop: 'wave_scan_result', label: '扫描结果', minWidth: 110 }, { prop: 'buyer_message', label: '买家留言', minWidth: 180 },