diff --git a/src/components/DialogDuplicateData.vue b/src/components/DialogDuplicateData.vue index 6153287e..e46bd787 100644 --- a/src/components/DialogDuplicateData.vue +++ b/src/components/DialogDuplicateData.vue @@ -6,8 +6,8 @@ import { ref } from 'vue'; const props = defineProps<{ action: (...args: unknown[]) => void; checkData: (...args: unknown[]) => { - oldData: { filName: string; value: string }[]; - newData: { filName: string; value: string }[]; + oldData: { nameField: string; value: string }[]; + newData: { nameField: string; value: string }[]; }; cancel?: (...args: unknown[]) => void; }>(); @@ -81,7 +81,7 @@ onMounted(() => {
- {{ v.filName }} + {{ v.nameField }} : {{ v.value }}
@@ -118,7 +118,7 @@ onMounted(() => {
- {{ v.filName }} + {{ v.nameField }} : {{ v.value }}
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index f7c5f00a..e3fa8dcc 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -2665,8 +2665,8 @@ const emptyCreateDialog = ref(false); if (group === 'passport') { const fullName = allMeta['full_name'].split(' '); let tempValue: { - oldData: { filName: string; value: string }[]; - newData: { filName: string; value: string }[]; + oldData: { nameField: string; value: string }[]; + newData: { nameField: string; value: string }[]; } = { oldData: [], newData: [] }; if ( @@ -2674,46 +2674,46 @@ const emptyCreateDialog = ref(false); currentFromDataEmployee.gender !== allMeta['sex'] ) { tempValue.oldData.push({ - filName: $t('form.gender'), + nameField: $t('form.gender'), value: $t( `general.${currentFromDataEmployee.gender}`, ), }); tempValue.newData.push({ - filName: $t('form.gender'), + nameField: $t('form.gender'), value: $t(`general.${allMeta['sex']}`), }); } if (currentFromDataEmployee.firstName !== '') { tempValue.oldData.push({ - filName: $t('personnel.form.firstName'), + nameField: $t('personnel.form.firstName'), value: currentFromDataEmployee.firstName, }); tempValue.newData.push({ - filName: $t('personnel.form.firstName'), + nameField: $t('personnel.form.firstName'), value: fullName[0], }); } if (currentFromDataEmployee.lastName !== '') { tempValue.oldData.push({ - filName: $t('personnel.form.lastName'), + nameField: $t('personnel.form.lastName'), value: currentFromDataEmployee.lastName, }); tempValue.newData.push({ - filName: $t('personnel.form.lastName'), + nameField: $t('personnel.form.lastName'), value: fullName[1], }); } if (currentFromDataEmployee.nationality !== '') { tempValue.oldData.push({ - filName: $t('general.nationality'), + nameField: $t('general.nationality'), value: currentFromDataEmployee.nationality || '', }); tempValue.newData.push({ - filName: $t('general.nationality'), + nameField: $t('general.nationality'), value: allMeta['nationality'], }); } @@ -4198,8 +4198,8 @@ const emptyCreateDialog = ref(false); if (group === 'passport') { const fullName = allMeta['full_name'].split(' '); let tempValue: { - oldData: { filName: string; value: string }[]; - newData: { filName: string; value: string }[]; + oldData: { nameField: string; value: string }[]; + newData: { nameField: string; value: string }[]; } = { oldData: [], newData: [] }; if ( @@ -4207,46 +4207,46 @@ const emptyCreateDialog = ref(false); currentFromDataEmployee.gender !== allMeta['sex'] ) { tempValue.oldData.push({ - filName: $t('form.gender'), + nameField: $t('form.gender'), value: $t( `general.${currentFromDataEmployee.gender}`, ), }); tempValue.newData.push({ - filName: $t('form.gender'), + nameField: $t('form.gender'), value: $t(`general.${allMeta['sex']}`), }); } if (currentFromDataEmployee.firstName !== '') { tempValue.oldData.push({ - filName: $t('personnel.form.firstName'), + nameField: $t('personnel.form.firstName'), value: currentFromDataEmployee.firstName, }); tempValue.newData.push({ - filName: $t('personnel.form.firstName'), + nameField: $t('personnel.form.firstName'), value: fullName[0], }); } if (currentFromDataEmployee.lastName !== '') { tempValue.oldData.push({ - filName: $t('personnel.form.lastName'), + nameField: $t('personnel.form.lastName'), value: currentFromDataEmployee.lastName, }); tempValue.newData.push({ - filName: $t('personnel.form.lastName'), + nameField: $t('personnel.form.lastName'), value: fullName[1], }); } if (currentFromDataEmployee.nationality !== '') { tempValue.oldData.push({ - filName: $t('general.nationality'), + nameField: $t('general.nationality'), value: currentFromDataEmployee.nationality || '', }); tempValue.newData.push({ - filName: $t('general.nationality'), + nameField: $t('general.nationality'), value: allMeta['nationality'], }); } diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue index 25f50316..1da68cb8 100644 --- a/src/pages/05_quotation/QuotationForm.vue +++ b/src/pages/05_quotation/QuotationForm.vue @@ -1113,6 +1113,7 @@ function storeDataLocal() { + { - oldData: { filName: string; value: string }[]; - newData: { filName: string; value: string }[]; + oldData: { nameField: string; value: string }[]; + newData: { nameField: string; value: string }[]; }; action?: (...args: unknown[]) => unknown; cancel?: (...args: unknown[]) => unknown;