diff --git a/src/components/01_branch-management/FormBranchInformation.vue b/src/components/01_branch-management/FormBranchInformation.vue index d48c7fb7..46726096 100644 --- a/src/components/01_branch-management/FormBranchInformation.vue +++ b/src/components/01_branch-management/FormBranchInformation.vue @@ -8,7 +8,7 @@ const codeSubBranch = defineModel('codeSubBranch'); const taxNo = defineModel('taxNo'); const name = defineModel('name'); const abbreviation = defineModel('abbreviation'); -const nameEN = defineModel('nameEN'); +const nameEN = defineModel('nameEn'); const typeBranch = defineModel('typeBranch'); const virtual = defineModel('virtual'); diff --git a/src/components/02_personnel-management/FormByType.vue b/src/components/02_personnel-management/FormByType.vue index 4385e950..0f0c3fd6 100644 --- a/src/components/02_personnel-management/FormByType.vue +++ b/src/components/02_personnel-management/FormByType.vue @@ -32,7 +32,7 @@ const importNationality = defineModel( ); const trainingPlace = defineModel('trainingPlace'); const checkpoint = defineModel('checkPoint'); -const checkpointEN = defineModel('checkPointEN'); +const checkpointEN = defineModel('checkPointEn'); const agencyFile = defineModel('agencyFile'); const agencyFileList = defineModel<{ name: string; url: string }[]>('agencyFileList'); diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue index def966e4..6b94a36f 100644 --- a/src/components/02_personnel-management/FormPerson.vue +++ b/src/components/02_personnel-management/FormPerson.vue @@ -11,15 +11,15 @@ const optionStore = useOptionStore(); const prefixName = defineModel('prefixName'); const firstName = defineModel('firstName'); const lastName = defineModel('lastName'); -const firstNameEN = defineModel('firstNameEN'); -const lastNameEN = defineModel('lastNameEN'); +const firstNameEN = defineModel('firstNameEn'); +const lastNameEN = defineModel('lastNameEn'); const telephoneNo = defineModel('telephoneNo'); const email = defineModel('email'); const gender = defineModel('gender'); const birthDate = defineModel('birthDate'); const nationality = defineModel('nationality'); const midName = defineModel('midName'); -const midNameEN = defineModel('midNameEN'); +const midNameEN = defineModel('midNameEn'); const citizenId = defineModel('citizenId'); const citizenIssue = defineModel('citizenIssue'); const citizenExpire = defineModel('citizenExpire'); diff --git a/src/components/03_customer-management/TableEmpoloyee.vue b/src/components/03_customer-management/TableEmpoloyee.vue index de871d8a..21ebc2bc 100644 --- a/src/components/03_customer-management/TableEmpoloyee.vue +++ b/src/components/03_customer-management/TableEmpoloyee.vue @@ -216,6 +216,7 @@ defineEmits<{ - { } " @delete="triggerDelete(props.row.id)" - @changeStatus=" + @change-status=" async () => { const res = await triggerChangeStatus( props.row.id, @@ -1692,9 +1692,9 @@ watch(currentHq, () => { > { v-model:abbreviation="formData.code" v-model:code="formData.codeHeadOffice" v-model:code-sub-branch="currentEdit.code" - v-model:taxNo="formData.taxNo" + v-model:tax-no="formData.taxNo" v-model:name="formData.name" - v-model:nameEN="formData.nameEN" + v-model:name-en="formData.nameEN" v-model:type-branch="formTypeBranch" v-model:permit-no="formData.permitNo" v-model:permit-issue-date="formData.permitIssueDate" @@ -2355,7 +2355,7 @@ watch(currentHq, () => { } } " - @deleteFile=" + @delete-file=" async (filename) => { const res = await branchStore.deleteByIdAttachment( currentId, @@ -2523,7 +2523,7 @@ watch(currentHq, () => { @@ -1924,12 +1924,12 @@ watch( separator :title="'form.field.basicInformation'" :usernameReadonly="isEdit" - v-model:hqId="hqId" - v-model:brId="brId" - v-model:userType="formData.userType" - v-model:userRole="formData.userRole" + v-model:hq-id="hqId" + v-model:br-id="brId" + v-model:user-type="formData.userType" + v-model:user-role="formData.userRole" v-model:username="formData.username" - v-model:userCode="userCode" + v-model:user-code="userCode" class="q-mb-xl" /> @@ -1998,7 +1998,7 @@ watch( { " :customer-type="customerType" v-model:citizen-id="customerBranchFormData.citizenId" - v-model:prefixName="customerBranchFormData.namePrefix" - v-model:firstName="customerBranchFormData.firstName" - v-model:lastName="customerBranchFormData.lastName" - v-model:firstNameEN="customerBranchFormData.firstNameEN" - v-model:lastNameEN="customerBranchFormData.lastNameEN" + v-model:prefix-name="customerBranchFormData.namePrefix" + v-model:first-name="customerBranchFormData.firstName" + v-model:last-name="customerBranchFormData.lastName" + v-model:first-name-en="customerBranchFormData.firstNameEN" + v-model:last-name-en="customerBranchFormData.lastNameEN" v-model:gender="customerBranchFormData.gender" - v-model:birthDate="customerBranchFormData.birthDate" - v-model:customerName="customerBranchFormData.customerName" - v-model:legalPersonNo="customerBranchFormData.legalPersonNo" - v-model:branchCode="customerBranchFormData.code" - v-model:registerName="customerBranchFormData.registerName" - v-model:registerNameEN="customerBranchFormData.registerNameEN" - v-model:registerDate="customerBranchFormData.registerDate" - v-model:authorizedCapital="customerBranchFormData.authorizedCapital" - v-model:telephoneNo="customerBranchFormData.telephoneNo" - v-model:codeCustomer="customerBranchFormData.codeCustomer" + v-model:birth-date="customerBranchFormData.birthDate" + v-model:customer-name="customerBranchFormData.customerName" + v-model:legal-person-no="customerBranchFormData.legalPersonNo" + v-model:branch-code="customerBranchFormData.code" + v-model:register-name="customerBranchFormData.registerName" + v-model:register-name-en="customerBranchFormData.registerNameEN" + v-model:register-date="customerBranchFormData.registerDate" + v-model:authorized-capital=" + customerBranchFormData.authorizedCapital + " + v-model:telephone-no="customerBranchFormData.telephoneNo" + v-model:code-customer="customerBranchFormData.codeCustomer" />
{ prefix-id="employer-branch" :readonly="customerBranchFormState.dialogType === 'info'" v-model:authorized-name="customerBranchFormData.authorizedName" - v-model:authorized-name-e-n=" - customerBranchFormData.authorizedNameEN - " + v-model:authorized-name-en="customerBranchFormData.authorizedNameEN" />
@@ -861,10 +861,10 @@ watch([customerId, inputSearch, currentStatus], async () => {
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index fe0b301c..6c8d926b 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -807,7 +807,7 @@ const emptyCreateDialog = ref(false);
- {{ - locale === 'eng' - ? `${props.row.branch[0].addressEN}, ${props.row.branch[0].mooEN && `${$t('form.moo')} ${props.row.branch[0].mooEN},`} ${props.row.branch[0].soiEN && `${$t('form.soi')} ${props.row.branch[0].soiEN},`} ${props.row.branch[0].moo && `${props.row.branch[0].streetEN} Rd,`} ${props.row.branch[0].subDistrict.nameEN}, ${props.row.branch[0].district.nameEN}, ${props.row.branch[0].province.nameEN} ${props.row.branch[0].subDistrict.zipCode}` || - '-' - : `${props.row.branch[0].address}, ${props.row.branch[0].moo && `${$t('form.moo')} ${props.row.branch[0].moo},`} ${props.row.branch[0].soi && `${$t('form.soi')} ${props.row.branch[0].soi},`} ${props.row.branch[0].street && `${$t('form.road')} ${props.row.branch[0].street},`} ${props.row.branch[0].subDistrict.name}, ${props.row.branch[0].district.name}, ${props.row.branch[0].province.name} ${props.row.branch[0].subDistrict.zipCode}` || - '-' - }} - - {{ - locale === 'eng' - ? `${props.row.branch[0].addressEN}, ${props.row.branch[0].mooEN && `${$t('form.moo')} ${props.row.branch[0].mooEN},`} ${props.row.branch[0].soiEN && `${$t('form.soi')} ${props.row.branch[0].soiEN},`} ${props.row.branch[0].moo && `${props.row.branch[0].streetEN} Rd,`} ${props.row.branch[0].subDistrict.nameEN}, ${props.row.branch[0].district.nameEN}, ${props.row.branch[0].province.nameEN} ${props.row.branch[0].subDistrict.zipCode}` || - '-' - : `${props.row.branch[0].address}, ${props.row.branch[0].moo && `${$t('form.moo')} ${props.row.branch[0].moo},`} ${props.row.branch[0].soi && `${$t('form.soi')} ${props.row.branch[0].soi},`} ${props.row.branch[0].street && `${$t('form.road')} ${props.row.branch[0].street},`} ${props.row.branch[0].subDistrict.name}, ${props.row.branch[0].district.name}, ${props.row.branch[0].province.name} ${props.row.branch[0].subDistrict.zipCode}` || - '-' - }} - - - {{ props.row.branch[0]?.contactName || '-' }} @@ -1444,7 +1425,7 @@ const emptyCreateDialog = ref(false);