Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
Project
Project
Details
Activity
Releases
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
黄媛媛
ElectricitySheep
Commits
775d6b6e
Commit
775d6b6e
authored
Oct 29, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/huangyuanyuan/electricitysheep
parents
678e7701
0a48f516
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
192 additions
and
87 deletions
+192
-87
ServiceMannage.vue
src/components/offlineService/ServiceMannage.vue
+187
-81
serviceProductEdit.vue
src/components/offlineService/serviceProductEdit.vue
+5
-6
No files found.
src/components/offlineService/ServiceMannage.vue
View file @
775d6b6e
This diff is collapsed.
Click to expand it.
src/components/offlineService/serviceProductEdit.vue
View file @
775d6b6e
...
...
@@ -1234,7 +1234,7 @@
companyCommission
:
0
,
FXlevelList
:
[],
giveDate
:
false
,
Stores
:
''
,
Stores
:
[]
,
StoreList
:
[],
//门店下拉数据
};
},
...
...
@@ -1770,9 +1770,8 @@
this
.
addMsg
.
IsCustomSpecification
=
2
;
}
if
(
this
.
Stores
.
length
>
0
)
{
this
.
addMsg
.
StoresIds
=
JSON
.
stringify
(
this
.
Stores
);
this
.
addMsg
.
StoresIds
=
this
.
Stores
.
join
(
","
);
}
if
(
this
.
addMsg
.
SeparateDistributionType
==
1
)
{
this
.
disList1
=
[{
SpecificationSort
:
""
,
...
...
@@ -2051,7 +2050,6 @@
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
"res.data.data"
,
JSON
.
parse
(
JSON
.
stringify
(
res
.
data
.
data
)));
this
.
addMsg
=
res
.
data
.
data
;
if
(
!
this
.
$route
.
query
.
GoodsId
)
{
this
.
addMsg
.
Id
=
0
...
...
@@ -2081,8 +2079,8 @@
this
.
GradeCommissionList
=
this
.
addMsg
.
DistributionCommissionTreeList
[
0
].
GradeCommissionList
;
}
}
if
(
this
.
addMsg
.
Stores
Ids
)
{
this
.
Stores
=
JSON
.
parse
(
this
.
addMsg
.
StoresIds
)
;
if
(
this
.
addMsg
.
Stores
List
)
{
this
.
Stores
=
this
.
addMsg
.
StoresList
;
}
this
.
thisType
=
1
;
this
.
disList1
=
[];
...
...
@@ -2130,6 +2128,7 @@
ico
:
""
}
}
console
.
log
(
this
.
Stores
,
'Stores'
);
this
.
getSuggestPrice
();
this
.
getFXDGradeList2
();
this
.
getTree
();
...
...
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