From 165025ef53724a3479bd7288acb2bb9c7d2caf5f Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 26 Mar 2025 17:11:40 +0300 Subject: [PATCH] =?utf8?q?ERP-358=20=D0=A1=D0=B2=D0=B5=D1=80=D1=81=D1=82?= =?utf8?q?=D0=B0=D1=82=D1=8C=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?utf8?q?=D0=B9=D1=81=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BF=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/composer.json | 3 +- erp24/views/shipment/auto-planogramma.php | 224 +++++++++------------- 2 files changed, 88 insertions(+), 139 deletions(-) diff --git a/erp24/composer.json b/erp24/composer.json index 5640f82f..02825c64 100644 --- a/erp24/composer.json +++ b/erp24/composer.json @@ -39,8 +39,7 @@ "vlucas/phpdotenv": "^5.6", "softark/yii2-dual-listbox": "^1.0", "kartik-v/yii2-widget-depdrop": "dev-master", - "kartik-v/yii2-export": "@dev", - "sjaakp/yii2-bandoneon": "*" + "kartik-v/yii2-export": "@dev" }, "require-dev": { "yiisoft/yii2-debug": "~2.1.0", diff --git a/erp24/views/shipment/auto-planogramma.php b/erp24/views/shipment/auto-planogramma.php index 7d289a30..ca623718 100644 --- a/erp24/views/shipment/auto-planogramma.php +++ b/erp24/views/shipment/auto-planogramma.php @@ -11,6 +11,7 @@ use yii_app\records\StoreCityList; use yii_app\records\StoreDynamic; use yii_app\records\StoreType; use sjaakp\bandoneon\Bandoneon; +use yii\jui\Accordion; /* @var $categories \yii_app\records\Products1cNomenclature */ @@ -35,86 +36,9 @@ $dataProvider = new ArrayDataProvider([ 'pagination' => false, ]); -$tooltipText = "Оффлайн: 50 Флаумак (off-line): 20 Флаумак (on-line): 10 Флаумак (market): 10 Изумительная (off-line): 30 Списания: 20"; +$tooltipText = "Оффлайн: 50 Флаумак (off-line): 20 Флаумак (on-line): 10 Флаумак (market): 10 Изумительная (off-line): 30 Списания: 20";?> -$columns = []; -foreach ($addresses as $address) { - $columns[] = [ - 'attribute' => $address, - 'label' => $address, - 'format' => 'raw', - 'headerOptions' => ['style' => 'writing-mode: sideways-lr; text-align: center; white-space: nowrap; font-weight: bold; transform-origin: left bottom; padding-right: 7%;'], - 'value' => function ($model, $key, $index) use ($address, $tooltipText) { - return ' - - ' . Html::input('text', '', $model[$address], [ - 'class' => 'btn btn-primary', - 'data-bs-toggle' => 'tooltip', - 'data-bs-placement' => 'top', - 'title' => $tooltipText, - 'style' => 'background:#e73535;' - ]) . ' - - - - - ' . Html::input('text', '', $model[$address], [ - 'class' => 'btn btn-primary', - 'data-bs-toggle' => 'tooltip', - 'data-bs-placement' => 'top', - 'title' => $tooltipText, - 'style' => 'background:yellowgreen;' - ]) . ' - - - - ' . Html::input('text', '', $model[$address], [ - 'class' => 'btn btn-primary', - 'data-bs-toggle' => 'tooltip', - 'data-bs-placement' => 'top', - 'title' => $tooltipText, - 'style' => 'background:#3280cd;' - ]) . ' - - - - ' . Html::input('text', '', $model[$address], [ - 'class' => 'btn btn-primary', - 'data-bs-toggle' => 'tooltip', - 'data-bs-placement' => 'top', - 'title' => $tooltipText, - 'style' => 'background:yellowgreen;' - ]) . ' - - - - - '; - }, - ]; -} -?> -

+

@@ -229,11 +153,21 @@ foreach ($addresses as $address) { 'btn btn-success btn-save', 'style' => 'width:100%']); ?>
+
+
+ +
+
-
-
- + < class="content"> +
+


@@ -250,65 +184,81 @@ foreach ($addresses as $address) { 'btn btn-success', 'style' => 'width:25%']) ?>
-
-
- - - - -
- -
- - $products): ?> - -
- -
- - -
- -
- -
- -
- - - - - +
+
+ +
+ 'writing-mode: sideways-lr; text-align: center; white-space: nowrap; + font-weight: bold; transform-origin: left bottom; padding-right: 7%;' + ]) ?>
-
- +
+
+
+
+ + Срезка ▲ +
+ + Розы ▶ +
+
+ Розы 40 Эк + 'form-control', 'style' => 'width: 70px;']) ?> +
+
+ Розы 80 Эк + 'form-control', 'style' => 'width: 70px;']) ?> +
+
+ +
+ Экзотика + 'form-control', 'style' => 'width: 70px;']) ?> +
+ +
+ Зелень + 'form-control', 'style' => 'width: 70px;']) ?> +
+
- +
+ +
+
+
+
+
+ 'btn btn-primary', + 'data-bs-toggle' => 'tooltip', + 'data-bs-placement' => 'top', + 'title' => $tooltipText, + 'style' => 'background:#e73535; width: 120%;' + ]) ?> +
+
+ +
+
+
+
+
+
- $dataProvider, - 'layout' => '{items}', // Только таблица, без пагинации - 'tableOptions' => ['class' => 'table table-bordered mt-2'], - 'columns' => $columns, - ]); - - ?> -
-
-- 2.39.5