diff --git a/apps/web-ele/src/views/wms/order/receipt/modules/detail.vue b/apps/web-ele/src/views/wms/order/receipt/modules/detail.vue index 1cbb33a45..368239a07 100644 --- a/apps/web-ele/src/views/wms/order/receipt/modules/detail.vue +++ b/apps/web-ele/src/views/wms/order/receipt/modules/detail.vue @@ -15,12 +15,10 @@ import { useDescription } from '#/components/description'; import { formatPrice, formatQuantity, - formatSumPrice, - formatSumQuantity, multiplyPrice, } from '#/views/wms/utils/format'; -import { useDetailSchema } from '../data'; +import { getDetailFooter, useDetailSchema } from '../data'; interface DetailRow extends WmsReceiptOrderDetailApi.ReceiptOrderDetail { totalPrice?: number; @@ -79,7 +77,9 @@ const [Modal, modalApi] = useVbenModal({ :data="detailRows" border empty-text="暂无商品明细" + :footer-method="getDetailFooter" :show-overflow="true" + show-footer size="small" > @@ -98,7 +98,7 @@ const [Modal, modalApi] = useVbenModal({ - + @@ -109,16 +109,12 @@ const [Modal, modalApi] = useVbenModal({ {{ formatPrice(row.price) || '-' }} - + -
- 合计数量:{{ formatSumQuantity(detailRows, (detail) => detail.quantity) }} - 合计金额:{{ formatSumPrice(detailRows, (detail) => detail.totalPrice) }} -
diff --git a/apps/web-ele/src/views/wms/order/receipt/modules/form.vue b/apps/web-ele/src/views/wms/order/receipt/modules/form.vue index ee0f8e66b..af6469576 100644 --- a/apps/web-ele/src/views/wms/order/receipt/modules/form.vue +++ b/apps/web-ele/src/views/wms/order/receipt/modules/form.vue @@ -45,7 +45,9 @@ type FormMode = 'create' | 'update'; defineOptions({ name: 'WmsReceiptOrderForm' }); -const emit = defineEmits(['success']); +const emit = defineEmits<{ + success: []; +}>(); const formData = ref({}); const formMode = ref('create'); @@ -120,6 +122,7 @@ function buildDetail(sku: WmsItemSkuApi.ItemSku): DetailRow { /** 设置入库明细 */ function setDetails(list?: WmsReceiptOrderDetailApi.ReceiptOrderDetail[]) { + detailSeq = 0; details.value = (list || []).map((detail) => normalizeDetail(detail)); void refreshDetailFooter(); } @@ -330,6 +333,7 @@ const [Modal, modalApi] = useVbenModal({ setDetails(orderDetails); // 设置到 values await formApi.setValues(formData.value); + await nextTick(); originalSubmitData.value = await buildSubmitData(); } finally { modalApi.unlock(); @@ -344,8 +348,8 @@ const [Modal, modalApi] = useVbenModal({ }; setDetails([]); await formApi.setValues(formData.value); - originalSubmitData.value = await buildSubmitData(); await nextTick(); + originalSubmitData.value = await buildSubmitData(); }, });