From b98d4eef8c0767d5c5fbb4d9402564f6771a62bf Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Wed, 10 Jun 2026 15:07:58 +0900
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B8=D0=B7=D1=83=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Statistic/Components/OutcomeColumn.vue    | 41 ++++++++++++++-----
 resources/js/Pages/Statistic/Index.vue        |  1 +
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/resources/js/Pages/Statistic/Components/OutcomeColumn.vue b/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
index 6a35dc5..d222128 100644
--- a/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
+++ b/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
@@ -1,6 +1,9 @@
 <script setup>
-import {NFlex, NTag, NTooltip} from 'naive-ui'
-import {percentType, typePlan} from "../../../Utils/numbers.js";
+import {NFlex, NSpace, NTag, NTooltip} from 'naive-ui'
+import {percentType} from "../../../Utils/numbers.js";
+import {computed} from "vue";
+import {format, toDate} from "date-fns";
+import {ru} from "date-fns/locale";
 
 const props = defineProps({
     isTotalRow: {
@@ -23,8 +26,23 @@ const props = defineProps({
             total_debt: 0,
             year_plan: 0,
         })
+    },
+    endDate: {
+        type: [Number, String],
+        default: null
     }
 })
+
+const formatedMonth = computed(() => {
+    const date = toDate(props.endDate)
+    return date.toLocaleString('ru', { month: 'long' })
+})
+
+const typePlan = computed(() => {
+    if (props.plan.debt_from_year > 20) return 'error'
+    if (props.plan.debt_from_year > 10) return 'warning'
+    return 'success'
+})
 </script>
 
 <template>
@@ -62,14 +80,17 @@ const props = defineProps({
                     {{ plan.cumulative_percent }}%
                 </NTag>
             </template>
-            <NFlex align="center" justify="start" :wrap="false" size="small">
-                <NTag size="small" round type="info" :bordered="false">План на месяц: {{ plan.month_plan }}</NTag>
-            </NFlex>
-            Сначала года + текущий месяц:
-            <br>План:
-            <span class="font-medium">{{ plan.cumulative_plan }}</span>, долг:
-            <span class="font-medium">{{ plan.debt_from_year }}</span> +
-            <span class="font-medium">{{ plan.current_mouth_dept }}</span>
+            <NSpace vertical>
+                <NFlex align="center" justify="start" :wrap="false" size="small">
+                    <NTag type="info">План на {{formatedMonth}}: {{ plan.month_plan }} / {{ plan.current_mouth_dept }}</NTag>
+                </NFlex>
+                <NTag :type="typePlan">Долг с начала года: {{ plan.debt_from_year }}</NTag>
+<!--                Долг с начала года: {{ plan.debt_from_year }}-->
+            </NSpace>
+<!--            <br>План:-->
+<!--            <span class="font-medium">{{ plan.cumulative_plan }}</span>, долг:-->
+<!--            <span class="font-medium">{{ plan.debt_from_year }}</span> +-->
+<!--            <span class="font-medium">{{ plan.current_mouth_dept }}</span>-->
         </NTooltip>
     </NFlex>
 </template>
diff --git a/resources/js/Pages/Statistic/Index.vue b/resources/js/Pages/Statistic/Index.vue
index 651b8fc..854108d 100644
--- a/resources/js/Pages/Statistic/Index.vue
+++ b/resources/js/Pages/Statistic/Index.vue
@@ -184,6 +184,7 @@ const columns = ref([
                     isTotalRow: row.isTotalRow,
                     value: row.outcome,
                     plan: row.plan,
+                    endDate: props.date[1]
                 }
             )
         }