From 252ef9e2635291f25c7e421d88d460346201b518 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Fri, 17 Jan 2025 17:18:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=20"=D0=AD?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=BE=D0=BC=D0=B8=D0=BA=D0=B0=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=BE=D0=B2"=20-=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B6=D0=B0=D0=BD=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D1=85=D0=BE=D0=B4=20=D0=B2=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D1=8B=20"=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D1=8B"=20?= =?UTF-8?q?=D0=B8=20"=D0=94=D0=BE=D0=B3=D0=BE=D0=B2=D0=BE=D1=80=D1=8B"=20?= =?UTF-8?q?=D0=B2=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B5=20"=D0=B7=D0=B0?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/panels/prj_fin/layouts.js | 19 ++++++++++++++++--- app/panels/prj_fin/stages.js | 1 + db/PKG_P8PANELS_PROJECTS.pck | 13 ++++++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/panels/prj_fin/layouts.js b/app/panels/prj_fin/layouts.js index 871cf9c..d3488d7 100644 --- a/app/panels/prj_fin/layouts.js +++ b/app/panels/prj_fin/layouts.js @@ -257,6 +257,7 @@ export const rowExpandRender = ({ columnsDef, row, pOnlineShowDocument, + pOnlineShowUnit, showStages, showPayNotes, showCostNotes, @@ -285,7 +286,7 @@ export const rowExpandRender = ({ - @@ -297,14 +298,26 @@ export const rowExpandRender = ({ - ) : panelUnit === PANEL_UNITS.PROJECT_STAGE_CONTRACTS ? ( diff --git a/app/panels/prj_fin/stages.js b/app/panels/prj_fin/stages.js index e1d166f..2f5969d 100644 --- a/app/panels/prj_fin/stages.js +++ b/app/panels/prj_fin/stages.js @@ -196,6 +196,7 @@ const Stages = ({ project, projectName, filters }) => { ...prms, panelUnit: PANEL_UNITS.PROJECT_STAGES, pOnlineShowDocument, + pOnlineShowUnit, showStageArts, showContracts, showPayNotes, diff --git a/db/PKG_P8PANELS_PROJECTS.pck b/db/PKG_P8PANELS_PROJECTS.pck index 9d5d5c9..424a7b0 100644 --- a/db/PKG_P8PANELS_PROJECTS.pck +++ b/db/PKG_P8PANELS_PROJECTS.pck @@ -2823,6 +2823,11 @@ create or replace package body PKG_P8PANELS_PROJECTS as SCOND_TO => 'EDCOST_READYTo', BORDER => true, BFILTER => true); + PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, + SNAME => 'NPROJECT', + SCAPTION => 'Рег. номер проекта', + SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + BVISIBLE => false); /* Обходим данные */ begin /* Добавляем подсказку совместимости */ @@ -2860,7 +2865,8 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => PKG_SQL_BUILD.WRAP_NUM(NVALUE => 1) || ' NLNK_DOCUMENT_NSUMM_REALIZ,'); PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => PKG_SQL_BUILD.PKG_NAME(SNAME => 'PKG_P8PANELS_PROJECTS.STAGES_GET_CTRL_COST') || '(PS.RN) NCTRL_COST,'); PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => PKG_SQL_BUILD.PKG_NAME(SNAME => 'PKG_P8PANELS_PROJECTS.STAGES_GET_CTRL_ACT') || '(PS.RN) NCTRL_ACT,'); - PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => PKG_SQL_BUILD.PKG_NAME(SNAME => 'PKG_P8PANELS_PROJECTS.STAGES_GET_COST_READY') || '(PS.RN) NCOST_READY'); + PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => PKG_SQL_BUILD.PKG_NAME(SNAME => 'PKG_P8PANELS_PROJECTS.STAGES_GET_COST_READY') || '(PS.RN) NCOST_READY,'); + PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => ' PS.PRN NPROJECT'); PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => ' from PROJECTSTAGE PS'); PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => ' left outer join FACEACC FAC on PS.FACEACC = FAC.RN,'); PKG_SQL_BUILD.APPEND(SSQL => CSQL, SELEMENT1 => ' PROJECT P,'); @@ -2924,6 +2930,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_SQL_DML.DEFINE_COLUMN_NUM(ICURSOR => ICURSOR, IPOSITION => 29); PKG_SQL_DML.DEFINE_COLUMN_NUM(ICURSOR => ICURSOR, IPOSITION => 30); PKG_SQL_DML.DEFINE_COLUMN_NUM(ICURSOR => ICURSOR, IPOSITION => 31); + PKG_SQL_DML.DEFINE_COLUMN_NUM(ICURSOR => ICURSOR, IPOSITION => 32); /* Делаем выборку */ if (PKG_SQL_DML.EXECUTE(ICURSOR => ICURSOR) = 0) then null; @@ -3052,6 +3059,10 @@ create or replace package body PKG_P8PANELS_PROJECTS as SNAME => 'NCOST_READY', ICURSOR => ICURSOR, NPOSITION => 30); + PKG_P8PANELS_VISUAL.TDG_ROW_ADD_CUR_COLN(RROW => RDG_ROW, + SNAME => 'NPROJECT', + ICURSOR => ICURSOR, + NPOSITION => 31); /* Добавляем строку в таблицу */ PKG_P8PANELS_VISUAL.TDG_ADD_ROW(RDATA_GRID => RDG, RROW => RDG_ROW); end loop;