From: fomichev Date: Fri, 4 Jul 2025 12:23:40 +0000 (+0300) Subject: Правки категорий X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c107c179e748532c78fa9c22af7df0fecdfae1de;p=erp24_rep%2Fyii-erp24%2F.git Правки категорий --- diff --git a/erp24/controllers/CategoryPlanController.php b/erp24/controllers/CategoryPlanController.php index cf303251..d61d7c08 100644 --- a/erp24/controllers/CategoryPlanController.php +++ b/erp24/controllers/CategoryPlanController.php @@ -52,7 +52,7 @@ class CategoryPlanController extends Controller { $service = new AutoPlannogrammaService(); $isEditable = date($model->year . '-' . $model->month . '-d') > date('Y-m-d') && ( (date('d') < 27) || (date('Y-m-d', strtotime('-1 month', strtotime(date($model->year . '-' . $model->month . '-d')))) > date('Y-m-d'))); - $isEditable = true; + //$isEditable = true; $categoryPlan = CategoryPlan::find()->where(['year' => $model->year, 'month' => $model->month, 'store_id' => $model->store_id])->indexBy('category')->asArray()->all(); $types = []; $table = []; diff --git a/erp24/views/category-plan/index.php b/erp24/views/category-plan/index.php index 80396cb3..3aeb55ef 100644 --- a/erp24/views/category-plan/index.php +++ b/erp24/views/category-plan/index.php @@ -213,7 +213,7 @@ input[readonly] { ?> КатегорииПлан продажСписания - ОффлайнИнтернет-МагазинСписания + ОффлайнОнлайнСписания diff --git a/erp24/views/category-plan/new.php b/erp24/views/category-plan/new.php deleted file mode 100644 index b566f1e0..00000000 --- a/erp24/views/category-plan/new.php +++ /dev/null @@ -1,255 +0,0 @@ -registerJsFile('/js/category-plan/index.js', ['position' => \yii\web\View::POS_END]); - -$this->registerCss(' -input[readonly] { - background: lightgray; -} -'); - -?> - -
- -

План по категориям

-

Yii::$app->request->url] - ), - ['class' => 'ms-3 mb-3 pb-3', 'target' => '_blank', 'title' => 'Открыть документацию'] - ) ?>

- - - 'filter-form', - 'method' => 'GET', - 'action' => '/category-plan/new' - ]) ?> - -
-
-
-
- field($model, 'year')->dropDownList($years, ['onchange' => '//this.form.submit();'])->label(false) ?> -
-
- field($model, 'city_id')->widget(Select2::class, [ - 'data' => ArrayHelper::map(StoreCityList::findAll(['type' => StoreCityList::TYPE_CITY]), 'id', 'name'), - 'language' => 'ru', - 'options' => ['placeholder' => 'Города...'], - 'pluginOptions' => [ - 'allowClear' => true, - ] - ])->label(false) ?> -
-
- field($model, 'store_type_id')->widget(Select2::class, [ - 'data' => ArrayHelper::map(StoreType::find()->all(), 'id', 'name'), - 'language' => 'ru', - 'options' => ['placeholder' => 'Тип магазина...'], - 'pluginOptions' => [ - 'allowClear' => true, - ] - ])->label(false) ?> -
-
-
-
- field($model, 'month')->dropDownList(HtmlHelper::getMonthNames(), ['onchange' => '//this.form.submit();'])->label(false) ?> -
-
- field($model, 'region_id')->widget(Select2::class, [ - 'data' => ArrayHelper::map(StoreCityList::findAll(['type' => StoreCityList::TYPE_REGION]), 'id', 'name'), - 'language' => 'ru', - 'options' => ['placeholder' => 'Регион...'], - 'pluginOptions' => [ - 'allowClear' => true, - ] - ])->label(false) ?> -
-
- field($model, 'territory_manager_id')->widget(Select2::class, [ - 'data' => ArrayHelper::map(Admin::findAll(['group_id' => AdminGroup::GROUP_BUSH_DIRECTOR]), 'id', 'name_full'), - 'language' => 'ru', - 'options' => ['placeholder' => 'Тер. Управляющий...'], - 'pluginOptions' => [ - 'allowClear' => true, - ] - ])->label(false) ?> -
-
- -
-
-
-
- field($model, 'raion_id')->widget(Select2::class, [ - 'data' => ArrayHelper::map(StoreCityList::findAll(['type' => StoreCityList::TYPE_DISTRICT]), 'id', 'name'), - 'language' => 'ru', - 'options' => ['placeholder' => 'Район...'], - 'pluginOptions' => [ - 'allowClear' => true, - ] - ])->label(false) ?> -
-
- field($model, 'kshf_id')->widget(Select2::class, [ - 'data' => ArrayHelper::map(Admin::findAll(['group_id' => AdminGroup::GROUP_BUSH_CHEF_FLORIST]), 'id', 'name'), - 'language' => 'ru', - 'options' => ['placeholder' => 'кШФ...'], - 'pluginOptions' => [ - 'allowClear' => true, - ] - ])->label(false) ?> -
-
-
-
-
-
-
-
- -
-
-
-
- field($model, 'store_id')->dropDownList($stores, [ - 'multiple' => false, - 'size' => 6, - 'class' => 'form-control', - 'id' => 'selected-store', - 'onchange' => '//this.form.submit()', - 'style'=> 'overflow-y: scroll, height: auto; max-height: 200px; overflow-x: hidden;', - ])->label(false) ?> -
-
-
-
-
- 'btn btn-secondary'])?> - -
-
-
-
- - - store_id)): ?> -
-
-

