davay-popozhe/P8-Panels
1
0
Fork 0
forked from CITKParus/P8-Panels
Code Issues Pull Requests Projects Releases Wiki Activity

Панель "Экономика проектов" - поддержан переход в разделы "Проекты" и "Договоры" в режиме "закладка"

Browse Source
This commit is contained in:
Mikhail Chechnev 2025-01-17 17:18:00 +03:00
parent 7683f1ad76
commit 252ef9e263
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/panels/prj_fin/layouts.js
View File

@ -257,6 +257,7 @@ export const rowExpandRender = ({
columnsDef,
row,
pOnlineShowDocument,
pOnlineShowUnit,
showStages,
showPayNotes,
showCostNotes,
@ -285,7 +286,7 @@ export const rowExpandRender = ({
<Button variant="outlined" onClick={() => showStages({ sender: row })}>
Этапы
</Button>
<Button variant="outlined" onClick={() => pOnlineShowDocument({ unitCode: "Projects", document: row.NRN })}>
<Button variant="outlined" onClick={() => pOnlineShowDocument({ unitCode: "Projects", document: row.NRN, modal: false })}>
К проекту
</Button>
</>
@ -297,14 +298,26 @@ export const rowExpandRender = ({
<Button variant="outlined" onClick={() => showContracts({ sender: row })}>
Сисполнители
</Button>
<Button variant="outlined" onClick={() => pOnlineShowDocument({ unitCode: "ProjectsStages", document: row.NRN })}>
<Button
variant="outlined"
onClick={() =>
pOnlineShowUnit({
unitCode: "Projects",
inputParameters: [
{ name: "in_RN", value: row.NPROJECT },
{ name: "in_STAGE_RN", value: row.NRN }
],
modal: false
})
}
>
К этапу
</Button>
</>
) : panelUnit === PANEL_UNITS.PROJECT_STAGE_CONTRACTS ? (
<Button
variant="outlined"
onClick={() => pOnlineShowDocument({ unitCode: row.SLNK_UNIT_SDOC_PREF, document: row.NLNK_DOCUMENT_SDOC_PREF })}
onClick={() => pOnlineShowDocument({ unitCode: row.SLNK_UNIT_SDOC_PREF, document: row.NLNK_DOCUMENT_SDOC_PREF, modal: false })}
>
К договору
</Button>

1
app/panels/prj_fin/stages.js
View File

@ -196,6 +196,7 @@ const Stages = ({ project, projectName, filters }) => {
...prms,
panelUnit: PANEL_UNITS.PROJECT_STAGES,
pOnlineShowDocument,
pOnlineShowUnit,
showStageArts,
showContracts,
showPayNotes,

13
db/PKG_P8PANELS_PROJECTS.pck
View File

@ -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;