diff --git a/src/views/inventory/consumables/components/add-haocai.vue b/src/views/inventory/consumables/components/add-haocai.vue index 05c469e..2135ff1 100644 --- a/src/views/inventory/consumables/components/add-haocai.vue +++ b/src/views/inventory/consumables/components/add-haocai.vue @@ -14,9 +14,11 @@
+ {{ form.conUnit }}
第二单位价格: + {{ form.conUnitTwo }}
diff --git a/src/views/inventory/operation_in/index.vue b/src/views/inventory/operation_in/index.vue index a39f2cd..d939b9e 100644 --- a/src/views/inventory/operation_in/index.vue +++ b/src/views/inventory/operation_in/index.vue @@ -280,9 +280,9 @@ export default { return price; } if (row.conUnitTwo && row.unit == row.conUnitTwo) { - console.log(price / row.conUnitTwoConvert); - console.log(new Decimal(price).div(new Decimal(row.conUnitTwoConvert))); - return new Decimal(price).div(new Decimal(row.conUnitTwoConvert)); + // console.log(price / row.conUnitTwoConvert); + // console.log(new Decimal(price).div(new Decimal(row.conUnitTwoConvert))); + return new Decimal(price).mul(new Decimal(row.conUnitTwoConvert)); } return price; }, @@ -294,7 +294,7 @@ export default { return number; } if (row.conUnitTwo && row.unit == row.conUnitTwo) { - return number * row.conUnitTwoConvert; + return number / row.conUnitTwoConvert; } return number; },