From f049cb79a1a9a3b53e308df113b3e94158fd5d18 Mon Sep 17 00:00:00 2001
From: davay-popozhe <davay.popozhe@yandex.ru>
Date: Fri, 12 Jul 2024 18:41:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-823=20=D0=BE=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=82=2010.?=
 =?UTF-8?q?07.24=20=D1=871?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/panels/rrp_conf_editor/iud_form_dialog.js |  6 ++++--
 app/panels/rrp_conf_editor/layouts.js         |  5 +----
 app/panels/rrp_conf_editor/rrp_conf_editor.js | 21 +++++++++++++------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/panels/rrp_conf_editor/iud_form_dialog.js b/app/panels/rrp_conf_editor/iud_form_dialog.js
index 5c734f3..a9252c2 100644
--- a/app/panels/rrp_conf_editor/iud_form_dialog.js
+++ b/app/panels/rrp_conf_editor/iud_form_dialog.js
@@ -13,7 +13,6 @@ import { Dialog, DialogTitle, IconButton, Icon, DialogContent, Typography, Dialo
 import { ApplicationСtx } from "../../context/application"; //Контекст приложения
 import { BackEndСtx } from "../../context/backend"; //Контекст взаимодействия с сервером
 import { IUDFormTextField } from "./iud_form_text_field"; //Компонент поля ввода
-import { STATUSES } from "./layouts"; //Статусы и стили диалогового окна
 
 //---------
 //Константы
@@ -30,6 +29,9 @@ const STYLES = {
     PADDING_DIALOG_BUTTONS_RIGHT: { paddingRight: "32px" }
 };
 
+//Статусы диалогового окна
+export const STATUSES = { CREATE: 0, EDIT: 1, DELETE: 2, RRPCONFSCTNMRK_CREATE: 3, RRPCONFSCTNMRK_EDIT: 4, RRPCONFSCTNMRK_DELETE: 5 };
+
 //---------------
 //Тело компонента
 //---------------
@@ -178,7 +180,7 @@ const IUDFormDialog = ({ initial, onClose, onReload }) => {
 
     //Отрисовка диалогового окна
     const renderSwitch = () => {
-        var btnText = "";
+        let btnText = "";
         switch (formData.status) {
             case STATUSES.CREATE:
             case STATUSES.RRPCONFSCTNMRK_CREATE:
diff --git a/app/panels/rrp_conf_editor/layouts.js b/app/panels/rrp_conf_editor/layouts.js
index 4b25d30..d6bdc5b 100644
--- a/app/panels/rrp_conf_editor/layouts.js
+++ b/app/panels/rrp_conf_editor/layouts.js
@@ -17,12 +17,9 @@ import { Box, IconButton, Icon, Link } from "@mui/material"; //Интерфей
 //Стили
 export const STYLES = {
     BOX_ROW: { display: "flex", justifyContent: "center", alignItems: "center" },
-    LINK_STYLE: { component: "button", width: "-webkit-fill-available" }
+    LINK_STYLE: { component: "button", cursor: "pointer", width: "-webkit-fill-available" }
 };
 
-//Статусы диалогового окна
-export const STATUSES = { CREATE: 0, EDIT: 1, DELETE: 2, RRPCONFSCTNMRK_CREATE: 3, RRPCONFSCTNMRK_EDIT: 4, RRPCONFSCTNMRK_DELETE: 5 };
-
 //-----------
 //Тело модуля
 //-----------
diff --git a/app/panels/rrp_conf_editor/rrp_conf_editor.js b/app/panels/rrp_conf_editor/rrp_conf_editor.js
index 80ebec0..c572ffa 100644
--- a/app/panels/rrp_conf_editor/rrp_conf_editor.js
+++ b/app/panels/rrp_conf_editor/rrp_conf_editor.js
@@ -17,7 +17,8 @@ import { NavigationCtx } from "../../context/navigation"; //Контекст н
 import { MessagingСtx } from "../../context/messaging"; //Контекст сообщений
 import { SectionTabPanel } from "./section_tab_panel"; //Компонент вкладки раздела
 import { IUDFormDialog } from "./iud_form_dialog"; //Диалог добавления/исправления/удаления компонентов настройки регламентированного отчёта
-import { STATUSES, dataCellRender } from "./layouts"; //Дополнительная разметка и вёрстка клиентских элементов
+import { dataCellRender } from "./layouts"; //Дополнительная разметка и вёрстка клиентских элементов
+import { STATUSES } from "./iud_form_dialog"; //Статусы диалогового окна
 import { TEXTS } from "../../../app.text"; //Текстовые константы
 import { STYLES as COMMON_STYLES } from "./layouts"; //Общие стили
 
@@ -178,7 +179,7 @@ const RrpConfEditor = () => {
             //Переменная номера раздела с фокусом
             let tabFocus = 0;
             const data = await executeStored({
-                stored: "PKG_P8PANELS_RRPCONFED.GET_RRPCONF_SECTIONS",
+                stored: "PKG_P8PANELS_RRPCONFED.RRPCONF_GET_SECTIONS",
                 args: {
                     NRN_RRPCONF: Number(getNavigationSearch().NRN)
                 },
@@ -254,13 +255,21 @@ const RrpConfEditor = () => {
     //Отбор показателя раздела по ид.
     const showRrpConfSctnMrk = async rn => {
         const data = await executeStored({
-            stored: "PKG_P8PANELS_RRPCONFED.SELECT_RRPCONFSCTNMRK",
+            stored: "PKG_P8PANELS_RRPCONFED.RRPCONFSCTNMRK_GET_CODES",
             args: {
                 NRN: rn
             }
         });
-        if (data.NIDENT) {
-            pOnlineShowUnit({ unitCode: "RRPConfigSectionMark", inputParameters: [{ name: "in_SelectList_Ident", value: data.NIDENT }] });
+        if (data) {
+            pOnlineShowUnit({
+                unitCode: "RRPConfig",
+                showMethod: "main_mrk_settings",
+                inputParameters: [
+                    { name: "in_CODE", value: data.SRRPCONF },
+                    { name: "in_SCTN_CODE", value: data.SRRPCONFSCTN },
+                    { name: "in_MRK_CODE", value: data.SRRPCONFSCTNMRK }
+                ]
+            });
         } else showMsgErr(TEXTS.NO_DATA_FOUND);
     };
 
@@ -324,7 +333,7 @@ const RrpConfEditor = () => {
                                     <Box sx={{ ...STYLES.TABS_PADDING, ...COMMON_STYLES.BOX_ROW }}>
                                         <P8PDataGrid
                                             {...P8P_DATA_GRID_CONFIG_PROPS}
-                                            containerComponentProps={{ elevation: 6 }}
+                                            containerComponentProps={{ elevation: 6, style: { width: window.innerWidth * 0.95 } }}
                                             columnsDef={s.columnsDef}
                                             groups={s.groups}
                                             rows={s.rows}