From: marina <m.zozirova@gmail.com>
Date: Tue, 17 Dec 2024 09:35:35 +0000 (+0300)
Subject: ERP-259 Доработка второго шага передачи смен
X-Git-Tag: 1.7~156^2~11
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f3d1768847848bae70077365660dbd3ac3898de7;p=erp24_rep%2Fyii-erp24%2F.git

ERP-259 Доработка второго шага передачи смен
---

diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php
index a12cfcc0..69ed6106 100644
--- a/erp24/views/shift-transfer/_replacement.php
+++ b/erp24/views/shift-transfer/_replacement.php
@@ -80,9 +80,9 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
             ],
             [
                 'name' => 'product_self_cost',
-                'type' => BaseColumn::TYPE_HIDDEN_INPUT,
-                'options' => ['step' => 0.01, 'readonly' => true,],
-                'title' => 'Себестоимость товара',
+                'type' => BaseColumn::TYPE_TEXT_INPUT,
+                'options' => ['type' => 'hidden', 'step' => 0.01, 'readonly' => true,],
+//                'title' => 'Себестоимость товара',
                 'value' => function ($data) {
                     return $data['product_self_cost'] ?? '';
                 },
@@ -135,9 +135,9 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
             ],
             [
                 'name' => 'product_replacement_self_cost',
-                'type' => BaseColumn::TYPE_HIDDEN_INPUT,
-                'options' => ['step' => 0.01, 'readonly' => true,],
-                'title' => 'Себестоимость замещаемого товара',
+                'type' => BaseColumn::TYPE_TEXT_INPUT,
+                'options' => ['type' => 'hidden', 'step' => 0.01, 'readonly' => true,],
+//                'title' => 'Себестоимость замещаемого товара',
                 'value' => function ($data) {
                     return $data['product_replacement_self_cost'] ?? '';
                 },
@@ -162,9 +162,9 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
             ],
             [
                 'name' => 'balance_self_cost',
-                'title' => 'Разница в сумме (Себестоиомость)',
-                'type' => BaseColumn::TYPE_HIDDEN_INPUT,
-                'options' => ['step' => 0.01, 'readonly' => true,],
+//                'title' => 'Разница в сумме (Себестоиомость)',
+                'type' => BaseColumn::TYPE_TEXT_INPUT,
+                'options' => ['type' => 'hidden', 'step' => 0.01, 'readonly' => true,],
                 'value' => function ($data) {
                     return $data['balance_self_cost'] ?? '';
                 },
diff --git a/erp24/web/js/shift-transfer/replacement.js b/erp24/web/js/shift-transfer/replacement.js
index 06c2c0a2..125a7351 100644
--- a/erp24/web/js/shift-transfer/replacement.js
+++ b/erp24/web/js/shift-transfer/replacement.js
@@ -78,6 +78,7 @@ function clearFields($this) {
         '#shifttransfer-equalizationremains-' + index + '-product_replacement_price',
         '#shifttransfer-equalizationremains-' + index + '-product_replacement_self_cost',
         '#shifttransfer-equalizationremains-' + index + '-product_replacement_count',
+        '#shifttransfer-equalizationremains-' + index + '-product_count',
         '#shifttransfer-equalizationremains-' + index + '-balance',
         '#shifttransfer-equalizationremains-' + index + '-balance_self_cost'
     ];
@@ -123,6 +124,7 @@ function setReplacementPriceData() {
             }
 
             if (!data.success) {
+                clearFields($this);
                 alert('Ошибка: ' + data.message);
                 return;
             }