diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue index 6885796..5f4174a 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue @@ -132,10 +132,10 @@ @@ -200,12 +200,12 @@ const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/ const props = withDefaults( defineProps<{ - formId: string | undefined + formId: string disabled: boolean }>(), { - formId: undefined, - disabled: true, + formId: "", + disabled: false, }, ) const emit = defineEmits(["close"]) @@ -371,7 +371,7 @@ const cgPlanSpuItems = computed(() => { erpSpuId: item.erpSpuId, quantity: item.quantity, unitPrice: unit?.retailPrice ? Number(unit?.retailPrice) : 0, - totalAmount: unit?.purchasePrice && item.quantity ? Number(unit.purchasePrice) * item.quantity : 0, + totalAmount: unit?.retailPrice && item.quantity ? Number(unit.retailPrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, orderType: baseDataForm.orderType, @@ -382,7 +382,7 @@ const cgPlanSpuItems = computed(() => { erpSpuId: item.erpSpuId, quantity: item.quantity, unitPrice: item.retailPrice ? Number(item.retailPrice) : 0, - totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, + totalAmount: item?.retailPrice && item.quantity ? Number(item.retailPrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, orderType: baseDataForm.orderType, diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue index 2849d1e..ec93b16 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue @@ -1,6 +1,6 @@