fix(order): 修复分配子单号始终提交数量 1 的问题
提交时改为由表单组件通过 submit 事件回传实际输入的子单号数量,待处理/异常/配送订单三个入口统一以该数量调用接口;移除从不更新的冗余表单状态并补充整数校验。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
5b3528b601
commit
093053391a
@ -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({
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -617,7 +617,6 @@ export function createPendingToolbarController(params: {
|
||||
const allocateSubOrderNumberLoading = ref(false)
|
||||
const allocateSubOrderNumberOrderId = ref<number | null>(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() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user