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