Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
E
ecouniversal
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Babin Egor
ecouniversal
Commits
94a93930
Commit
94a93930
authored
Feb 04, 2020
by
Babin Egor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
file.js
parent
a6365c33
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
13 deletions
+24
-13
app-registration-form.js
src/blocks/app-registration-form/app-registration-form.js
+7
-2
app-waste-utilisation-order-form.js
...tilisation-order-form/app-waste-utilisation-order-form.js
+9
-7
field-file.js
src/blocks/field-file/field-file.js
+2
-0
index.pug
src/pages/index.pug
+6
-4
No files found.
src/blocks/app-registration-form/app-registration-form.js
View file @
94a93930
...
...
@@ -108,7 +108,12 @@ Vue.component('app-registration-form', {
(
this
.
fieldsVal
.
natural
.
personAuthLogin
!==
""
)
&&
(
this
.
fieldsVal
.
natural
.
personAuthPass
!==
""
)
&&
(
this
.
fieldsVal
.
natural
.
personAuthPassRepeat
!==
""
)))
{
return
true
;
if
(
this
.
fieldsVal
.
juridical
.
companyInn
.
length
==
10
)
{
return
true
}
else
{
return
false
}
}
else
{
return
false
;
}
...
...
@@ -804,7 +809,7 @@ Vue.component('app-registration-form', {
v-if="lastStage"
type="submit"
:disabled="!formFilledRight"
>
Добавить заказчика
</button>
>
Зарегистрироваться
</button>
<button type="button"
...
...
src/blocks/app-waste-utilisation-order-form/app-waste-utilisation-order-form.js
View file @
94a93930
...
...
@@ -31,7 +31,8 @@ Vue.component('app-waste-utilisation-order-form', {
shouldSort
:
false
,
noChoicesText
:
'Пусто'
,
noResultsText
:
'Ничего не найдено'
,
searchResultLimit
:
'5'
searchResultLimit
:
'5'
,
maxItemCount
:
'40'
},
helptext
:
''
...
...
@@ -190,11 +191,14 @@ Vue.component('app-waste-utilisation-order-form', {
this
.
fiasInit
();
},
computed
:
{
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
(){
return
'
https://r52.ru
/api/mainType/'
+
this
.
localRecord
.
wType
.
name
return
'/api/mainType/'
+
this
.
localRecord
.
wType
.
name
},
// Открываем кнопку "сохранить"
formFilledRight
()
{
...
...
@@ -469,7 +473,7 @@ Vue.component('app-waste-utilisation-order-form', {
amount
:
this
.
localRecord
.
wAmount
,
group
:
this
.
localRecord
.
wGroup
[
"value"
]
},
url
:
"
https://r52.ru
/api/transport/getPrice/"
url
:
"/api/transport/getPrice/"
}).
then
(
response
=>
response
.
data
)
.
then
(
options
=>
{
this
.
localRecord
.
wTransportCost
[
"value"
]
=
parseFloat
(
options
[
"price"
]).
toFixed
(
2
);
...
...
@@ -524,14 +528,12 @@ Vue.component('app-waste-utilisation-order-form', {
</waste-filter>
</div>
<!-- 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: 50
0px; background-color:#fff; z-index:1000; width: 400px; height: 1000px; padding: 10px; border: 1px solid #999;">
<pre>
{{ localRecord }}
</pre>
</div>
-->
<!-- end Debug --->
<!-- Form -->
...
...
src/blocks/field-file/field-file.js
View file @
94a93930
...
...
@@ -92,8 +92,10 @@ ready(function(){
let
fileWrap
=
''
;
Store
.
files
[
itemName
].
forEach
(
item
=>
{
console
.
log
(
item
);
fileWrap
+=
`
<div class="field-file__item-wrap">
<input type="hidden" value="
${
item
.
name
}
" name="ownfile[]">
<div class="field-file__item-remove">
<div class="remove remove_bordered file-remove-js"></div>
</div>
...
...
src/pages/index.pug
View file @
94a93930
...
...
@@ -20,10 +20,12 @@ block page
h1.title!=title
.block_pink-b
.row
+info-block()
|Здесь будет выводится POST
<app-registration></app-registration>
br
br
br
//- --- СЛАЙДЕР БАНЕРЫ ---
section.index__slider
//- +owl-carousel('promo')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment