@@ -4385,7 +4357,6 @@ watch(
-import { onMounted, onUnmounted, reactive, ref, watch, computed } from 'vue';
+import { onMounted, reactive, ref, watch, computed } from 'vue';
import { storeToRefs } from 'pinia';
import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
@@ -275,10 +275,6 @@ const customerNameInfo = computed(() => {
return name || '-';
});
-function handleWindowFocus() {
- fetchQuotationList();
-}
-
onMounted(async () => {
pageState.gridView = $q.screen.lt.md ? true : false;
navigatorStore.current.title = 'quotation.title';
@@ -316,12 +312,6 @@ onMounted(async () => {
}
flowStore.rotate();
-
- window.addEventListener('focus', handleWindowFocus);
-});
-
-onUnmounted(() => {
- window.removeEventListener('focus', handleWindowFocus);
});
async function fetchQuotationList(mobileFetch?: boolean) {
@@ -777,13 +767,8 @@ async function filterBySellerId() {
:worker-count="item.row._count.worker"
:worker-max="item.row.workerMax || item.row._count.worker"
:customer-name="
- item.row.customerBranch.customer.customerType === 'CORP'
- ? $i18n.locale === 'tha'
- ? item.row.customerBranch.registerName
- : item.row.customerBranch.registerNameEN
- : $i18n.locale === 'tha'
- ? `${item.row.customerBranch.firstName || '-'} ${item.row.customerBranch.lastName || ''}`
- : `${item.row.customerBranch.firstNameEN || '-'} ${item.row.customerBranch.lastNameEN || ''}`
+ item.row.customerBranch.registerName ||
+ `${item.row.customerBranch.firstName || '-'} ${item.row.customerBranch.lastName || ''}`
"
:reporter="
$i18n.locale === 'eng'
diff --git a/src/pages/05_quotation/PaymentForm.vue b/src/pages/05_quotation/PaymentForm.vue
index cf3d7c63..2d5f1579 100644
--- a/src/pages/05_quotation/PaymentForm.vue
+++ b/src/pages/05_quotation/PaymentForm.vue
@@ -1,9 +1,16 @@
@@ -661,115 +640,95 @@ onMounted(async () => {
-
-
- {{ $t('quotation.receiptDialog.paymentMethod') }}
-
-
-
-
-
-
+
+ {{ $t('quotation.receiptDialog.paymentMethod') }}
+
+
();
-
const employeeStore = useEmployeeStore();
const route = useRoute();
const useReceiptStore = useReceipt();
@@ -115,6 +113,8 @@ const $q = useQuasar();
const openQuotation = ref(false);
const formMetadata = ref();
+const customerBranchOption = ref();
+
const rowsRequestList = ref([]);
const {
@@ -161,7 +161,49 @@ const selectedWorker = ref<
}[];
})[]
>([]);
-const selectedWorkerItem = ref([]);
+const selectedWorkerItem = computed(() => {
+ return [
+ ...selectedWorker.value.map((e) => ({
+ foreignRefNo: e.employeePassport
+ ? e.employeePassport[0]?.number || '-'
+ : '-',
+ employeeName:
+ locale.value === Lang.English
+ ? `${e.firstNameEN} ${e.lastNameEN}`
+ : e.firstName
+ ? `${e.firstName} ${e.lastName}`
+ : `${e.firstNameEN} ${e.lastNameEN}`,
+ birthDate: dateFormatJS({ date: e.dateOfBirth }),
+ gender: e.gender,
+ age: calculateAge(e.dateOfBirth),
+ nationality: optionStore.mapOption(e.nationality),
+ documentExpireDate:
+ e.employeePassport !== undefined &&
+ e.employeePassport[0]?.expireDate !== undefined
+ ? dateFormatJS({ date: e.employeePassport[0]?.expireDate })
+ : '-',
+ imgUrl: e.selectedImage
+ ? `${API_BASE_URL}/employee/${e.id}/image/${e.selectedImage}`
+ : '',
+ status: e.status,
+ })),
+
+ ...newWorkerList.value.map((v: any) => ({
+ foreignRefNo: v.passportNo,
+ employeeName:
+ locale.value === Lang.English
+ ? `${v.firstNameEN} ${v.lastNameEN}`
+ : `${v.firstName} ${v.lastName}`,
+ birthDate: dateFormatJS({ date: v.dateOfBirth }),
+ gender: v.gender,
+ age: calculateAge(v.dateOfBirth),
+ nationality: optionStore.mapOption(v.nationality),
+ documentExpireDate: '-',
+ imgUrl: '',
+ status: 'CREATED',
+ })),
+ ];
+});
const firstCodePayment = ref('');
const selectedProductGroup = ref('');
const selectedInstallmentNo = ref([]);
@@ -196,7 +238,7 @@ function getPrice(
) {
if (filterHook) list = list.filter(filterHook);
- const value = list.reduce(
+ return list.reduce(
(a, c) => {
if (
selectedInstallmentNo.value.length > 0 &&
@@ -236,8 +278,6 @@ function getPrice(
finalPrice: 0,
},
);
-
- return value;
}
const summaryPrice = computed(() => getPrice(productServiceList.value));
@@ -516,7 +556,7 @@ async function convertDataToFormSubmit() {
),
);
- selectedWorkerItem.value.forEach((v, i) => {
+ selectedWorker.value.forEach((v, i) => {
if (v.attachment !== undefined) {
v.attachment.forEach((value) => {
fileItemNewWorker.value.push({
@@ -533,7 +573,7 @@ async function convertDataToFormSubmit() {
quotationFormData.value.worker = JSON.parse(
JSON.stringify([
- ...selectedWorkerItem.value.map((v) => {
+ ...selectedWorker.value.map((v) => {
{
return v.id;
}
@@ -766,40 +806,7 @@ function toggleDeleteProduct(index: number) {
}
async function assignWorkerToSelectedWorker() {
- selectedWorkerItem.value = quotationFormData.value.worker.map((e) => {
- return {
- id: e.id,
- foreignRefNo: e.employeePassport
- ? e.employeePassport[0]?.number || '-'
- : '-',
- employeeName:
- locale.value === Lang.English
- ? `${e.firstNameEN} ${e.lastNameEN}`
- : `${e.firstName || e.firstNameEN} ${e.lastName || e.lastNameEN}`,
- birthDate: dateFormatJS({ date: e.dateOfBirth }),
- gender: e.gender,
- age: calculateAge(e.dateOfBirth),
- nationality: optionStore.mapOption(e.nationality),
- documentExpireDate:
- e.employeePassport !== undefined &&
- e.employeePassport[0]?.expireDate !== undefined
- ? dateFormatJS({ date: e.employeePassport[0]?.expireDate })
- : '-',
- imgUrl: e.selectedImage
- ? `${API_BASE_URL}/employee/${e.id}/image/${e.selectedImage}`
- : '',
- employeePassport: e.employeePassport,
- status: e.status,
- workerNew: false,
- lastNameEN: e.lastNameEN,
- lastName: e.lastName,
- middleNameEN: e.middleNameEN,
- middleName: e.middleName,
- firstNameEN: e.firstNameEN,
- firstName: e.firstName,
- namePrefix: e.namePrefix,
- };
- });
+ selectedWorker.value = quotationFormData.value.worker;
}
function convertToTable(nodes: Node[]) {
@@ -858,21 +865,21 @@ function convertToTable(nodes: Node[]) {
function convertEmployeeToTable(selected: Employee[]) {
productServiceList.value.forEach((v) => {
- if (selectedWorkerItem.value.length === 0 && v.amount === 1) v.amount -= 1;
+ if (selectedWorker.value.length === 0 && v.amount === 1) v.amount -= 1;
v.amount = Math.max(
- v.amount + selected.length - selectedWorkerItem.value.length,
+ v.amount + selected.length - selectedWorker.value.length,
1,
);
const oldWorkerId: string[] = [];
const newWorkerIndex: number[] = [];
- selectedWorkerItem.value.forEach((item, i) => {
+ selectedWorker.value.forEach((item, i) => {
if (v.workerIndex.includes(i)) oldWorkerId.push(item.id);
});
selected.forEach((item, i) => {
- if (selectedWorkerItem.value.find((n) => item.id === n.id)) return;
+ if (selectedWorker.value.find((n) => item.id === n.id)) return;
newWorkerIndex.push(i);
});
@@ -885,7 +892,7 @@ function convertEmployeeToTable(selected: Employee[]) {
pageState.employeeModal = false;
quotationFormData.value.workerMax = Math.max(
quotationFormData.value.workerMax || 1,
- selectedWorkerItem.value.length,
+ selectedWorker.value.length,
);
}
@@ -958,71 +965,6 @@ function viewProductFile(data: ProductRelation) {
pageState.imageDialogUrl = base64 ? base64[1] : '';
}
-function combineWorker(newWorker: any, oldWorker: any) {
- selectedWorkerItem.value = [
- ...oldWorker.map((e) => ({
- id: e.id,
- foreignRefNo: e.employeePassport
- ? e.employeePassport[0]?.number || '-'
- : '-',
- employeeName:
- locale.value === Lang.English
- ? `${e.firstNameEN} ${e.lastNameEN}`
- : `${e.firstName || e.firstNameEN} ${e.lastName || e.lastNameEN}`,
- birthDate: dateFormatJS({ date: e.dateOfBirth }),
- gender: e.gender,
- age: calculateAge(e.dateOfBirth),
- nationality: optionStore.mapOption(e.nationality),
- documentExpireDate:
- e.employeePassport !== undefined &&
- e.employeePassport[0]?.expireDate !== undefined
- ? dateFormatJS({ date: e.employeePassport[0]?.expireDate })
- : '-',
- imgUrl: e.selectedImage
- ? `${API_BASE_URL}/employee/${e.id}/image/${e.selectedImage}`
- : '',
-
- employeePassport: e.employeePassport,
- status: e.status,
- workerNew: false,
- lastNameEN: e.lastNameEN,
- lastName: e.lastName,
- middleNameEN: e.middleNameEN,
- middleName: e.middleName,
- firstNameEN: e.firstNameEN,
- firstName: e.firstName,
- namePrefix: e.namePrefix,
- })),
-
- ...newWorker.map((v: any) => ({
- id: v.id,
- foreignRefNo: v.passportNo || '-',
- employeeName:
- locale.value === Lang.English
- ? `${v.firstNameEN} ${v.lastNameEN}`
- : `${v.firstName || v.firstNameEN} ${v.lastName || v.lastNameEN}`,
- birthDate: dateFormatJS({ date: v.dateOfBirth }),
- gender: v.gender,
- age: calculateAge(v.dateOfBirth),
- nationality: optionStore.mapOption(v.nationality),
- documentExpireDate: '-',
- imgUrl: '',
- status: 'CREATED',
-
- lastNameEN: v.lastNameEN,
- lastName: v.lastName,
- middleNameEN: v.middleNameEN,
- middleName: v.middleName,
- firstNameEN: v.firstNameEN,
- firstName: v.firstName,
- namePrefix: v.namePrefix,
-
- dateOfBirth: v.dateOfBirth,
- workerNew: true,
- })),
- ];
-}
-
const sessionData = ref>();
onMounted(async () => {
@@ -1094,7 +1036,7 @@ watch(
() => quotationFormData.value.customerBranchId,
async (v) => {
if (!v) return;
- selectedWorkerItem.value = [];
+ selectedWorker.value = [];
},
);
@@ -1110,15 +1052,6 @@ watch(
const productServiceNodes = ref([]);
-watch(customerBranchOption, () => {
- if (!customerBranchOption.value) return;
-
- quotationFormData.value.contactName =
- customerBranchOption.value.contactName || '';
- quotationFormData.value.contactTel =
- customerBranchOption.value.contactTel || '';
-});
-
watch(
() => productServiceList.value,
() => {
@@ -1154,19 +1087,7 @@ watch(customerBranchOption, () => {
// }
function storeDataLocal() {
- const tempProductService = productService.value.map((v) => {
- return {
- ...v,
- vat: v.product[agentPrice ? 'agentPriceCalcVat' : 'calcVat']
- ? precisionRound(
- ((v.pricePerUnit * (1 + (config?.value.vat || 0.07)) * v.amount -
- v.discount) /
- (1 + (config?.value.vat || 0.07))) *
- 0.07,
- )
- : 0,
- };
- });
+ quotationFormData.value.productServiceList = productService.value;
localStorage.setItem(
'quotation-preview',
@@ -1175,7 +1096,7 @@ function storeDataLocal() {
codeInvoice: code.value,
codePayment: firstCodePayment.value,
...quotationFormData.value,
- productServiceList: tempProductService,
+ productServiceList: productService.value,
},
meta: {
source: {
@@ -1195,7 +1116,7 @@ function storeDataLocal() {
workName: quotationFormData.value.workName,
dueDate: quotationFormData.value.dueDate,
},
- selectedWorker: selectedWorkerItem.value,
+ selectedWorker: selectedWorker.value,
createdBy: quotationFormState.value.createdBy('tha'),
agentPrice: agentPrice.value,
},
@@ -1280,10 +1201,10 @@ async function getWorkerFromCriteria(
if (!ret) return false; // error, do not close dialog
const deduplicate = ret.result.filter(
- (a) => !selectedWorkerItem.value.find((b) => a.id === b.id),
+ (a) => !selectedWorker.value.find((b) => a.id === b.id),
);
- convertEmployeeToTable([...deduplicate, ...selectedWorkerItem.value]);
+ convertEmployeeToTable([...deduplicate, ...selectedWorker.value]);
return true;
}
@@ -1673,15 +1594,15 @@ function covertToNode() {
(v) =>
(quotationFormData.workerMax = Math.max(
v,
- selectedWorkerItem.length,
+ selectedWorker.length,
))
"
:employee-amount="
- quotationFormData.workerMax || selectedWorkerItem.length
+ quotationFormData.workerMax || selectedWorker.length
"
:readonly="readonly"
:rows="selectedWorkerItem"
- @delete="(i) => deleteItem(selectedWorkerItem, i)"
+ @delete="(i) => deleteItem(selectedWorker, i)"
/>