From bee51d6d1a2ae450fa79accd05d68d6f3e56a8e2 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 26 Dec 2025 16:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=A5=E5=BA=93=E8=80=97?=
 =?UTF-8?q?=E6=9D=90=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/consumables/components/add-haocai.vue | 2 ++
 src/views/inventory/operation_in/index.vue                | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

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 @@
       <el-form-item label="耗材价格" prop="price">
         <div class="center">
           <el-input-number v-model="form.price" placeholder="请输入" @change="onPriceChange"></el-input-number>
+          <span>{{ form.conUnit }}</span>
           <div class="ipt">
             第二单位价格：
             <el-input-number v-model="twoPrice" placeholder="请输入" @change="onTwoPriceChange"></el-input-number>
+            <span>{{ form.conUnitTwo }}</span>
           </div>
         </div>
       </el-form-item>
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;
     },