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
021b4496
Commit
021b4496
authored
May 10, 2022
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整返佣显示和修改服务人员BUG
parent
cac8dfc1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1656 additions
and
1145 deletions
+1656
-1145
student-Assit.vue
src/components/school/student/student-Assit.vue
+368
-262
performanceCommission.vue
src/pages/financial/reportform/performanceCommission.vue
+110
-66
ReturnUserList.vue
src/pages/financial/returnPassbook/ReturnUserList.vue
+495
-363
returnpassbookStatistics.vue
...ges/financial/returnPassbook/returnpassbookStatistics.vue
+683
-454
No files found.
src/components/school/student/student-Assit.vue
View file @
021b4496
This diff is collapsed.
Click to expand it.
src/pages/financial/reportform/performanceCommission.vue
View file @
021b4496
<
style
scoped
>
@import
"../css/cssReset.css"
;
.January
{
background-color
:
#
B3E5FC
;
.January
{
background-color
:
#
b3e5fc
;
}
.February
{
background-color
:
#
C8E6C
9
;
.February
{
background-color
:
#
c8e6c
9
;
}
.March
{
background-color
:
#
FFCCD
2
;
.March
{
background-color
:
#
ffccd
2
;
}
.April
{
background-color
:
#
F8DDE
0
;
.April
{
background-color
:
#
f8dde
0
;
}
.May
{
background-color
:
#
E1BEE
7
;
.May
{
background-color
:
#
e1bee
7
;
}
.June
{
background-color
:
#
D1C4E
9
;
.June
{
background-color
:
#
d1c4e
9
;
}
.July
{
background-color
:
#
C5CAE
9
;
.July
{
background-color
:
#
c5cae
9
;
}
.August
{
background-color
:
#
F0F4C
3
;
.August
{
background-color
:
#
f0f4c
3
;
}
.September
{
background-color
:
#
FFF9C
4
;
.September
{
background-color
:
#
fff9c
4
;
}
.October
{
background-color
:
#
FFECB
3
;
.October
{
background-color
:
#
ffecb
3
;
}
.November
{
background-color
:
#
FFE0B
2
;
.November
{
background-color
:
#
ffe0b
2
;
}
.December
{
background-color
:
#
FFCCBC
;
.December
{
background-color
:
#
ffccbc
;
}
.singeRowTable
tr
:nth-child
(
2n
+
1
)
{
background
:
none
;
...
...
@@ -85,7 +85,7 @@
border
:
1px
solid
#d2d2d2
;
}
.SubtotalBj
{
background-color
:
#
A5A5A
5
;
background-color
:
#
a5a5a
5
;
}
.stulistNumber
{
...
...
@@ -121,8 +121,15 @@
<div
class=
"col-3"
>
<q-field
filled
dense
>
<template
v-slot:control
>
<el-date-picker
v-model=
"dateArray[0]"
style=
"width:100%"
value-format=
"yyyy-MM"
@
change=
"resetSearch()"
size=
"small"
type=
"month"
placeholder=
"选择开始年月"
>
<el-date-picker
v-model=
"dateArray[0]"
style=
"width:100%"
value-format=
"yyyy-MM"
@
change=
"resetSearch()"
size=
"small"
type=
"month"
placeholder=
"选择开始年月"
>
</el-date-picker>
</
template
>
</q-field>
...
...
@@ -130,20 +137,35 @@
<div
class=
"col-3"
>
<q-field
filled
dense
>
<
template
v-slot:control
>
<el-date-picker
v-model=
"dateArray[1]"
style=
"width:100%"
value-format=
"yyyy-MM"
@
change=
"resetSearch()"
size=
"small"
type=
"month"
placeholder=
"选择结束年月"
>
<el-date-picker
v-model=
"dateArray[1]"
style=
"width:100%"
value-format=
"yyyy-MM"
@
change=
"resetSearch()"
size=
"small"
type=
"month"
placeholder=
"选择结束年月"
>
</el-date-picker>
</
template
>
</q-field>
</div>
</div>
</div>
<div
class=
"page-search row items-center"
style=
"justify-content: space-between;"
>
<div></div>
<q-btn
color=
"primary"
size=
"11px"
label=
"导出"
@
click=
"tcexport"
style=
"margin-left:10px"
/>
<div
class=
"page-search row items-center"
style=
"justify-content: space-between;"
>
<div></div>
<q-btn
color=
"primary"
size=
"11px"
label=
"导出"
@
click=
"tcexport"
style=
"margin-left:10px"
/>
</div>
<div
style=
"width: 100%;margin-top: 20px"
>
<div
style=
"width: 100%;overflow-x: auto;"
>
<table
...
...
@@ -171,18 +193,33 @@
style=
"min-width: 500px;"
v-for=
"(item, index) in RListlength"
:key=
"index"
:class=
"item.Month.slice(6)==1?'January':
(item.Month.slice(6)==2?'February':
(item.Month.slice(6)==3?'March':
(item.Month.slice(6)==4?'April':
(item.Month.slice(6)==5?'May':
(item.Month.slice(6)==6?'June':
(item.Month.slice(6)==7?'July':
(item.Month.slice(6)==7?'August':
(item.Month.slice(6)==7?'September':
(item.Month.slice(5)==10?'October':
(item.Month.slice(5)==11?'November':
(item.Month.slice(5)==12?'December':'')))))))))))"
:class=
"
item.Month.slice(6) == 1
? 'January'
: item.Month.slice(6) == 2
? 'February'
: item.Month.slice(6) == 3
? 'March'
: item.Month.slice(6) == 4
? 'April'
: item.Month.slice(6) == 5
? 'May'
: item.Month.slice(6) == 6
? 'June'
: item.Month.slice(6) == 7
? 'July'
: item.Month.slice(6) == 7
? 'August'
: item.Month.slice(6) == 7
? 'September'
: item.Month.slice(5) == 10
? 'October'
: item.Month.slice(5) == 11
? 'November'
: item.Month.slice(5) == 12
? 'December'
: ''
"
>
<span
v-if=
"item.Month.slice(5) < 10"
>
{{
item.Month.slice(6)
...
...
@@ -208,7 +245,7 @@
v-for=
"(item, index) in dataList"
:key=
"index"
v-if=
"dataList && dataList.length > 0"
:class=
"item.RoleName
=='小计'
? 'SubtotalBj' : ''"
:class=
"item.RoleName
== '小计'
? 'SubtotalBj' : ''"
>
<td
style=
" border: 1px solid #d2d2d2;"
>
{{ item.DeptName }}
...
...
@@ -219,14 +256,16 @@
<td>
{{ item.EmpName }}
</td>
<td
v-for=
"(x, y) in titlelist"
:key=
"y"
>
<td
v-for=
"(x, y) in titlelist"
:key=
"y"
>
<div
v-if=
"item.MonthList[x.index]"
>
<div
v-if=
"x.Id == 1"
>
<span>
{{ item.MonthList[x.index].Achievement }}
</span>
</div>
<div
v-if=
"x.Id == 2"
style=
"padding: 7px;"
>
<span>
{{ item.MonthList[x.index].Rate }}
</span>
<span
>
{{ item.MonthList[x.index].Rate
}}{{ item.MonthList[x.index].Rate ? "%" : "" }}
</span
>
</div>
<div
v-if=
"x.Id == 3"
style=
"padding: 3px;"
>
<span>
{{ item.MonthList[x.index].Rebate }}
</span>
...
...
@@ -295,7 +334,7 @@ export default {
dataList
:
[],
//列表数据
dateArray
:
[],
//日期数组
RListlength
:
0
,
titlelist
:
[]
,
titlelist
:
[]
};
},
created
()
{},
...
...
@@ -309,18 +348,23 @@ export default {
this
.
getList
();
//获取数据
},
methods
:
{
tcexport
(){
//导出
var
msg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
msg
));
EduDownLoad
(
"/SellAchievements/GetSellAchievementsRankStatToExcel"
,
msg
,
"业绩提成排名.xls"
)
tcexport
()
{
//导出
var
msg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
msg
));
EduDownLoad
(
"/SellAchievements/GetSellAchievementsRankStatToExcel"
,
msg
,
"业绩提成排名.xls"
);
},
resetSearch
()
{
if
(
!
this
.
dateArray
[
0
]
||!
this
.
dateArray
[
1
])
{
if
(
!
this
.
dateArray
[
0
]
||
!
this
.
dateArray
[
1
])
{
this
.
$q
.
notify
({
type
:
'negative'
,
type
:
"negative"
,
position
:
"top"
,
message
:
`请选择开始和结束时间`
})
return
})
;
return
;
}
this
.
msg
.
pageIndex
=
1
;
this
.
getList
();
...
...
@@ -379,27 +423,27 @@ export default {
for
(
let
i
=
0
;
i
<
this
.
RListlength
.
length
;
i
++
)
{
let
obj
=
[
{
Name
:
"业绩"
,
Name
:
"
一般
业绩"
,
Id
:
1
,
index
:
i
},
{
Name
:
"
业绩比例
"
,
Id
:
2
,
Name
:
"
返佣总额
"
,
Id
:
3
,
index
:
i
},
{
Name
:
"
订单返佣
"
,
Id
:
3
,
Name
:
"
业绩比例
"
,
Id
:
2
,
index
:
i
},
{
Name
:
"提成"
,
Name
:
"
销售
提成"
,
Id
:
4
,
index
:
i
},
{
Name
:
"
返佣金额
"
,
Name
:
"
销售佣金
"
,
Id
:
5
,
index
:
i
},
...
...
@@ -409,7 +453,7 @@ export default {
index
:
i
},
{
Name
:
"合计"
,
Name
:
"
销售收入
合计"
,
Id
:
7
,
index
:
i
}
...
...
@@ -420,7 +464,7 @@ export default {
.
catch
(()
=>
{
this
.
loading
=
false
;
});
}
,
}
}
};
</
script
>
...
...
src/pages/financial/returnPassbook/ReturnUserList.vue
View file @
021b4496
This diff is collapsed.
Click to expand it.
src/pages/financial/returnPassbook/returnpassbookStatistics.vue
View file @
021b4496
This diff is collapsed.
Click to expand it.
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