From 1efa90816a304560ea6900976195dc9dcb729407 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Mon, 19 May 2025 16:00:21 +0700 Subject: [PATCH 1/4] fix: form not clear --- src/pages/03_customer-management/form.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts index 2d529a5c..6ce28a18 100644 --- a/src/pages/03_customer-management/form.ts +++ b/src/pages/03_customer-management/form.ts @@ -965,6 +965,7 @@ export const useEmployeeForm = defineStore('form-employee', () => { resetEmployeeData = structuredClone(defaultFormData); state.value.statusSavePersonal = false; state.value.profileUrl = ''; + state.value.currentBranchId = ''; } else { resetEmployeeData.selectedImage = currentFromDataEmployee.value.selectedImage; From 0150f80ba2963c82bc07bd1409c389c1ca852f8b Mon Sep 17 00:00:00 2001 From: puriphatt Date: Tue, 20 May 2025 11:43:07 +0700 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20update=20label=20from=20'=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=99=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2?= =?UTF-8?q?'=20to=20'Prefix'=20in=20forms=20(english)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/02_personnel-management/FormPerson.vue | 2 +- .../components/employer/EmployerFormAbout.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue index 7335391d..6d8601a6 100644 --- a/src/components/02_personnel-management/FormPerson.vue +++ b/src/components/02_personnel-management/FormPerson.vue @@ -165,7 +165,7 @@ watch( :id="`${prefixId}-select-prefix-name-en`" :for="`${prefixId}-select-prefix-name-en`" :rules="[(val: string) => !!val || $t('form.error.required')]" - :label="$t('personnel.form.prefixName')" + label="Prefix" class="col-md-1 col-6" v-model="prefixName" /> diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue index eb131ea9..432228b1 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue @@ -393,7 +393,7 @@ watch( :readonly="readonly" :disable="!readonly" class="col-md-2 col-6" - label="Title" + label="Prefix" :model-value=" readonly ? capitalize(prefixName || '') || '-' From cd86e7718a066f125b3741b984ede27701a99361 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 22 May 2025 11:52:24 +0700 Subject: [PATCH 3/4] fix: id --- src/pages/04_flow-managment/MainPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/04_flow-managment/MainPage.vue b/src/pages/04_flow-managment/MainPage.vue index f8d45b37..cf17d51a 100644 --- a/src/pages/04_flow-managment/MainPage.vue +++ b/src/pages/04_flow-managment/MainPage.vue @@ -763,7 +763,7 @@ watch( " /> import { nextTick, onMounted, ref, watch } from 'vue'; import { DeleteButton, EditButton, SaveButton, UndoButton } from '../button'; -import { scrollToElement } from 'stores/utils'; // import { useI18n } from 'vue-i18n'; // import { storeToRefs } from 'pinia'; @@ -138,11 +137,8 @@ watch( @click=" () => { assignClone(); - if (nameList[nameList.length - 1].name === '') { - $emit('delete', cloneList[cloneList.length - 1].id, true); - cloneList = cloneList.filter((item) => item.name !== ''); - nameList = nameList.filter((item) => item.name !== ''); - } + cloneList = cloneList.filter((item) => item.name !== ''); + nameList = nameList.filter((item) => item.name !== ''); } " /> diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue index 88d6746c..47570c55 100644 --- a/src/pages/04_product-service/MainPage.vue +++ b/src/pages/04_product-service/MainPage.vue @@ -60,6 +60,7 @@ import { ServiceById, WorkItems, Attributes, + WorkCreate, } from 'stores/product-service/types'; import { computed } from 'vue'; import { @@ -1448,17 +1449,11 @@ function confirmDeleteWork(id: string, noDialog?: boolean) { } } -function triggerConfirmCloseWork() { +function triggerConfirmCloseWorkName() { dialogWarningClose(t, { message: t('dialog.message.warningClose'), action: () => { manageWorkNameDialog.value = false; - if (workNameItems.value[workNameItems.value.length - 1].name === '') { - confirmDeleteWork( - workNameItems.value[workNameItems.value.length - 1].id, - true, - ); - } }, cancel: () => {}, }); @@ -1888,6 +1883,20 @@ async function copy(id: string) { dialogService.value = true; } +function addWorkName(data: { name: string; order: number }) { + workNameItems.value.push({ id: '', name: data.name, isEdit: true }); +} + +async function submitWorkName( + workId: string, + data: Partial, +) { + if (workNameItems.value.length === 0) return; + + if (!workId) await createWork({ ...data, order: 1 }); + else await editWork(workId, data); +} + watch( () => formService.value.attributes.workflowId, async (a, b) => { @@ -4669,7 +4678,7 @@ watch( ? workNameRef.isWorkNameEdit() : false; if (isWorkNameEdit) { - triggerConfirmCloseWork(); + triggerConfirmCloseWorkName(); return true; } return false; @@ -4681,8 +4690,8 @@ watch( ref="workNameRef" v-model:name-list="workNameItems" @delete="confirmDeleteWork" - @edit="editWork" - @add="createWork" + @edit="submitWorkName" + @add="addWorkName" /> diff --git a/src/stores/product-service/index.ts b/src/stores/product-service/index.ts index 0405bf16..80e32627 100644 --- a/src/stores/product-service/index.ts +++ b/src/stores/product-service/index.ts @@ -441,7 +441,7 @@ const useProductServiceStore = defineStore('api-product-service', () => { ...payload, }); - if (res && res.status < 200) { + if (res && res.status < 400) { await fetchListOfWork(); return res.data; }