From cd4649bb96e5e32b04d97cc3a9ec8881fe0e2d91 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Wed, 24 Apr 2024 13:04:18 +0300 Subject: [PATCH] =?UTF-8?q?WEB=20APP:=20=D0=A6=D0=98=D0=A2=D0=9A-801=20-?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=20=D1=88=D1=82=D0=B0=D1=82=D0=BD=D1=8B?= =?UTF-8?q?=D1=85=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=BA=20=D1=80=D0=B5=D0=BB=D0=B8=D0=B7=D1=83=20"=D0=BC=D0=B0?= =?UTF-8?q?=D1=80=D1=82=202024"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/panels/prj_fin/projects.js | 6 +++--- app/panels/prj_fin/stage_arts.js | 2 +- app/panels/prj_fin/stage_contracts.js | 4 ++-- app/panels/prj_fin/stages.js | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/panels/prj_fin/projects.js b/app/panels/prj_fin/projects.js index ba4c6fb..9855e07 100644 --- a/app/panels/prj_fin/projects.js +++ b/app/panels/prj_fin/projects.js @@ -144,12 +144,12 @@ const Projects = () => { }; //Отображение детализации точки графика затрат - const showCostNotesChartDetail = async ({ unitCode, year, month }) => { + const showCostNotesChartDetail = async ({ year, month }) => { const data = await executeStored({ stored: "PKG_P8PANELS_PROJECTS.CHART_FCCOSTNOTES_SELECT_COST", args: { NYEAR: year, NMONTH: month } }); - if (data.NIDENT) pOnlineShowUnit({ unitCode, inputParameters: [{ name: "in_SelectList_Ident", value: data.NIDENT }] }); + if (data.NIDENT) pOnlineShowUnit({ unitCode: "CostNotes", inputParameters: [{ name: "in_IDENT", value: data.NIDENT }] }); else showMsgErr(TEXTS.NO_DATA_FOUND); }; @@ -178,7 +178,7 @@ const Projects = () => { pageNumber: 1, reload: true })); - if (item.SUNITCODE && item.NYEAR && item.NMONTH) showCostNotesChartDetail({ unitCode: item.SUNITCODE, year: item.NYEAR, month: item.NMONTH }); + if (item.SUNITCODE == "CostNotes" && item.NYEAR && item.NMONTH) showCostNotesChartDetail({ year: item.NYEAR, month: item.NMONTH }); }; //При необходимости обновить данные diff --git a/app/panels/prj_fin/stage_arts.js b/app/panels/prj_fin/stage_arts.js index 37103c3..ca9d06b 100644 --- a/app/panels/prj_fin/stage_arts.js +++ b/app/panels/prj_fin/stage_arts.js @@ -71,7 +71,7 @@ const StageArts = ({ stage, filters }) => { stored: "PKG_P8PANELS_PROJECTS.STAGE_ARTS_SELECT_COST_FACT", args: { NSTAGE: stage, NFPDARTCL: sender.NRN } }); - if (data.NIDENT) pOnlineShowUnit({ unitCode: "CostNotes", inputParameters: [{ name: "in_SelectList_Ident", value: data.NIDENT }] }); + if (data.NIDENT) pOnlineShowUnit({ unitCode: "CostNotes", inputParameters: [{ name: "in_IDENT", value: data.NIDENT }] }); else showMsgErr(TEXTS.NO_DATA_FOUND); }; diff --git a/app/panels/prj_fin/stage_contracts.js b/app/panels/prj_fin/stage_contracts.js index c3395e6..dddc3fb 100644 --- a/app/panels/prj_fin/stage_contracts.js +++ b/app/panels/prj_fin/stage_contracts.js @@ -92,7 +92,7 @@ const StageContracts = ({ stage, filters }) => { stored: "PKG_P8PANELS_PROJECTS.STAGE_CONTRACTS_SELECT_PAY_IN", args: { NPROJECTSTAGEPF: sender.NRN } }); - if (data.NIDENT) pOnlineShowUnit({ unitCode: "PaymentAccountsIn", inputParameters: [{ name: "in_SelectList_Ident", value: data.NIDENT }] }); + if (data.NIDENT) pOnlineShowUnit({ unitCode: "PaymentAccountsIn", inputParameters: [{ name: "in_IDENT", value: data.NIDENT }] }); else showMsgErr(TEXTS.NO_DATA_FOUND); }; @@ -112,7 +112,7 @@ const StageContracts = ({ stage, filters }) => { stored: "PKG_P8PANELS_PROJECTS.STAGE_CONTRACTS_SELECT_ININV", args: { NPROJECTSTAGEPF: sender.NRN } }); - if (data.NIDENT) pOnlineShowUnit({ unitCode: "IncomingInvoices", inputParameters: [{ name: "in_SelectList_Ident", value: data.NIDENT }] }); + if (data.NIDENT) pOnlineShowUnit({ unitCode: "IncomingInvoices", inputParameters: [{ name: "in_IDENT", value: data.NIDENT }] }); else showMsgErr(TEXTS.NO_DATA_FOUND); }; diff --git a/app/panels/prj_fin/stages.js b/app/panels/prj_fin/stages.js index 32b836e..9fec2da 100644 --- a/app/panels/prj_fin/stages.js +++ b/app/panels/prj_fin/stages.js @@ -106,7 +106,7 @@ const Stages = ({ project, projectName, filters }) => { stored: "PKG_P8PANELS_PROJECTS.STAGES_SELECT_COST_FACT", args: { NRN: sender.NRN } }); - if (data.NIDENT) pOnlineShowUnit({ unitCode: "CostNotes", inputParameters: [{ name: "in_SelectList_Ident", value: data.NIDENT }] }); + if (data.NIDENT) pOnlineShowUnit({ unitCode: "CostNotes", inputParameters: [{ name: "in_IDENT", value: data.NIDENT }] }); else showMsgErr(TEXTS.NO_DATA_FOUND); }; @@ -116,8 +116,7 @@ const Stages = ({ project, projectName, filters }) => { stored: "PKG_P8PANELS_PROJECTS.STAGES_SELECT_SUMM_REALIZ", args: { NRN: sender.NRN } }); - if (data.NIDENT) - pOnlineShowUnit({ unitCode: "GoodsTransInvoicesToConsumers", inputParameters: [{ name: "in_SelectList_Ident", value: data.NIDENT }] }); + if (data.NIDENT) pOnlineShowUnit({ unitCode: "GoodsTransInvoicesToConsumers", inputParameters: [{ name: "in_IDENT", value: data.NIDENT }] }); else showMsgErr(TEXTS.NO_DATA_FOUND); };