From e1ea4d4b71c52f54cc4f1660e454bf2d6c3c805a Mon Sep 17 00:00:00 2001 From: Net Date: Thu, 29 Aug 2024 20:24:10 +0700 Subject: [PATCH 1/6] refactor: Change the conditions for adding customer --- src/pages/03_customer-management/MainPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index 215bec49..dfc70204 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -1690,7 +1690,7 @@ const emptyCreateDialog = ref(false); @trigger=" () => { createCustomerForm( - i.text === 'customerLegalEntity' ? 'CORP' : 'PERS', + i.text === 'customer.employerLegalEntity' ? 'CORP' : 'PERS', ); emptyCreateDialog = false; } From 399006522e734683b9fe6776445cdb36e9b06985 Mon Sep 17 00:00:00 2001 From: Net Date: Thu, 29 Aug 2024 22:05:18 +0700 Subject: [PATCH 2/6] refactor: delete index --- .../components/employer/EmployerFormAbout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue index 2510e2ba..92a1da38 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue @@ -168,7 +168,7 @@ defineProps<{ class="col-12 col-md-3" :label="$t('customer.form.branchCode')" for="input-branch-code" - :model-value="`${branchCode}${index}`" + :model-value="`${branchCode}`" /> Date: Thu, 29 Aug 2024 22:06:53 +0700 Subject: [PATCH 3/6] refactor: by customerCode --- .../components/employer/EmployerFormAbout.vue | 10 +++++----- .../components/employer/EmployerFormBranch.vue | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue index 92a1da38..9b54affd 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue @@ -12,9 +12,9 @@ const branchCode = defineModel('branchCode', { required: true, }); -// const customerCode = defineModel('customerCode', { -// required: true, -// }); +const customerCode = defineModel('customerCode', { + required: true, +}); const registerName = defineModel('registerName', { required: true, @@ -74,7 +74,7 @@ defineProps<{ :disable="!readonly" :readonly="readonly" :label="$t('customer.form.customerCode')" - :model-value="customerName" + :model-value="customerCode" /> diff --git a/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue b/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue index 4a0ce21a..f3b5bdb1 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue @@ -120,7 +120,7 @@ defineProps<{ v-model:id="item.id" v-model:legal-person-no="item.legalPersonNo" v-model:branch-code="item.code" - v-model:customer-code="item.customerCode" + v-model:customer-code="customer.code" v-model:register-company-name="item.registerCompanyName" v-model:register-name="item.registerName" v-model:register-name-en="item.registerNameEN" From 23987414a63179a11324339fc9960bb95730ef0a Mon Sep 17 00:00:00 2001 From: Net Date: Thu, 29 Aug 2024 22:24:33 +0700 Subject: [PATCH 4/6] refactor: edit show customerCode --- .../components/employer/EmployerFormAbout.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue index 9b54affd..2a13b326 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue @@ -74,7 +74,7 @@ defineProps<{ :disable="!readonly" :readonly="readonly" :label="$t('customer.form.customerCode')" - :model-value="customerCode" + :model-value="legalPersonNo" /> From 3b4e6b8fbff04926e83f6f68b109b842cf72bb98 Mon Sep 17 00:00:00 2001 From: Net Date: Thu, 29 Aug 2024 22:27:17 +0700 Subject: [PATCH 5/6] refactor: edit show customerCode --- .../components/employer/EmployerFormAbout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue index 2a13b326..fb763e28 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue @@ -181,7 +181,7 @@ defineProps<{ class="col-12 col-md-3" :label="$t('customer.form.customerCode')" for="input-customer-code" - :model-value="legalPersonNo" + :model-value="citizenId" /> From fe3c396a06988fd9d73816cdb5380640a567cace Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 29 Aug 2024 22:28:57 +0700 Subject: [PATCH 6/6] fix: running number of branch fix: error --- .../components/employer/EmployerFormAbout.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue index fb763e28..a563b999 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue @@ -61,7 +61,7 @@ defineProps<{ :label="$t('customer.form.branchCode')" :disable="!readonly" :readonly="readonly" - :model-value="branchCode" + :model-value="`${branchCode?.slice(0, -2) || '-'}${index.toString().padStart(2, '0')}`" />