Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
bb7a5044
Commit
bb7a5044
authored
Dec 03, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
地接总表查询修改
parent
bb94df1f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
16 deletions
+10
-16
BuyingType.vue
src/components/Buying/BuyingType.vue
+0
-1
ActivityStatistics.vue
src/components/SalesModule/ActivityStatistics.vue
+0
-6
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+10
-9
No files found.
src/components/Buying/BuyingType.vue
View file @
bb7a5044
...
...
@@ -314,7 +314,6 @@ export default {
getGoodsTypeManager
()
{
this
.
apipost
(
"Shop_post_GetCommodityCategoryList"
,{
Name
:
""
,
ParentId
:
0
},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
console
.
log
(
res
.
data
.
data
)
this
.
GoodsTypeList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
src/components/SalesModule/ActivityStatistics.vue
View file @
bb7a5044
...
...
@@ -127,13 +127,10 @@ export default {
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
"res"
,
res
);
this
.
Actitylist
=
res
.
data
.
data
;
if
(
this
.
Actitylist
.
length
>
0
){
this
.
msg
.
CouponId
=
this
.
Actitylist
[
0
].
Id
;
}
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
...
...
@@ -149,7 +146,6 @@ export default {
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
list
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
...
...
@@ -167,9 +163,7 @@ export default {
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
;
},
},
mounted
()
{
this
.
GetActity
();
let
userInfo
=
this
.
getLocalStorage
();
...
...
src/components/dmc/manager/dmcTotalTable.vue
View file @
bb7a5044
...
...
@@ -504,22 +504,23 @@
<div
class=
"link"
>
<p
@
click=
"getJourney(item)"
style=
"padding-top:4px;"
>
{{
item
.
Title
}}
</p>
<div
v-if=
"outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
class=
"colorE95252"
style=
"padding-top:5px;"
>
{{
$t
(
'op.DJBZTH'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
DMCNum
}}
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'op.DJBZTH'
)
}}
:
<span
style=
"font-weight:bold"
>
{{
outItem
.
PriceCommonList
[
index
].
DMCNum
}}
</span>
</div>
<div
v-show=
"outItem.PriceCommonList[index].OPInnerRemark!=''"
class=
"colorE95252"
style=
"padding-top:5px;
"
>
{{
$t
(
'Operation.Op_remark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
OPInnerRemark
}}
</div>
style=
"padding-top:5px;
padding-bottom:4px;"
>
{{
$t
(
'Operation.Op_remark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
OPInnerRemark
}}
</div>
<div
v-show=
"outItem.PriceCommonList[index].OPRemark!=''"
class=
"colorE95252"
style=
"padding-top:5px;
"
>
{{
$t
(
'Operation.Op_duiwaiRemark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
OPRemark
}}
</div>
<div
v-show=
"outItem.PriceCommonList[
0
].DMCRemark!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'Operation.Op_dijieRemark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
DMCRemark
}}
style=
"padding-top:5px;
padding-bottom:4px;"
>
{{
$t
(
'Operation.Op_duiwaiRemark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
OPRemark
}}
</div>
<div
v-show=
"outItem.PriceCommonList[
index
].DMCRemark!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'Operation.Op_dijieRemark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
DMCRemark
}}
</div>
<div
v-show=
"outItem.PriceCommonList[
0
].SupplierRemarks!=''"
class=
"colorE95252"
<div
v-show=
"outItem.PriceCommonList[
index
].SupplierRemarks!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'ground.gysbeizhu'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
SupplierRemarks
}}
{{
$t
(
'ground.gysbeizhu'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
SupplierRemarks
}}
</div>
<div
v-show=
"outItem.PriceCommonList[
0
].SupplierToDmcRemarks!=''"
class=
"colorE95252"
<div
v-show=
"outItem.PriceCommonList[
index
].SupplierToDmcRemarks!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'ground.gysduindibeizhu'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
SupplierToDmcRemarks
}}
{{
$t
(
'ground.gysduindibeizhu'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
SupplierToDmcRemarks
}}
</div>
</div>
</td>
...
...
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