From fa7d95c2a8ec568dfffbb22a2ae84096946f82aa Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Mon, 23 Dec 2024 22:10:18 +0600
Subject: [PATCH] -

---
 src/components/admin/EmployeeList.vue         |  5 ----
 src/components/admin/RequestStatusBadge.vue   |  6 ++--
 .../admin/employee/EmployeeFormModal.vue      | 28 ++++++++++++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/components/admin/EmployeeList.vue b/src/components/admin/EmployeeList.vue
index f359f2b..cebd0bf 100644
--- a/src/components/admin/EmployeeList.vue
+++ b/src/components/admin/EmployeeList.vue
@@ -1,17 +1,12 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { UserPlusIcon, PencilIcon } from 'lucide-vue-next';
 import { departments } from '@/utils/constants';
-import EmployeeFormModal from './employee/EmployeeFormModal.vue';
-import Notification from '@/components/ui/Notification.vue';
 import type { Employee } from '@/types/employee';
 
 const employees = ref<Employee[]>([]); // Добавляем типизацию массива сотрудников
 const showAddForm = ref(false);
 const editingEmployee = ref<Employee | null>(null);
-const showNotification = ref(false);
-const notificationMessage = ref('');
 
 function getDepartmentLabel(value: string) {
   return departments.find(d => d.value === value)?.label || value;
diff --git a/src/components/admin/RequestStatusBadge.vue b/src/components/admin/RequestStatusBadge.vue
index d73d04b..5e9f805 100644
--- a/src/components/admin/RequestStatusBadge.vue
+++ b/src/components/admin/RequestStatusBadge.vue
@@ -8,16 +8,18 @@
 </template>
 
 <script setup lang="ts">
-const props = defineProps<{
+defineProps<{
   status: 'new' | 'in_progress' | 'resolved' | 'closed'
 }>();
 
+
+
 const statusClasses = {
   new: 'bg-blue-100 text-blue-800',
   in_progress: 'bg-yellow-100 text-yellow-800',
   resolved: 'bg-green-100 text-green-800',
   closed: 'bg-gray-100 text-gray-800'
-};
+} as const;
 
 const statusLabels = {
   new: 'Новая',
diff --git a/src/components/admin/employee/EmployeeFormModal.vue b/src/components/admin/employee/EmployeeFormModal.vue
index 1cbf1c9..3f59f75 100644
--- a/src/components/admin/employee/EmployeeFormModal.vue
+++ b/src/components/admin/employee/EmployeeFormModal.vue
@@ -6,7 +6,7 @@
           <div class="p-2 bg-blue-50 rounded-lg">
             <component 
               :is="employee ? UserIcon : UserPlusIcon"
-              size="24"
+              :size="24"
               class="text-blue-600"
             />
           </div>
@@ -18,7 +18,7 @@
           @click="$emit('close')"
           class="text-gray-400 hover:text-gray-500 transition-colors"
         >
-          <XIcon size="20" />
+          <XIcon :size="20" />
         </button>
       </div>
 
@@ -45,7 +45,7 @@
             label="Отдел"
             type="select"
             required
-            :options="departments"
+            :options="departmentOptions"
             :icon="BuildingIcon"
           />
 
@@ -76,14 +76,14 @@
             @click="$emit('close')"
             class="px-4 py-2 border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 transition-colors flex items-center gap-2"
           >
-            <XIcon size="16" />
+            <XIcon :size="16" />
             Отмена
           </button>
           <button
             type="submit"
             class="px-4 py-2 bg-blue-600 text-white rounded-md text-sm font-medium hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 transition-colors flex items-center gap-2"
           >
-            <component :is="employee ? SaveIcon : UserPlusIcon" size="16" />
+            <component :is="employee ? SaveIcon : UserPlusIcon" :size="16" />
             {{ employee ? 'Сохранить' : 'Добавить' }}
           </button>
         </div>
@@ -98,10 +98,24 @@ import { XIcon, UserIcon, BuildingIcon, DoorClosedIcon, LockIcon, UserPlusIcon,
 import { departments } from '@/utils/constants';
 import FormField from '@/components/ui/FormField.vue';
 
+interface Employee {
+  id: number;
+  first_name: string;
+  last_name: string;
+  department: string;
+  office: string;
+}
+
 const props = defineProps<{
-  employee?: any;
+  employee?: Employee;
 }>();
 
+const departmentOptions = departments.map(d => ({
+  value: d.value,
+  label: d.label
+}));
+
+
 const emit = defineEmits<{
   (e: 'close'): void;
   (e: 'submit', data: any): void;
@@ -130,7 +144,7 @@ onMounted(() => {
 function handleSubmit() {
   const data = { ...formData.value };
   if (props.employee && !data.password) {
-    delete data.password;
+    formData.value.password = ''; // Вместо delete используем присваивание пустой строки
   }
   emit('submit', data);
 }