src/components/shared/select/SelectBusinessType.vue

@@ -158,39 +158,6 @@ function setDefaultValue() {
       <q-separator class="q-mx-sm" />
     </template>
 
-    <template #before-options v-if="creatable">
-      <q-item
-        :disable="creatableDisabled"
-        clickable
-        v-close-popup
-        @click.stop="$emit('create')"
-        for="select-business-type-add-new"
-        id="select-business-type-add-new"
-      >
-        <q-item-section>
-          <span class="row items-center">
-            <q-icon
-              name="mdi-plus-circle-outline"
-              class="q-mr-sm"
-              style="color: hsl(var(--positive-bg))"
-            />
-            <b>
-              {{ $t('general.add', { text: $t('menu.manage.businessType') }) }}
-            </b>
-            <span
-              v-if="creatableDisabled && creatableDisabledText"
-              class="app-text-muted q-pl-xs"
-              style="font-size: 80%"
-            >
-              {{ creatableDisabledText }}
-            </span>
-          </span>
-        </q-item-section>
-      </q-item>
-
-      <q-separator class="q-mx-sm" />
-    </template>
-
     <template #option="{ opt, scope }">
       <q-item v-bind="scope.itemProps">
         <span class="row items-center">

src/components/shared/select/SelectCustomer.vue

@@ -30,7 +30,6 @@ defineEmits<{
 type ExclusiveProps = {
   simple?: boolean;
   simpleBranchNo?: boolean;
-  selectFirstValue?: boolean;
 };
 
 const props = defineProps<SelectProps<typeof getList> & ExclusiveProps>();
@@ -65,14 +64,10 @@ onMounted(async () => {
     setFirstValue();
   }
 
-  if (props.selectFirstValue) {
+  await getSelectedOption();
-    setDefaultValue();
-  } else await getSelectedOption();
-});
 
-function setDefaultValue() {
+  valueOption.value = selectOptions.value.find((v) => v.id === value.value);
-  setFirstValue();
+});
-}
 </script>
 <template>
   <SelectInput
