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" > + + Месячный + Выполнен + Не выполнен + Прогресс выполнения плана +
План: + {{ planOfYear }}, требуется выписать еще: + {{ needCompletedToPlan }} 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 } )