Commit 94a93930 authored by Babin Egor's avatar Babin Egor

file.js

parent a6365c33
...@@ -108,7 +108,12 @@ Vue.component('app-registration-form', { ...@@ -108,7 +108,12 @@ Vue.component('app-registration-form', {
(this.fieldsVal.natural.personAuthLogin !== "") && (this.fieldsVal.natural.personAuthLogin !== "") &&
(this.fieldsVal.natural.personAuthPass !== "") && (this.fieldsVal.natural.personAuthPass !== "") &&
(this.fieldsVal.natural.personAuthPassRepeat !== ""))) { (this.fieldsVal.natural.personAuthPassRepeat !== ""))) {
return true;
if (this.fieldsVal.juridical.companyInn.length == 10) {
return true
} else {
return false
}
} else { } else {
return false; return false;
} }
...@@ -804,7 +809,7 @@ Vue.component('app-registration-form', { ...@@ -804,7 +809,7 @@ Vue.component('app-registration-form', {
v-if="lastStage" v-if="lastStage"
type="submit" type="submit"
:disabled="!formFilledRight" :disabled="!formFilledRight"
>Добавить заказчика</button> >Зарегистрироваться</button>
<button type="button" <button type="button"
......
...@@ -31,7 +31,8 @@ Vue.component('app-waste-utilisation-order-form', { ...@@ -31,7 +31,8 @@ Vue.component('app-waste-utilisation-order-form', {
shouldSort: false, shouldSort: false,
noChoicesText: 'Пусто', noChoicesText: 'Пусто',
noResultsText: 'Ничего не найдено', noResultsText: 'Ничего не найдено',
searchResultLimit: '5' searchResultLimit: '5',
maxItemCount: '40'
}, },
helptext: '' helptext: ''
...@@ -190,11 +191,14 @@ Vue.component('app-waste-utilisation-order-form', { ...@@ -190,11 +191,14 @@ Vue.component('app-waste-utilisation-order-form', {
this.fiasInit(); this.fiasInit();
}, },
computed: { computed: {
wasteGroupUrl() { wasteGroupUrl() {
return 'https://r52.ru/api/type/' + this.localRecord.wType.name + (this.localRecord.wMainGroup.value ? "/" + this.localRecord.wMainGroup.value : "/"); //https://r52.ru/
return '/api/type/' + this.localRecord.wType.name + (this.localRecord.wMainGroup.value ? "/" + this.localRecord.wMainGroup.value : "/");
}, },
wasteMainGroupUrl(){ wasteMainGroupUrl(){
return 'https://r52.ru/api/mainType/' + this.localRecord.wType.name return '/api/mainType/' + this.localRecord.wType.name
}, },
// Открываем кнопку "сохранить" // Открываем кнопку "сохранить"
formFilledRight() { formFilledRight() {
...@@ -469,7 +473,7 @@ Vue.component('app-waste-utilisation-order-form', { ...@@ -469,7 +473,7 @@ Vue.component('app-waste-utilisation-order-form', {
amount: this.localRecord.wAmount, amount: this.localRecord.wAmount,
group: this.localRecord.wGroup["value"] group: this.localRecord.wGroup["value"]
}, },
url: "https://r52.ru/api/transport/getPrice/" url: "/api/transport/getPrice/"
}).then(response => response.data) }).then(response => response.data)
.then(options => { .then(options => {
this.localRecord.wTransportCost["value"] = parseFloat(options["price"]).toFixed(2); this.localRecord.wTransportCost["value"] = parseFloat(options["price"]).toFixed(2);
...@@ -524,14 +528,12 @@ Vue.component('app-waste-utilisation-order-form', { ...@@ -524,14 +528,12 @@ Vue.component('app-waste-utilisation-order-form', {
</waste-filter> </waste-filter>
</div> </div>
<!-- Debug ---> <!-- Debug --->
<!--
<div class="debug" <div class="debug"
style="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: -270px;top: 500px; background-color:#fff; z-index:1000; width: 400px; height: 1000px; padding: 10px; border: 1px solid #999;">
<pre> <pre>
{{ localRecord }} {{ localRecord }}
</pre> </pre>
</div> </div>
-->
<!-- end Debug ---> <!-- end Debug --->
<!-- Form --> <!-- Form -->
......
...@@ -92,8 +92,10 @@ ready(function(){ ...@@ -92,8 +92,10 @@ ready(function(){
let fileWrap = ''; let fileWrap = '';
Store.files[itemName].forEach(item => { Store.files[itemName].forEach(item => {
console.log(item);
fileWrap += ` fileWrap += `
<div class="field-file__item-wrap"> <div class="field-file__item-wrap">
<input type="hidden" value="${item.name}" name="ownfile[]">
<div class="field-file__item-remove"> <div class="field-file__item-remove">
<div class="remove remove_bordered file-remove-js"></div> <div class="remove remove_bordered file-remove-js"></div>
</div> </div>
......
...@@ -20,10 +20,12 @@ block page ...@@ -20,10 +20,12 @@ block page
h1.title!=title h1.title!=title
.block_pink-b <app-registration></app-registration>
.row
+info-block() br
|Здесь будет выводится POST br
br
//- --- СЛАЙДЕР БАНЕРЫ --- //- --- СЛАЙДЕР БАНЕРЫ ---
section.index__slider section.index__slider
//- +owl-carousel('promo') //- +owl-carousel('promo')
......
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