store_id]?>

- month && $model->year && $model->store_id) { ?> - 'btn btn-danger ms-2', - 'name' => 'delete', - 'id' => 'delete', - 'value' => 1, - 'data' => [ - 'confirm' => 'Вы уверены, что хотите вернуть автоплан за ' - . $model->month . '.' . $model->year . '?', - ], - ]) - ?> - - 'btn btn-success ms-2', - 'disabled' => true, - 'id' => 'rebuild', - 'name' => 'rebuild', - 'value' => 1, - 'data' => [ - 'confirm' => 'Вы уверены, что хотите пересчитать автопланограмму за ' - . $model->month . '.' . $model->year . ' для магазина ' . $stores[$model->store_id] . '?', - ], - ]) - ?> - -
- -
-
- -
- - offline_sales_plan; - $online_sale = $salesWriteOffsPlan->online_sales_shop_plan; - $write_offs = $salesWriteOffsPlan->write_offs_plan; - ?> - - - - - - - - - - - - - - - - - - - ?> - - - - - - -
КатегорииПлан продажСписания
ОффлайнИнтернет-МагазинСписания
%Сумма%Cумма%Cумма
data-offline="" data-offline-type=""> 'number', 'style' => 'max-width: 80px;', 'readonly' => !$isEditable, 'onchange' => 'editProcent(this);']) ?>% 'number', 'readonly' => true, ]) ?> data-online="" data-online-type=""> 'number', 'style' => 'max-width: 80px;', 'readonly' => !$isEditable, 'onchange' => 'editProcent(this);']) ?>% 'number', 'readonly' => true, ]) ?> data-writeoffs="" data-writeoffs-type=""> 'number', 'style' => 'max-width: 80px;', 'readonly' => !$isEditable, 'onchange' => 'editProcent(this);']) ?>% 'number', 'readonly' => true, ]) ?>
-
- - - Не задан план по магазину. Чтобы задать план пройдите на страницу - . - - - - -
diff --git a/erp24/web/js/category-plan/index.js b/erp24/web/js/category-plan/index.js index 952716c9..c7a8be95 100644 --- a/erp24/web/js/category-plan/index.js +++ b/erp24/web/js/category-plan/index.js @@ -272,9 +272,11 @@ $(document).ready(() => { }); let taskPollInterval = null; +let isDone = false; function startTaskPolling() { if (taskPollInterval) return; + if (isDone) return; console.log('check-task'); taskPollInterval = setInterval(() => { $.ajax({ @@ -300,6 +302,7 @@ function startTaskPolling() { if (data.status === 'done') { clearInterval(taskPollInterval); taskPollInterval = null; + isDone = true; localStorage.removeItem('planChanges'); $('#categoryPlan').removeClass('block_table'); $('#rebuild').prop('disabled', true).text('Пересчитать автопланограмму');