From: JoySystem_v <fvv2011@gmail.com>
Date: Mon, 19 Aug 2024 09:33:29 +0000 (+0300)
Subject: изменения основной таблицы возвращение фильтров и форматирование даты
X-Git-Tag: 1.5~20^2~21
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=ed74767b6e6a434549fdb8c9f743ca1e5256ad18;p=erp24_rep%2Fyii-erp24%2F.git

изменения основной таблицы возвращение фильтров и форматирование даты
---

diff --git a/erp24/views/crud/employee-payment/_search.php b/erp24/views/crud/employee-payment/_search.php
index f214265b..5709837b 100755
--- a/erp24/views/crud/employee-payment/_search.php
+++ b/erp24/views/crud/employee-payment/_search.php
@@ -46,22 +46,22 @@ use yii\widgets\ActiveForm;
             ]) ?>
         </div>
     </div>
-    <!--<div class="row">
+   <div class="row">
         <div class="col-3">
-            <?/*= $form->field($model, 'date') */?>
+            <?= $form->field($model, 'date')->input('date') ?>
         </div>
         <div class="col-3">
-            <?/*= $form->field($model, 'monthly_salary') */?>
+            <?= $form->field($model, 'monthly_salary') ?>
         </div>
         <div class="col-3">
-            <?/*= $form->field($model, 'daily_payment') */?>
+            <?= $form->field($model, 'daily_payment') ?>
         </div>
         <div class="col-3">
             <?/*= $form->field($model, 'creator_id')->dropDownList(\yii_app\records\AdminGroup::find()->select(['name', 'id'])->indexBy('id')->column(), [
                 'prompt' => '---',
             ]) */?>
         </div>
-    </div>-->
+    </div>
 
     <div class="form-group">
         <?= Html::submitButton('Найти', ['class' => 'btn btn-primary']) ?>
diff --git a/erp24/views/crud/employee-payment/index.php b/erp24/views/crud/employee-payment/index.php
index d6c3a869..6c14cd15 100755
--- a/erp24/views/crud/employee-payment/index.php
+++ b/erp24/views/crud/employee-payment/index.php
@@ -23,7 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
+        //'filterModel' => $searchModel,
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
 
@@ -33,7 +33,8 @@ $this->params['breadcrumbs'][] = $this->title;
                 'format' => 'raw',
                 'value' => function($model) {
                     return Html::a($model->admin_id, ['employee-payment/view', 'id' => $model->admin_id]);
-                }
+                },
+
             ],
             [
                 'attribute' => 'admin_id',
@@ -45,9 +46,12 @@ $this->params['breadcrumbs'][] = $this->title;
             ],
 
             'adminGroup.name:text:Должность',
-           // 'date',
-           // 'monthly_salary',
-           // 'daily_payment',
+           [
+            'attribute' => 'date',
+            'format' => ['date', 'php:d.m.Y'], // Форматируем дату в формате dd.mm.yyyy
+            ],
+            'monthly_salary',
+            'daily_payment',
           //  'creator.name:text:Создавший правило',
             [
                 'class' => ActionColumn::class,