Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
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
罗超
confucius
Commits
4cb4797f
Commit
4cb4797f
authored
Dec 23, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
4457a195
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
4 deletions
+28
-4
AchievementsUserDetailList.vue
src/pages/financial/market/AchievementsUserDetailList.vue
+26
-3
marketStatistics.vue
src/pages/financial/market/marketStatistics.vue
+2
-1
No files found.
src/pages/financial/market/AchievementsUserDetailList.vue
View file @
4cb4797f
...
@@ -171,10 +171,18 @@
...
@@ -171,10 +171,18 @@
<el-table-column
width=
"130"
prop=
"TotalCommissionMoney"
label=
"订单发放信息"
>
<el-table-column
width=
"130"
prop=
"TotalCommissionMoney"
label=
"订单发放信息"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
<
!--
<
div
v-if=
"scope.row.TotalCommissionMoney"
v-if=
"scope.row.TotalCommissionMoney"
style=
"color: rgb(255, 156, 0);"
style=
"color: rgb(255, 156, 0);"
>
应发:
{{
scope
.
row
.
TotalCommissionMoney
}}
</div>
>
应发:
{{
scope
.
row
.
TotalCommissionMoney
}}
</div>
-->
<div
v-if=
"scope.row.TotalCommissionMoney"
style=
"color: rgb(255, 156, 0);cursor: pointer;text-decoration: underline;"
@
click=
"getmingxi(scope.row)"
>
应发:
{{
scope
.
row
.
TotalCommissionMoney
}}
<q-popup-proxy
transition-show=
"flip-up"
transition-hide=
"flip-down"
>
<div
style=
"padding: 10px;border-radius: 4px;background: #FFF;max-width: 500px;"
>
{{
ChangeLog
}}
</div>
</q-popup-proxy>
</div>
<div
v-if=
"scope.row.OtherMoney"
>
额外奖励:
{{
scope
.
row
.
OtherMoney
}}
</div>
<div
v-if=
"scope.row.OtherMoney"
>
额外奖励:
{{
scope
.
row
.
OtherMoney
}}
</div>
<div
v-if=
"scope.row.BackMoney"
>
额外扣除:
{{
scope
.
row
.
BackMoney
}}
</div>
<div
v-if=
"scope.row.BackMoney"
>
额外扣除:
{{
scope
.
row
.
BackMoney
}}
</div>
<div
v-if=
"scope.row.GiveOutMoney"
>
累计已发:
{{
scope
.
row
.
GiveOutMoney
}}
</div>
<div
v-if=
"scope.row.GiveOutMoney"
>
累计已发:
{{
scope
.
row
.
GiveOutMoney
}}
</div>
...
@@ -231,6 +239,7 @@ import {
...
@@ -231,6 +239,7 @@ import {
}
from
'../../../api/system/index'
;
}
from
'../../../api/system/index'
;
import
{
import
{
getSellAchievementsUserDetailList
,
getSellAchievementsUserDetailList
,
getSellAchievementsChangeLog
}
from
'../../../api/finance/index'
}
from
'../../../api/finance/index'
import
{
import
{
getClassDropDownList
,
getClassDropDownList
,
...
@@ -264,6 +273,7 @@ export default {
...
@@ -264,6 +273,7 @@ export default {
department
:
[],
department
:
[],
ClassList
:
[],
ClassList
:
[],
allClassList
:
[],
allClassList
:
[],
ChangeLog
:
''
,
}
}
},
},
created
()
{
},
created
()
{
},
...
@@ -429,7 +439,20 @@ export default {
...
@@ -429,7 +439,20 @@ export default {
EndMonth
:
EndMonth
,
EndMonth
:
EndMonth
,
comefrom
:
1
,
comefrom
:
1
,
});
});
}
},
getmingxi
(
row
){
//明细
getSellAchievementsChangeLog
({
OrderId
:
row
.
OrderId
,
UserId
:
row
.
UserId
,
UserType
:
row
.
UserType
,
IsDept
:
row
.
IsDept
,
}).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
this
.
ChangeLog
=
res
.
Data
}
});
}
},
},
}
}
</
script
>
</
script
>
...
...
src/pages/financial/market/marketStatistics.vue
View file @
4cb4797f
...
@@ -208,7 +208,8 @@
...
@@ -208,7 +208,8 @@
import
{
import
{
getSellAchievementsStatistics
,
getSellAchievementsStatistics
,
getSellAchievementsPeriodsList
getSellAchievementsPeriodsList
,
getSellAchievementsChangeLog
}
from
'../../../api/finance/index'
}
from
'../../../api/finance/index'
import
{
import
{
getClassDropDownList
,
getClassDropDownList
,
...
...
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