From d740a48c7f15ed128f2fbde06fa4f119edf6bb81 Mon Sep 17 00:00:00 2001
From: Methapon Metanipat <methapon@frappet.com>
Date: Thu, 26 Sep 2024 09:59:26 +0700
Subject: [PATCH] fix: type error

---
 src/pages/03_customer-management/MainPage.vue |   5 +-
 .../employer/EmployerFormBasicInfo.vue        |   4 +-
 src/pages/03_customer-management/form.ts      |   2 -
 src/stores/customer/index.ts                  |   1 -
 src/stores/customer/types.ts                  | 102 +++++++++---------
 5 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 7a34c5aa..f5710f20 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -2171,7 +2171,7 @@ const emptyCreateDialog = ref(false);
                       } else {
                         res = await customerStore.createBranch({
                           ...customerFormData.customerBranch[idx],
-                          customerId: customerFormState.editCustomerId,
+                          customerId: customerFormState.editCustomerId || '',
                           id: undefined,
                         });
                       }
@@ -2230,6 +2230,7 @@ const emptyCreateDialog = ref(false);
                 <EmployerFormBranch
                   :index="idx"
                   prefixId="form"
+                  v-if="customerFormData.customerBranch"
                   v-model:customer="customerFormData"
                   v-model:customer-branch="customerFormData.customerBranch[idx]"
                   :onCreate="customerFormState.dialogType === 'create'"
@@ -2245,6 +2246,8 @@ const emptyCreateDialog = ref(false);
                   @cancel="() => customerFormUndo(false)"
                   @delete="
                     async () => {
+                      if (!customerFormState.editCustomerId) return;
+
                       if (idx === 0) {
                         deleteCustomerById(customerFormState.editCustomerId);
                         return;
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue b/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue
index 57bae35f..da117e83 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue
@@ -45,8 +45,8 @@ const registerName = defineModel<string>('registerName', { default: '' });
 const citizenId = defineModel<string>('citizenId', { default: '' });
 const legalPersonNo = defineModel<string>('legalPersonNo', { default: '' });
 
-const businessType = defineModel<'string'>('businessType');
-const jobPosition = defineModel<'string'>('jobPosition');
+const businessType = defineModel<string>('businessType');
+const jobPosition = defineModel<string>('jobPosition');
 const telephoneNo = defineModel<string>('telephoneNo', { default: '' });
 
 const branchOptions = defineModel<{ id: string; name: string }[]>(
diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts
index a8d36b68..9335728d 100644
--- a/src/pages/03_customer-management/form.ts
+++ b/src/pages/03_customer-management/form.ts
@@ -157,9 +157,7 @@ export const useCustomerForm = defineStore('form-customer', () => {
         wageRateText: v.wageRateText,
         payDate: v.payDate,
         jobDescription: v.jobDescription,
-        jobPositionEN: v.jobPositionEN,
         jobPosition: v.jobPosition,
-        businessTypeEN: v.businessTypeEN,
         businessType: v.businessType,
         employmentOffice: v.employmentOffice,
         employmentOfficeEN: v.employmentOfficeEN,
diff --git a/src/stores/customer/index.ts b/src/stores/customer/index.ts
index 31044c22..b0a2f17f 100644
--- a/src/stores/customer/index.ts
+++ b/src/stores/customer/index.ts
@@ -367,7 +367,6 @@ const useCustomerStore = defineStore('api-customer', () => {
     data: CustomerBranchCreate & {
       id?: string;
       customerId: string;
-      codeCustomer: string;
     },
   ) {
     if (data.citizenId) {
diff --git a/src/stores/customer/types.ts b/src/stores/customer/types.ts
index 309ff127..301a8c2d 100644
--- a/src/stores/customer/types.ts
+++ b/src/stores/customer/types.ts
@@ -25,56 +25,56 @@ export type Customer = {
 
 export type CustomerBranch = {
   customerCode?: string;
-  wageRateText: 'string';
-  wageRate: 0;
-  payDateEN: 'string';
-  payDate: 'string';
-  jobDescription: 'string';
-  jobPosition: 'string';
-  businessType: 'string';
-  agent: 'string';
-  contactName: 'string';
-  officeTel: 'string';
-  contactTel: 'string';
-  email: 'string';
-  subDistrictId: 'string';
-  districtId: 'string';
-  provinceId: 'string';
-  streetEN: 'string';
-  street: 'string';
-  mooEN: 'string';
-  moo: 'string';
-  soiEN: 'string';
-  soi: 'string';
-  addressEN: 'string';
-  address: 'string';
-  employmentOfficeEN: 'string';
-  employmentOffice: 'string';
-  homeCode: 'string';
-  authorizedNameEN: 'string';
-  authorizedName: 'string';
-  authorizedCapital: 'string';
-  registerDate: '2024-09-16T07:52:42.627Z';
-  registerNameEN: 'string';
-  registerName: 'string';
-  legalPersonNo: 'string';
-  citizenId: 'string';
-  birthDate: '2024-09-16T07:52:42.627Z';
-  gender: 'string';
-  lastNameEN: 'string';
-  lastName: 'string';
-  firstNameEN: 'string';
-  firstName: 'string';
-  namePrefix: 'string';
-  telephoneNo: 'string';
-  codeCustomer: 'string';
-  customerName: 'string';
-  updatedByUserId: 'string';
-  createdByUserId: 'string';
-  code: 'string';
+  wageRateText: string;
+  wageRate: number;
+  payDateEN: string;
+  payDate: string;
+  jobDescription: string;
+  jobPosition: string;
+  businessType: string;
+  agent: string;
+  contactName: string;
+  officeTel: string;
+  contactTel: string;
+  email: string;
+  subDistrictId: string;
+  districtId: string;
+  provinceId: string;
+  streetEN: string;
+  street: string;
+  mooEN: string;
+  moo: string;
+  soiEN: string;
+  soi: string;
+  addressEN: string;
+  address: string;
+  employmentOfficeEN: string;
+  employmentOffice: string;
+  homeCode: string;
+  authorizedNameEN: string;
+  authorizedName: string;
+  authorizedCapital: string;
+  registerDate: string | Date | null;
+  registerNameEN: string;
+  registerName: string;
+  legalPersonNo: string;
+  citizenId: string;
+  birthDate: string;
+  gender: string;
+  lastNameEN: string;
+  lastName: string;
+  firstNameEN: string;
+  firstName: string;
+  namePrefix: string;
+  telephoneNo: string;
+  codeCustomer: string;
+  customerName: string;
+  updatedByUserId: string;
+  createdByUserId: string;
+  code: string;
   statusOrder: 0;
-  customerId: 'string';
-  id: 'string';
+  customerId: string;
+  id: string;
 
   status: Status;
   createdBy: string | null;
@@ -132,11 +132,11 @@ export type CustomerBranchCreate = {
   customerName?: string;
   registerName?: string;
   registerNameEN?: string;
-  registerDate?: Date | null;
+  registerDate?: string | Date | null;
   authorizedCapital?: string;
   authorizedName?: string;
   authorizedNameEN?: string;
-  code?: 'string';
+  code?: string;
   citizen?: CitizenPayload[];
   file?: {
     name?: string;