konect brand device on device

2025-11-19 15:57:38 +07:00
parent b5fbf2f745
commit 6a21b65808
2 changed files with 65 additions and 17 deletions
--- a/src/pages/master/device/component/ListDevice.jsx
+++ b/src/pages/master/device/component/ListDevice.jsx
@@ -13,6 +13,7 @@ import { NotifAlert, NotifOk, NotifConfirmDialog } from '../../../../components/
 import { useNavigate } from 'react-router-dom';
 import { deleteDevice, getAllDevice } from '../../../../api/master-device';
 import TableList from '../../../../components/Global/TableList';
+import { getAllBrands } from '../../../../api/master-brand';

 const columns = (showPreviewModal, showEditModal, showDeleteDialog) => [
    {
@@ -44,9 +45,10 @@ const columns = (showPreviewModal, showEditModal, showDeleteDialog) => [
    },
    {
        title: 'Brand Device',
-        dataIndex: 'brand_device',
-        key: 'brand_device',
+        dataIndex: 'brand_name',
+        key: 'brand_name',
        width: '20%',
+        render: (brand_name) => brand_name || '-'
    },
    {
        title: 'Location',