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" > 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" >