From 61bdfb924b16d9ddef451530a0b66092b2b0e108 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 21 Mar 2025 13:27:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=80=97=E6=9D=90=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E8=AE=A1=E7=AE=97=E5=BA=93=E5=AD=98=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/consumables/config/content.ts | 2 ++
 src/views/inventory/consumables/index.vue         | 3 +++
 src/views/inventory/operation_in/index.vue        | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/inventory/consumables/config/content.ts b/src/views/inventory/consumables/config/content.ts
index 53d612e..c644a34 100644
--- a/src/views/inventory/consumables/config/content.ts
+++ b/src/views/inventory/consumables/config/content.ts
@@ -62,6 +62,8 @@ const contentConfig: IContentConfig = {
       label: "单位",
       align: "center",
       prop: "conUnit",
+      templet: "custom",
+      slotName: "conUnit",
     },
     {
       label: "所属商品",
diff --git a/src/views/inventory/consumables/index.vue b/src/views/inventory/consumables/index.vue
index 73176b2..4402bef 100644
--- a/src/views/inventory/consumables/index.vue
+++ b/src/views/inventory/consumables/index.vue
@@ -27,6 +27,9 @@
           {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
         </el-tag>
       </template>
+      <template #conUnit="scope">
+        <span>{{ scope.row.conUnit }}</span>
+      </template>
       <template #goods="scope">
         <div class="goodslang">
           <div class="goods-list">
diff --git a/src/views/inventory/operation_in/index.vue b/src/views/inventory/operation_in/index.vue
index 8a28921..e5c5e8a 100644
--- a/src/views/inventory/operation_in/index.vue
+++ b/src/views/inventory/operation_in/index.vue
@@ -341,7 +341,8 @@ export default {
       if (!row.unit) {
         return price;
       }
-      if (row.unit && row.unit != row.defaultUnit) {
+
+      if (row.unit && row.defaultUnit && row.unit != row.defaultUnit) {
         price = price / row.conUnitTwoConvert;
       } else {
         price = price;