Добавлен вывод требований по плану, подсказка с подсчетом и индикатор

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,

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)"
+                <NTag
-                      round
+                    round
-                      :bordered="false"
+                    :bordered="false"
-                      size="tiny"
+                    size="tiny"
-                      class="absolute! -left-1.5 bottom-2.5 text-xs"
+                    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>

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
                 }
             )