diff --git a/src/i18n/eng.ts b/src/i18n/eng.ts index 6146106a..10188913 100644 --- a/src/i18n/eng.ts +++ b/src/i18n/eng.ts @@ -898,6 +898,8 @@ export default { caption: 'All Request List', quotationCode: 'Quotation Code', requestListCode: 'Request List Code', + + referenceNo: 'Reference No.', invoiceCode: 'Invoice Code', receiptCode: 'Receipt Code', alienIdCard: 'Alien Identification Card"', diff --git a/src/i18n/tha.ts b/src/i18n/tha.ts index 0cd09c4a..01b8b16d 100644 --- a/src/i18n/tha.ts +++ b/src/i18n/tha.ts @@ -889,6 +889,7 @@ export default { caption: 'ใบรายการคำขอทั้งหมด', quotationCode: 'เลขที่ใบเสนอราคา', requestListCode: 'เลขที่ใบรายการคำขอ', + referenceNo: 'เลขที่ใบอ้างอิง', invoiceCode: 'เลขที่ใบแจ้งหนี้', receiptCode: 'เลขที่ใบเสร็จ/กำกับภาษี', alienIdCard: 'บัตรประจำตัวต่างด้าว', diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue index 574e8244..116ae387 100644 --- a/src/pages/08_request-list/RequestListView.vue +++ b/src/pages/08_request-list/RequestListView.vue @@ -314,7 +314,7 @@ function goToQuotation( customerBranchId: quotation.customerBranchId, agentPrice: quotation.agentPrice, statusDialog: 'info', - quotationId: quotation.id, + quotationId: opt && opt.id ? opt.id : quotation.id, }), ); @@ -565,6 +565,21 @@ function goToDebitNote(opt?: { tab?: string; id?: string }) { : goToQuotation(data.quotation, { tab: 'receipt' }) " /> + + +
diff --git a/src/stores/request-list/types.ts b/src/stores/request-list/types.ts index bca8637d..124a8c99 100644 --- a/src/stores/request-list/types.ts +++ b/src/stores/request-list/types.ts @@ -9,7 +9,12 @@ export type RequestData = { createdAt: string; updatedAt: string; - quotation: QuotationFull & { isDebitNote: boolean }; + quotation: QuotationFull & { + debitNoteQuotationId: string; + isDebitNote: boolean; + debitNoteQuotation: { code: string }; + }; + quotationId: string; flow: Record;