Merge branch 'develop'

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;
           }

src/pages/03_customer-management/components/employer/EmployerFormAbout.vue

@@ -12,9 +12,9 @@ const branchCode = defineModel<string | undefined>('branchCode', {
   required: true,
 });
 
-// const customerCode = defineModel<string | undefined>('customerCode', {
-//   required: true,
-// });
+const customerCode = defineModel<string | undefined>('customerCode', {
+  required: true,
+});
 
 const registerName = defineModel<string | undefined>('registerName', {
   required: true,
@@ -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')}`"
       />
 
       <q-input
@@ -74,7 +74,7 @@ defineProps<{
         :disable="!readonly"
         :readonly="readonly"
         :label="$t('customer.form.customerCode')"
-        :model-value="customerName"
+        :model-value="legalPersonNo"
       />
 
       <q-input
@@ -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?.slice(0, -2) || '-'}${index.toString().padStart(2, '0')}`"
       />
 
       <q-input
@@ -181,7 +181,7 @@ defineProps<{
         class="col-12 col-md-3"
         :label="$t('customer.form.customerCode')"
         for="input-customer-code"
-        :model-value="customerName"
+        :model-value="citizenId"
       />
     </template>
   </div>

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"