From a9454912deb2edfccb0d4de8c9eb4706c473f479 Mon Sep 17 00:00:00 2001
From: Bivekich <biveki-dev@yandex.ru>
Date: Thu, 24 Jul 2025 13:02:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D1=8F=20=D0=B0=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B0=20=D0=B8=20=D1=84=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=B8=20=D0=BF=D0=B0=D1=81=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=80=D1=82=D0=B0=20=D0=B2=20=D0=BA=D0=BE=D0=BC=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=B0=D1=85=20EmployeeEditInline?=
 =?UTF-8?q?Form,=20EmployeeForm=20=D0=B8=20EmployeeInlineForm.=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=83=D1=81?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=BF=D1=83=D1=81?=
 =?UTF-8?q?=D1=82=D1=8B=D1=85=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B8=D0=B7=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9.=20=D0=9E=D0=B1?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BC=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=20CreateConsumablesSupplyPage:?=
 =?UTF-8?q?=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2=20=D1=81=20=D1=83=D1=87=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BC=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=84?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85.=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=20ProductForm:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BE=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B8=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=BE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employees/employee-edit-inline-form.tsx   | 20 ++++++++++---------
 src/components/employees/employee-form.tsx    |  2 +-
 .../employees/employee-inline-form.tsx        | 20 ++++++++++---------
 .../create-consumables-supply-page.tsx        | 15 +++++++++++---
 src/components/warehouse/product-form.tsx     |  6 +++++-
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/components/employees/employee-edit-inline-form.tsx b/src/components/employees/employee-edit-inline-form.tsx
index 73551b6..ef09daa 100644
--- a/src/components/employees/employee-edit-inline-form.tsx
+++ b/src/components/employees/employee-edit-inline-form.tsx
@@ -227,7 +227,7 @@ export function EmployeeEditInlineForm({ employee, onSave, onCancel, isLoading =
               
               <div className="flex items-center gap-4">
                 <Avatar className="h-20 w-20 ring-2 ring-white/20">
-                  {formData.avatar ? (
+                  {formData.avatar && formData.avatar.trim() !== '' ? (
                     <AvatarImage 
                       src={formData.avatar} 
                       alt="Фото сотрудника"
@@ -288,7 +288,7 @@ export function EmployeeEditInlineForm({ employee, onSave, onCancel, isLoading =
               </Label>
               
               <div className="space-y-3">
-                {formData.passportPhoto ? (
+                {formData.passportPhoto && formData.passportPhoto.trim() !== '' ? (
                   <div className="relative">
                     <Image 
                       src={formData.passportPhoto} 
@@ -549,13 +549,15 @@ export function EmployeeEditInlineForm({ employee, onSave, onCancel, isLoading =
             <DialogTitle className="text-white">Фото паспорта</DialogTitle>
           </DialogHeader>
           <div className="flex justify-center">
-            <Image 
-              src={formData.passportPhoto}
-              alt="Паспорт"
-              width={600}
-              height={800} 
-              className="max-w-full max-h-[70vh] object-contain rounded-lg"
-            />
+            {formData.passportPhoto && formData.passportPhoto.trim() !== '' && (
+              <Image 
+                src={formData.passportPhoto}
+                alt="Паспорт"
+                width={600}
+                height={800} 
+                className="max-w-full max-h-[70vh] object-contain rounded-lg"
+              />
+            )}
           </div>
         </DialogContent>
       </Dialog>
diff --git a/src/components/employees/employee-form.tsx b/src/components/employees/employee-form.tsx
index cd3ebf3..a77fc7b 100644
--- a/src/components/employees/employee-form.tsx
+++ b/src/components/employees/employee-form.tsx
@@ -351,7 +351,7 @@ export function EmployeeForm({ employee, onSave, onCancel }: EmployeeFormProps)
         <div className="flex items-start gap-6 mb-6">
           <div className="flex flex-col items-center gap-3">
             <Avatar className="h-24 w-24 ring-2 ring-white/20">
-              {formData.avatar ? (
+              {formData.avatar && formData.avatar.trim() !== '' ? (
                 <AvatarImage src={formData.avatar} alt="Аватар сотрудника" />
               ) : null}
               <AvatarFallback className="bg-gradient-to-br from-purple-500 to-purple-600 text-white text-lg font-semibold">
diff --git a/src/components/employees/employee-inline-form.tsx b/src/components/employees/employee-inline-form.tsx
index 9bd128a..d2c3b83 100644
--- a/src/components/employees/employee-inline-form.tsx
+++ b/src/components/employees/employee-inline-form.tsx
@@ -338,7 +338,7 @@ export function EmployeeInlineForm({ onSave, onCancel, isLoading = false }: Empl
               
               <div className="flex items-center gap-4">
                 <Avatar className="h-20 w-20 ring-2 ring-white/20">
-                  {formData.avatar ? (
+                  {formData.avatar && formData.avatar.trim() !== '' ? (
                     <AvatarImage src={formData.avatar} alt="Фото сотрудника" />
                   ) : null}
                   <AvatarFallback className="bg-gradient-to-br from-purple-500 to-purple-600 text-white text-lg font-semibold">
@@ -391,7 +391,7 @@ export function EmployeeInlineForm({ onSave, onCancel, isLoading = false }: Empl
               </Label>
               
               <div className="space-y-3">
-                {formData.passportPhoto ? (
+                {formData.passportPhoto && formData.passportPhoto.trim() !== '' ? (
                   <div className="relative">
                     <Image 
                       src={formData.passportPhoto} 
@@ -652,13 +652,15 @@ export function EmployeeInlineForm({ onSave, onCancel, isLoading = false }: Empl
             <DialogTitle className="text-white">Фото паспорта</DialogTitle>
           </DialogHeader>
           <div className="flex justify-center">
-                                <Image 
-                      src={formData.passportPhoto}
-                      alt="Паспорт"
-                      width={600}
-                      height={800} 
-              className="max-w-full max-h-[70vh] object-contain rounded-lg"
-            />
+            {formData.passportPhoto && formData.passportPhoto.trim() !== '' && (
+              <Image 
+                src={formData.passportPhoto}
+                alt="Паспорт"
+                width={600}
+                height={800} 
+                className="max-w-full max-h-[70vh] object-contain rounded-lg"
+              />
+            )}
           </div>
         </DialogContent>
       </Dialog>
diff --git a/src/components/supplies/create-consumables-supply-page.tsx b/src/components/supplies/create-consumables-supply-page.tsx
index 9ce164d..1c967b1 100644
--- a/src/components/supplies/create-consumables-supply-page.tsx
+++ b/src/components/supplies/create-consumables-supply-page.tsx
@@ -49,7 +49,8 @@ interface ConsumableProduct {
   description?: string;
   price: number;
   category?: { name: string };
-  images?: Array<{ url: string }>;
+  images: string[];
+  mainImage?: string;
   organization: {
     id: string;
     name: string;
@@ -439,9 +440,17 @@ export function CreateConsumablesSupplyPage() {
                             <div className="space-y-3">
                               {/* Изображение товара */}
                               <div className="aspect-square bg-white/5 rounded-lg overflow-hidden">
-                                {product.images && product.images.length > 0 ? (
+                                {product.images && product.images.length > 0 && product.images[0] ? (
                                   <Image
-                                    src={product.images[0].url}
+                                    src={product.images[0]}
+                                    alt={product.name}
+                                    width={200}
+                                    height={200}
+                                    className="w-full h-full object-cover"
+                                  />
+                                ) : product.mainImage ? (
+                                  <Image
+                                    src={product.mainImage}
                                     alt={product.name}
                                     width={200}
                                     height={200}
diff --git a/src/components/warehouse/product-form.tsx b/src/components/warehouse/product-form.tsx
index 66168ef..dfb874d 100644
--- a/src/components/warehouse/product-form.tsx
+++ b/src/components/warehouse/product-form.tsx
@@ -419,7 +419,7 @@ export function ProductForm({ product, onSave, onCancel }: ProductFormProps) {
                   <div className="aspect-square bg-white/10 rounded-lg flex items-center justify-center">
                     <div className="animate-spin rounded-full h-8 w-8 border-2 border-white border-t-transparent"></div>
                   </div>
-                ) : (
+                ) : imageUrl ? (
                   <>
                     <Image
                       src={imageUrl}
@@ -460,6 +460,10 @@ export function ProductForm({ product, onSave, onCancel }: ProductFormProps) {
                       </Button>
                     </div>
                   </>
+                ) : (
+                  <div className="aspect-square bg-white/10 rounded-lg flex items-center justify-center">
+                    <div className="text-white/40 text-sm">Нет изображения</div>
+                  </div>
                 )}
               </div>
             ))}