From 077432b715612a5e2d1a79155440e31fd2883486 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Thu, 29 Feb 2024 10:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=85=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86table=E7=9A=84row-key=E5=86=99=E6=88=90=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delete_inventory_management/components/list.vue             | 2 +-
 .../inventory_management/components/import_custom.vue           | 2 +-
 .../inventory_management/components/list.vue                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/hazard_investigation/delete_inventory_management/components/list.vue b/src/views/hazard_investigation/delete_inventory_management/components/list.vue
index e3cb181..4d7283f 100644
--- a/src/views/hazard_investigation/delete_inventory_management/components/list.vue
+++ b/src/views/hazard_investigation/delete_inventory_management/components/list.vue
@@ -85,7 +85,7 @@
       ref="tableRef"
       v-model:pagination="pagination"
       :data="list"
-      :row-key="name === 'risk' ? LISTMANAGER_ID : CUSTOM_ID"
+      :row-key="name === 'risk' ? 'LISTMANAGER_ID' : 'CUSTOM_ID'"
       @get-data="fnGetDataTransfer"
     >
       <el-table-column reserve-selection type="selection" width="55" />
diff --git a/src/views/hazard_investigation/inventory_management/components/import_custom.vue b/src/views/hazard_investigation/inventory_management/components/import_custom.vue
index 05a8315..bf3f976 100644
--- a/src/views/hazard_investigation/inventory_management/components/import_custom.vue
+++ b/src/views/hazard_investigation/inventory_management/components/import_custom.vue
@@ -174,7 +174,7 @@ const props = defineProps({
     default: () => ({}),
   },
   whetherHazards: {
-    type: String,
+    type: [String, Number],
     required: true,
     default: "",
   },
diff --git a/src/views/hazard_investigation/inventory_management/components/list.vue b/src/views/hazard_investigation/inventory_management/components/list.vue
index 93d8711..a28b73b 100644
--- a/src/views/hazard_investigation/inventory_management/components/list.vue
+++ b/src/views/hazard_investigation/inventory_management/components/list.vue
@@ -92,7 +92,7 @@
       ref="tableRef"
       v-model:pagination="pagination"
       :data="list"
-      :row-key="name === 'risk' ? LISTMANAGER_ID : CUSTOM_ID"
+      :row-key="name === 'risk' ? 'LISTMANAGER_ID' : 'CUSTOM_ID'"
       @get-data="fnGetDataTransfer"
     >
       <el-table-column reserve-selection type="selection" width="55" />