@@ -165,9 +160,11 @@ function setDefaultValue() {
     </template>
 
     <template #option="{ opt, scope }">
-      <q-item v-bind="scope.itemProps" class="q-mx-sm bodrder">
+      <q-item @click="valueOption = opt" v-bind="scope.itemProps">
         <SelectCustomerItem :data="opt" :simple :simple-branch-no />
       </q-item>
+
+      <q-separator class="q-mx-sm" />
     </template>
 
     <template #append v-if="clearable">
@@ -180,11 +177,3 @@ function setDefaultValue() {
     </template>
   </SelectInput>
 </template>
-
-<style scoped>
-.bodrder {
-  border-bottom: solid;
-  border-bottom-width: 1px;
-  border-color: var(--border-color);
-}
-</style>

src/pages/03_customer-management/MainPage.vue

@@ -2263,7 +2263,7 @@ const emptyCreateDialog = ref(false);
               customerFormData.customerBranch[0].legalPersonNo
             "
             v-model:business-type="
-              customerFormData.customerBranch[0].businessTypeId
+              customerFormData.customerBranch[0].businessType
             "
             v-model:job-position="
               customerFormData.customerBranch[0].jobPosition

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

@@ -10,25 +10,10 @@ import { useI18n } from 'vue-i18n';
 import ThaiBahtText from 'thai-baht-text';
 import SelectBusinessType from 'src/components/shared/select/SelectBusinessType.vue';
 
-import BusinessTypeDialog from 'src/pages/16_business-type-management/BusinessTypeDialog.vue';
-
-import useBusinessTypeStore from 'src/stores/business-type';
-
 const { locale } = useI18n({ useScope: 'global' });
 
 const rawOption = ref();
 
-const businessTypeDialog = ref<boolean>(false);
-const formDataBusinessType = ref<{
-  name: string;
-  nameEN: string;
-}>({
-  name: '',
-  nameEN: '',
-});
-
-const useBusinessType = useBusinessTypeStore();
-
 const businessTypeId = defineModel<string>('businessTypeId');
 const jobPosition = defineModel<string>('jobPosition');
 const jobDescription = defineModel<string>('jobDescription');
@@ -44,8 +29,6 @@ const typeBusinessENOption = ref([]);
 const jobPositionOption = ref([]);
 const jobPositionENOption = ref([]);
 
-const keySelect = ref<number>(0);
-
 defineProps<{
   title?: string;
   dense?: boolean;
@@ -55,20 +38,6 @@ defineProps<{
   showTitle?: boolean;
 }>();
 
-function resetFormBusinessType() {
-  businessTypeDialog.value = false;
-  formDataBusinessType.value = { name: '', nameEN: '' };
-}
-
-async function submitBusinessType() {
-  const res = await useBusinessType.create(formDataBusinessType.value);
-  if (res) {
-    businessTypeId.value = res.id;
-    resetFormBusinessType();
-    keySelect.value++;
-  }
-}
-
 onMounted(async () => {
   const resultOption = await fetch('/option/option.json');
   rawOption.value = await resultOption.json();
@@ -152,24 +121,16 @@ let jobPositionENFilter = selectFilterOptionRefMod(
     </div>
 
     <SelectBusinessType
-      :key="keySelect"
       class="col-md-6 col-12"
       v-model:value="businessTypeId"
       :readonly
-      creatable
       lang="tha"
-      :rules="[(val: string) => !!val || $t('form.error.required')]"
-      @create="() => (businessTypeDialog = true)"
     />
     <SelectBusinessType
-      :key="keySelect"
       class="col-md-6 col-12"
       v-model:value="businessTypeId"
-      :readonly
-      creatable
       lang="eng"
-      :rules="[(val: string) => !!val || $t('form.error.required')]"
+      :readonly
-      @create="() => (businessTypeDialog = true)"
     />
 
     <q-select
@@ -321,12 +282,4 @@ let jobPositionENFilter = selectFilterOptionRefMod(
       "
     />
   </div>
-
-  <BusinessTypeDialog
-    ref="refBusinessTypeDialog"
-    @close="resetFormBusinessType()"
-    @submit="submitBusinessType()"
-    v-model="businessTypeDialog"
-    v-model:data="formDataBusinessType"
-  />
 </template>

src/pages/03_customer-management/form.ts

@@ -30,8 +30,6 @@ export const useCustomerForm = defineStore('form-customer', () => {
 
   const registerAbleBranchOption = ref<{ id: string; name: string }[]>();
 
-  const currentBranchRootId = ref<string>('');
-
   const tabFieldRequired = ref<{
     [key: string]: (keyof CustomerBranchCreate)[];
   }>({
@@ -162,7 +160,6 @@ export const useCustomerForm = defineStore('form-customer', () => {
     state.value.editCustomerCode = data.code;
     state.value.customerImageUrl = `${baseUrl}/customer/${id}/image/${data.selectedImage}`;
     state.value.defaultCustomerImageUrl = `${baseUrl}/customer/${id}/image/${data.selectedImage}`;
-    currentBranchRootId.value = data.branch[0].id || '';
 
     resetFormData.registeredBranchId = data.registeredBranchId;
     resetFormData.status = data.status;
@@ -503,8 +500,6 @@ export const useCustomerForm = defineStore('form-customer', () => {
     state,
     resetFormData,
     currentFormData,
-    currentBranchRootId,
-
     isFormDataDifferent,
     resetForm,
     assignFormData,
@@ -1668,7 +1663,6 @@ export const useEmployeeForm = defineStore('form-employee', () => {
     state,
     currentFromDataEmployee,
     resetEmployeeData,
-
     addPassport,
     addVisa,
     addCheckup,

src/pages/05_quotation/MainPage.vue

@@ -60,6 +60,7 @@ const flowStore = useFlowStore();
 const userBranch = useMyBranch();
 const navigatorStore = useNavigator();
 const customerStore = useCustomerStore();
+
 const {
   fetchListOfOptionBranch,
   customerFormUndo,
@@ -75,7 +76,6 @@ const {
 const {
   state: customerFormState,
   currentFormData: customerFormData,
-  currentBranchRootId,
   registerAbleBranchOption,
   tabFieldRequired,
 } = storeToRefs(customerFormStore);
@@ -89,8 +89,6 @@ const fieldSelectedOption = computed(() => {
       value: v.name,
     }));
 });
-
-const keyAddDialog = ref<number>(0);
 const special = ref(false);
 const branchId = ref('');
 const agentPrice = ref<boolean>(false);
@@ -867,7 +865,6 @@ async function filterBySellerId() {
   <!-- NOTE: START - Quotation Form, Add Quotation -->
 
   <DialogForm
-    :key="keyAddDialog"
     :title="$t('general.add', { text: $t('quotation.title') })"
     v-model:modal="pageState.addModal"
     :submit-label="$t('general.add', { text: $t('quotation.title') })"
@@ -883,7 +880,7 @@ async function filterBySellerId() {
     :close="
       () => {
         branchId = '';
-        currentBranchRootId = '';
+        quotationFormData.customerBranchId = '';
       }
     "
     :beforeClose="
@@ -933,7 +930,7 @@ async function filterBySellerId() {
           v-model:agent-price="agentPrice"
           v-model:branch-id="branchId"
           v-model:special="special"
-          v-model:customer-branch-id="currentBranchRootId"
+          v-model:customer-branch-id="quotationFormData.customerBranchId"
           @add-customer="triggerSelectTypeCustomerd()"
         />
       </div>
@@ -1002,7 +999,6 @@ async function filterBySellerId() {
       () => {
         customerFormState.dialogModal = false;
         onCreateImageList = { selectedImage: '', list: [] };
-        keyAddDialog++;
       }
     "
   >
@@ -1194,7 +1190,7 @@ async function filterBySellerId() {
               customerFormData.customerBranch[0].legalPersonNo
             "
             v-model:business-type="
-              customerFormData.customerBranch[0].businessTypeId
+              customerFormData.customerBranch[0].businessType
             "
             v-model:job-position="
               customerFormData.customerBranch[0].jobPosition
@@ -1275,6 +1271,7 @@ async function filterBySellerId() {
                         res = await customerStore.createBranch({
                           ...customerFormData.customerBranch[idx],
                           customerId: customerFormState.editCustomerId || '',
+                          id: undefined,
                         });
                       }
                       if (res) {