Merge remote-tracking branch 'origin/master'

2026-04-02 10:34:50 +03:00
parent 4af852c853
commit a97accbdb1
5 changed files with 129 additions and 82 deletions
--- a/ui/src/pages/OrderEntry.vue
+++ b/ui/src/pages/OrderEntry.vue
@@ -2928,8 +2928,8 @@ async function onColorChange(colorCode) {
    const data = res?.data || []
    if (Array.isArray(data) && data.length > 0) {
      renkOptions2.value = data.map(x => ({
-        label: x.item_dim2_code,
-        value: x.item_dim2_code
+        label: `${x.item_dim2_code || x.ItemDim2Code || ''} - ${x.color_description || x.ColorDescription || ''}`.trim(),
+        value: x.item_dim2_code || x.ItemDim2Code || ''
      }))
      console.log('🎨 2. renk listesi yüklendi:', renkOptions2.value.length)
    } else {