diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index a5a5ba59..1e6cd484 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -1,10 +1,13 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
+import { storeToRefs } from 'pinia';
+import ItemCard from 'components/ItemCard.vue';
 import AppBox from 'components/app/AppBox.vue';
 import AddButton from 'components/AddButton.vue';
 import ProductCardComponent from 'components/04_product-service/ProductCardComponent.vue';
 import StatCard from 'components/StatCardComponent.vue';
-import NewProductCardCompoent from 'components/04_product-service/NewProductCardComponent.vue';
 import DrawerInfo from 'components/DrawerInfo.vue';
 import BasicInformation from 'components/04_product-service/BasicInformation.vue';
 import FormDialog from 'components/FormDialog.vue';
@@ -20,12 +23,10 @@ import WorkNameManagement from 'components/04_product-service/WorkNameManagement
 import useOptionStore from 'src/stores/options';
 import FormServiceProperties from 'components/04_product-service/FormServiceProperties.vue';
 import InfoForm from 'components/02_personnel-management/InfoForm.vue';
+import NoData from 'components/NoData.vue';
 
 import useFlowStore from 'src/stores/flow';
 import { Status } from 'src/stores/types';
-import NoData from 'components/NoData.vue';
-
-const flowStore = useFlowStore();
 
 import { dialog, dialogWarningClose } from 'src/stores/utils';
 
@@ -43,6 +44,7 @@ import {
   ServiceAndProduct,
 } from 'src/stores/product-service/types';
 
+const flowStore = useFlowStore();
 const productServiceStore = useProductServiceStore();
 const optionStore = useOptionStore();
 
@@ -72,23 +74,15 @@ const {
   deleteService,
   editService,
 
-  fetchListWork,
   createWork,
-  fetchListWorkById,
   editWork,
   deleteWork,
-  fetchListProductByIdWork,
-
-  fetchListOfWork,
 
   fetchListProductAndService,
 } = productServiceStore;
 
 const { workNameItems } = storeToRefs(productServiceStore);
 
-import ItemCard from 'components/ItemCard.vue';
-import TotalProductComponent from 'components/04_product-service/TotalProductComponent.vue';
-
 const stat = ref<
   {
     count: number;
@@ -102,39 +96,34 @@ const stat = ref<
   { count: 0, label: 'product', color: 'green' },
 ]);
 
-import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
-import { time } from 'console';
-import { storeToRefs } from 'pinia';
-
 const { t } = useI18n();
 
-const inputSearch = ref<string>('');
-const inputSearchProductAndService = ref<string>('');
+const inputSearch = ref('');
+const inputSearchProductAndService = ref('');
 
-const currentStatusProduct = ref<boolean>(false);
-const drawerInfo = ref<boolean>(false);
-const isEdit = ref<boolean>(false);
+const currentStatusProduct = ref(false);
+const drawerInfo = ref(false);
+const isEdit = ref(false);
 
-const dialogInputForm = ref<boolean>(false);
-const dialogProduct = ref<boolean>(false);
-const dialogService = ref<boolean>(false);
-const dialogProductEdit = ref<boolean>(false);
-const dialogServiceEdit = ref<boolean>(false);
+const dialogInputForm = ref(false);
+const dialogProduct = ref(false);
+const dialogService = ref(false);
+const dialogProductEdit = ref(false);
+const dialogServiceEdit = ref(false);
 
-const statusToggle = ref<boolean>(false);
-const profileSubmit = ref<boolean>(false);
-const infoProductEdit = ref<boolean>(false);
-const infoServiceEdit = ref<boolean>(false);
+const statusToggle = ref(false);
+const profileSubmit = ref(false);
+const infoProductEdit = ref(false);
+const infoServiceEdit = ref(false);
 
 const imageProduct = ref<File | undefined>(undefined);
 const profileUrl = ref<string | null>('');
 
-const pathGroupName = ref<string>('');
-const pathTypeName = ref<string>('');
+const pathGroupName = ref('');
+const pathTypeName = ref('');
 
-const dialogProductServiceType = ref<boolean>(false);
-const dialogTotalProduct = ref<boolean>(false);
+const dialogProductServiceType = ref(false);
+const dialogTotalProduct = ref(false);
 const productMode = ref<'group' | 'type' | 'service' | 'product'>('group');
 
 const productGroup = ref<ProductGroup[]>();
@@ -145,8 +134,8 @@ const service = ref<(Service & { type: 'service' })[]>();
 const resultSearchProduct = ref<ProductList[]>();
 const productAndService = ref<ServiceAndProduct[]>([]);
 
-const productAndServiceTab = ref<string>('all');
-const manageWorkNameDialog = ref<boolean>(false);
+const productAndServiceTab = ref<'all' | 'product' | 'service'>('all');
+const manageWorkNameDialog = ref(false);
 const previousValue = ref();
 
 const propertiesOption = ref();