diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 47714945..76ce3e77 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -418,3 +418,14 @@ export const TradeOrderStatusEnum = { name: '已取消' } } + +// ========== ERP - 企业资源计划 ========== + +export const ErpBizType = { + PURCHASE_ORDER: 10, + PURCHASE_IN: 11, + PURCHASE_RETURN: 12, + SALE_ORDER: 20, + SALE_OUT: 21, + SALE_RETURN: 22 +} diff --git a/src/views/erp/finance/payment/FinancePaymentForm.vue b/src/views/erp/finance/payment/FinancePaymentForm.vue index adfadd21..3da2e6ef 100644 --- a/src/views/erp/finance/payment/FinancePaymentForm.vue +++ b/src/views/erp/finance/payment/FinancePaymentForm.vue @@ -83,6 +83,7 @@ @@ -196,11 +197,9 @@ watch( if (!val) { return } - const totalPrice = val.items.reduce((prev, curr) => prev + curr.totalPrice, 0) - const discountPrice = - val.discountPercent != null ? erpPriceMultiply(totalPrice, val.discountPercent / 100.0) : 0 - formData.value.discountPrice = discountPrice - formData.value.totalPrice = totalPrice - discountPrice + const totalPrice = val.items.reduce((prev, curr) => prev + curr.paymentPrice, 0) + formData.value.totalPrice = totalPrice + formData.value.paymentPrice = totalPrice - val.discountPrice }, { deep: true } ) diff --git a/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue b/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue index 54dcb8b9..03f53eab 100644 --- a/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue +++ b/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue @@ -59,24 +59,29 @@ - + 添加采购入库单 + + 添加采购入库单 + 添加采购退货单 + + diff --git a/src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue b/src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue index 85d1fda3..e10694a0 100644 --- a/src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue +++ b/src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue @@ -73,7 +73,7 @@ - +