diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 990786df..38654515 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -716,9 +716,13 @@ function openAllocateSubOrderNumberDialog() { allocateSubOrderNumberDialogVisible.value = true } -async function submitAllocateSubOrderNumber() { +async function submitAllocateSubOrderNumber(count?: number) { if (!allocateSubOrderNumberOrderId.value || allocateSubOrderNumberLoading.value) return - const sub_order_count = Math.max(1, Number(allocateSubOrderNumberCount.value) || 1) + const sub_order_count = Math.trunc(Number(count ?? allocateSubOrderNumberCount.value)) + if (!Number.isInteger(sub_order_count) || sub_order_count < 1) { + ElMessage.warning('子单号数量不能小于 1') + return + } allocateSubOrderNumberLoading.value = true try { const res = await orderPendingOrder.allocateSubOrderNumber({ diff --git a/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue b/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue index c504ebc4..37b79801 100644 --- a/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue +++ b/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue @@ -89,7 +89,7 @@ defineProps<{ }>() const emit = defineEmits<{ - (e: 'submit'): void + (e: 'submit', subOrderCount: number): void (e: 'closed'): void }>() @@ -135,7 +135,12 @@ const rules: FormRules = { async function handleSubmit() { const valid = await formRef.value?.validate().catch(() => false) if (!valid) return - emit('submit') + const count = Number(formModel.sub_order_count) + // 以表单内实际输入的数量为准,避免父组件未双向绑定 subOrderCount 时丢失数量 + if (subOrderCount.value !== count) { + subOrderCount.value = count + } + emit('submit', count) } function handleClosed() { diff --git a/src/views/order/orderManagement/utils/toolbar-actions.ts b/src/views/order/orderManagement/utils/toolbar-actions.ts index 52632037..426bcd41 100644 --- a/src/views/order/orderManagement/utils/toolbar-actions.ts +++ b/src/views/order/orderManagement/utils/toolbar-actions.ts @@ -617,7 +617,6 @@ export function createPendingToolbarController(params: { const allocateSubOrderNumberLoading = ref(false) const allocateSubOrderNumberOrderId = ref(null) const allocateSubOrderNumberOrderCode = ref('') - const allocateSubOrderNumberForm = reactive({ sub_order_count: 1 }) function openAllocateSubOrderNumberDialog() { const rows = params.getSelectedRows() @@ -633,14 +632,13 @@ export function createPendingToolbarController(params: { } allocateSubOrderNumberOrderId.value = orderId allocateSubOrderNumberOrderCode.value = String(row?.delivery_order_code || '') - allocateSubOrderNumberForm.sub_order_count = 1 allocateSubOrderNumberDialogVisible.value = true } - async function submitAllocateSubOrderNumber() { + async function submitAllocateSubOrderNumber(count?: number) { if (!allocateSubOrderNumberOrderId.value || allocateSubOrderNumberLoading.value) return - const sub_order_count = Number(allocateSubOrderNumberForm.sub_order_count) || 1 - if (sub_order_count < 1) { + const sub_order_count = Math.trunc(Number(count)) + if (!Number.isInteger(sub_order_count) || sub_order_count < 1) { ElMessage.warning('子单号数量不能小于 1') return } @@ -674,7 +672,6 @@ export function createPendingToolbarController(params: { function resetAllocateSubOrderNumberDialog() { allocateSubOrderNumberOrderId.value = null allocateSubOrderNumberOrderCode.value = '' - allocateSubOrderNumberForm.sub_order_count = 1 } async function handleWaveSingleFetchByIds() {