From 9c3443a3231e6a4192b483bdf981144020e802d6 Mon Sep 17 00:00:00 2001 From: Net <93821485+somnetsak123@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:26:13 +0700 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=20=20lay?= =?UTF-8?q?out=20=20=E0=B8=AA=E0=B8=B4=E0=B8=99=E0=B8=84=E0=B9=89=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/04_product-service/MainPage.vue | 1304 +++++++++++---------- 1 file changed, 653 insertions(+), 651 deletions(-) diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue index cf41e589..6aed2115 100644 --- a/src/pages/04_product-service/MainPage.vue +++ b/src/pages/04_product-service/MainPage.vue @@ -1295,110 +1295,111 @@ watch(inputSearchProductAndService, async () => { > -
- {{ $t('dataSum') }} - -
- - -
-
- -
+
+
+ {{ $t('dataSum') }} +
- - - - - + + +
+
+
+
+ {{ $t('showing') }} +
+
+ + + + + {{ v }} + + + + +
-
-
- {{ - $t('recordsPage', { - resultcurrentPage: - productAndServiceTab === 'product' - ? product?.length - : service?.length, - total: total, - }) - }} -
-
- +
+ {{ + $t('recordsPage', { + resultcurrentPage: + productAndServiceTab === 'product' + ? product?.length + : service?.length, + total: total, + }) + }} +
+
+ +
- - - + + + Date: Mon, 15 Jul 2024 09:25:39 +0700 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E0=B9=80=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B9=88=E0=B8=A1=20=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/03_customer-management/MainPage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index 194523e1..1316d7d5 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -1973,6 +1973,7 @@ watch([inputSearch, currentStatus], async () => {