From 51b0dcc86404ef6717823e0dd85f5d1408240cea Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Fri, 29 May 2026 11:29:35 +0900
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=82=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B1=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=BD=D1=83,=20=D0=BF=D0=BE=D0=B4=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=BA=D0=B0=20=D1=81=20=D0=BF=D0=BE=D0=B4?=
 =?UTF-8?q?=D1=81=D1=87=D0=B5=D1=82=D0=BE=D0=BC=20=D0=B8=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/StatisticsService.php            |  3 +++
 .../Statistic/Components/OutcomeColumn.vue    | 22 ++++++++++++++-----
 resources/js/Pages/Statistic/Index.vue        |  2 ++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/Services/StatisticsService.php b/app/Services/StatisticsService.php
index c08afe3..4ab49df 100644
--- a/app/Services/StatisticsService.php
+++ b/app/Services/StatisticsService.php
@@ -257,6 +257,9 @@ class StatisticsService
 
                     'progressPlanOfYear' => $periodPlan,
                     'percentPlanOfYear' => $percentPlanOfYear,
+                    'needPlanOfYear' => $periodPlan > 0 && $periodPlan > $outcome
+                        ? $periodPlan - $outcome
+                        : 0,
                     'lethality' => $lethality,
                     'type' => $typeName,
                     'isDepartment' => true,
diff --git a/resources/js/Pages/Statistic/Components/OutcomeColumn.vue b/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
index 3f08bd8..8303f06 100644
--- a/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
+++ b/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
@@ -15,6 +15,10 @@ const props = defineProps({
         type: [Number, String],
         default: null
     },
+    planOfYear: {
+        type: [Number, String],
+        default: null
+    },
     progressCompletedToPlan: {
         type: [Number, String],
         default: null
@@ -29,11 +33,11 @@ const props = defineProps({
                   :arrow="false"
         >
             <template #trigger>
-                <NTag :type="percentType(needCompletedToPlan)"
-                      round
-                      :bordered="false"
-                      size="tiny"
-                      class="absolute! -left-1.5 bottom-2.5 text-xs"
+                <NTag
+                    round
+                    :bordered="false"
+                    size="tiny"
+                    class="absolute! -left-1.5 bottom-2.5 text-xs"
                 >
                     {{ needCompletedToPlan }}
                 </NTag>
@@ -57,7 +61,15 @@ const props = defineProps({
                     {{ progressCompletedToPlan }}%
                 </NTag>
             </template>
+            <NFlex align="center" justify="start" :wrap="false" size="small">
+                <NTag size="small" round type="default" :bordered="false">Месячный</NTag>
+                <NTag v-if="needCompletedToPlan === 0" size="small" round type="success" :bordered="false">Выполнен</NTag>
+                <NTag v-else size="small" round type="warning" :bordered="false">Не выполнен</NTag>
+            </NFlex>
             Прогресс выполнения плана
+            <br>План:
+            <span class="font-medium">{{ planOfYear }}</span>, требуется выписать еще:
+            <span class="font-medium">{{ needCompletedToPlan }}</span>
         </NTooltip>
     </NFlex>
 </template>
diff --git a/resources/js/Pages/Statistic/Index.vue b/resources/js/Pages/Statistic/Index.vue
index 52e977b..6c7ec3b 100644
--- a/resources/js/Pages/Statistic/Index.vue
+++ b/resources/js/Pages/Statistic/Index.vue
@@ -181,6 +181,8 @@ const columns = ref([
                 {
                     isTotalRow: row.isTotalRow,
                     progressCompletedToPlan: row.percentPlanOfYear,
+                    needCompletedToPlan: row.needPlanOfYear,
+                    planOfYear: row.progressPlanOfYear,
                     value: row.outcome
                 }
             )