From b20d6b26a98489c385ce1e6a67b6b009c17bae33 Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 30 Jul 2024 15:35:39 +0700 Subject: [PATCH] fix: Anggaran Biaya <-> Nilai Kontrak --- src/views/SimproV2/CreatedProyek/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js index 3eeae26..1dfed29 100644 --- a/src/views/SimproV2/CreatedProyek/index.js +++ b/src/views/SimproV2/CreatedProyek/index.js @@ -671,8 +671,8 @@ const CreatedProyek = ({ params, ...props }) => { .catch((error) => error.response); if (result && result.data && result.data.code == 200) { - const { value_proyek, area_kerja, scoupe_of_work, kode_sortname, nama, mulai_proyek, rencana_biaya, keterangan, durasi_proyek, project_objectives, potential_risk, currency_symbol, nama_divisi, late_consequence, assumtion, considered_success_when } = result.data.data; - const dataToSend = { value_proyek, area_kerja, scoupe_of_work, kode_sortname, nama, mulai_proyek, rencana_biaya, keterangan, durasi_proyek, project_objectives, potential_risk, currency_symbol, nama_divisi, late_consequence, assumtion, considered_success_when }; + const { value_proyek, area_kerja, scoupe_of_work, kode_sortname, nama, mulai_proyek, rencana_biaya, keterangan, durasi_proyek, project_objectives, potential_risk, currency_symbol, nama_divisi, late_consequence, assumtion, considered_success_when, income_year } = result.data.data; + const dataToSend = { value_proyek, area_kerja, scoupe_of_work, kode_sortname, nama, mulai_proyek, rencana_biaya, keterangan, durasi_proyek, project_objectives, potential_risk, currency_symbol, nama_divisi, late_consequence, assumtion, considered_success_when, income_year }; setProjectCharter(dataToSend); } else { NotificationManager.error("Gagal Mengambil Data!!", "Failed"); @@ -1476,11 +1476,11 @@ const CreatedProyek = ({ params, ...props }) => { const data = resData.map((elt) => [ elt.nama, `Rp. ${formatThousand(elt.rencana_biaya)}`, + `Rp. ${formatThousand(elt.income_year)}`, + `Rp. ${formatThousand(elt.value_proyek)}`, elt.join_second_name, elt.join_first_name, - `${moment(elt.mulai_proyek).format(format)} - ${moment( - elt.akhir_proyek - ).format(format)}`, + `${moment(elt.mulai_proyek).format(format)} - ${moment(elt.akhir_proyek).format(format)}`, ]); // Or use javascript directly: doc.text(4, 15, "Project Charter"); @@ -1741,7 +1741,7 @@ const CreatedProyek = ({ params, ...props }) => { }, }, { - title: "Nilai Kontrak", dataIndex: "value_proyek", + title: "Anggaran Biaya", dataIndex: "value_proyek", key: "value_proyek", render: (text, record) => { const valueProyek = text ?? '-'; @@ -1751,7 +1751,7 @@ const CreatedProyek = ({ params, ...props }) => { }, }, { - title: "Anggaran Biaya", + title: "Nilai Kontrak", dataIndex: "rencana_biaya", key: "rencana_biaya", render: (text, record) => {