Skip to content

E
ecouniversal
Commit a6365c33 authored by Babin Egor's avatar Babin Egor
Browse files
Options

update

parent 60b71b21
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 31 deletions
src/blocks/app-waste-utilisation-order-form/app-waste-utilisation-order-form.js
View file @ a6365c33
......@@ -30,7 +30,9 @@ Vue.component('app-waste-utilisation-order-form', {
searchEnabled: true,
shouldSort: false,
noChoicesText: 'Пусто',
noResultsText: 'Ничего не найдено',
noResultsText: 'Ничего не найдено',
searchResultLimit: '5'
},
helptext: ''
},
......@@ -39,7 +41,7 @@ Vue.component('app-waste-utilisation-order-form', {
attrs: {
name: 'waste-group',
id: 'waste-group',
required: true
required: false
},
options: [],
settings: {
......@@ -60,7 +62,9 @@ Vue.component('app-waste-utilisation-order-form', {
options: [],
settings: {
searchEnabled: true,
shouldSort: false
shouldSort: false,
noChoicesText: 'Пусто',
noResultsText: 'Ничего не найдено',
},
helptext: ''
},
......@@ -75,6 +79,8 @@ Vue.component('app-waste-utilisation-order-form', {
settings: {
searchEnabled: false,
shouldSort: false,
noChoicesText: 'Пусто',
noResultsText: 'Ничего не найдено',
},
helptext: ''
},
......@@ -89,6 +95,8 @@ Vue.component('app-waste-utilisation-order-form', {
settings: {
searchEnabled: false,
shouldSort: false,
noChoicesText: 'Пусто',
noResultsText: 'Ничего не найдено',
},
helptext: ''
},
......@@ -183,7 +191,7 @@ Vue.component('app-waste-utilisation-order-form', {
},
computed: {
wasteGroupUrl() {
return '/api/type/' + this.localRecord.wType.name + (this.localRecord.wMainGroup.value ? "/" + this.localRecord.wMainGroup.value : "/");
return 'https://r52.ru/api/type/' + this.localRecord.wType.name + (this.localRecord.wMainGroup.value ? "/" + this.localRecord.wMainGroup.value : "/");
},
wasteMainGroupUrl(){
return 'https://r52.ru/api/mainType/' + this.localRecord.wType.name
......@@ -201,6 +209,7 @@ Vue.component('app-waste-utilisation-order-form', {
methods: {
// Вводи кода отхода вручную
codeUp(){
this.localRecord.wGroup = {};
......@@ -515,12 +524,14 @@ Vue.component('app-waste-utilisation-order-form', {
</waste-filter>
</div>
<!-- Debug --->
<!--
<div class="debug"
style="display: none; position: absolute; right: -130px;top: 0px; background-color:#fff; z-index:1000; width: 400px; height: 1000px; padding: 10px; border: 1px solid #999;">
style="position: absolute; right: -130px;top: 0px; background-color:#fff; z-index:1000; width: 400px; height: 1000px; padding: 10px; border: 1px solid #999;">
<pre>
{{ localRecord }}
</pre>
</div>
-->
<!-- end Debug --->
<!-- Form -->
......@@ -537,29 +548,28 @@ Vue.component('app-waste-utilisation-order-form', {
<div class="row"
v-if="localRecord.wType['name'] != 'lamps'">
<div class="col-md-9"
v-if="localRecord.wType['name'] != 'communal'">
<div class="col-md-12">
<div class="block_orange-b">
<!-- Вид отхода. Список -->
<field-select
v-bind="wGroupSelect"
:init="localRecord.wGroup"
@change="localRecord.wGroup = $event"
@change="dateFromGroup"
v-bind="wMainGroupSelect"
:init="localRecord.wMainGroup"
@change="localRecord.wMainGroup = $event"
@change="dateFromMainGroup"
>
</field-select>
</div>
</div>
<div class="col-md-12"
v-if="localRecord.wType['name'] == 'communal'">
<div class="col-md-9"
v-if="localRecord.wType['name'] != 'communal'">
<div class="block_orange-b">
<!-- Вид отхода. Список -->
<field-select
v-bind="wMainGroupSelect"
:init="localRecord.wMainGroup"
@change="localRecord.wMainGroup = $event"
@change="dateFromMainGroup"
v-bind="wGroupSelect"
:init="localRecord.wGroup"
@change="localRecord.wGroup = $event"
@change="dateFromGroup"
>
</field-select>
</div>
......@@ -594,20 +604,22 @@ Vue.component('app-waste-utilisation-order-form', {
</div>
<div class="block_cyan-b"
v-if="localRecord.wType['name'] != 'lamps'">
<label class="field-text">
<span class="field-text__name">Код отхода</span>
<span class="field-text__input-wrap">
<input
type="text"
placeholder="Введите код, слово или фразу"
class="field-text__input"
v-model="localRecord.wFKKO.code"
>
</span>
</label>
</div>
<!--
<div class="block_cyan-b"
v-if="localRecord.wType['name'] != 'lamps'">
<label class="field-text">
<span class="field-text__name">Код отхода</span>
<span class="field-text__input-wrap">
<input
type="text"
placeholder="Введите код, слово или фразу"
class="field-text__input"
v-model="localRecord.wFKKO.code"
>
</span>
</label>
</div>
-->
<info-block v-if="localRecord.wType['name'] != 'lamps'">
Список содержит часто спрашиваемые виды отходов. Если Вы не нашли необходимый вид отхода, введите наименование отхода <a href=""> самостоятельно</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment