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
1f000930
Commit
1f000930
authored
Jul 27, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
活动提成统计
parent
8e380c29
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
343 additions
and
5 deletions
+343
-5
index.js
src/api/finance/index.js
+17
-0
activeOrder-item.vue
src/components/sale/activeOrder-item.vue
+1
-0
activityCommissionForOrderList.vue
...s/financial/reportform/activityCommissionForOrderList.vue
+4
-1
activityDeploy.vue
src/pages/financial/reportform/activityDeploy.vue
+3
-3
activityStatistics.vue
src/pages/financial/reportform/activityStatistics.vue
+313
-0
routes.js
src/router/routes.js
+5
-1
No files found.
src/api/finance/index.js
View file @
1f000930
...
...
@@ -303,6 +303,23 @@ export function setActivityCommissionSendEmployee(data) {
});
}
// 获取活动提成总统计
export
function
getActivityCommissionStatistics
(
data
)
{
return
request
({
url
:
'/Activity/GetActivityCommissionStatistics'
,
method
:
'post'
,
data
});
}
// 获取活动期数下拉列表
export
function
getActivityCommissionPeriodsList
(
data
)
{
return
request
({
url
:
'/Activity/GetActivityCommissionPeriodsList'
,
method
:
'post'
,
data
});
}
src/components/sale/activeOrder-item.vue
View file @
1f000930
...
...
@@ -1334,6 +1334,7 @@
gourlactive
(
item
){
this
.
OpenNewUrl
(
'/financial/reportform/activityCommissionForOrderList'
,
{
ActivityId
:
item
.
ActivityId
,
OrderId
:
item
.
Id
});
}
}
...
...
src/pages/financial/reportform/activityCommissionForOrderList.vue
View file @
1f000930
...
...
@@ -106,7 +106,7 @@
//列表数据参数
msg
:
{
ActivityId
:
0
,
OrderId
:
0
,
},
pageCount
:
0
,
persistent
:
false
,
...
...
@@ -123,6 +123,9 @@
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
ActivityId
)
{
this
.
msg
.
ActivityId
=
this
.
$route
.
query
.
ActivityId
}
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
OrderId
)
{
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
}
this
.
getList
()
},
methods
:
{
...
...
src/pages/financial/reportform/activityDeploy.vue
View file @
1f000930
...
...
@@ -78,7 +78,7 @@
<div>
{{
activityobj
.
Type
==
1
?
'按人头'
:
'百分比'
}}
</div>
</div>
<div
class=
"Period_Spreate"
>
<div
class=
"Period-rule-title"
>
{{
activityobj
.
Type
==
1
?
'
提成金额'
:
'
比例'
}}
</div>
<div
class=
"Period-rule-title"
>
{{
activityobj
.
Type
==
1
?
'
活动提成金额'
:
'活动提成
比例'
}}
</div>
<div>
{{
activityobj
.
Type
==
1
?
activityobj
.
CommissionMoney
+
'元'
:
activityobj
.
CommissionMoney
+
'%'
}}
</div>
</div>
</div>
...
...
@@ -103,12 +103,12 @@
<q-radio
v-model=
"addMsg.Type"
val=
"1"
label=
"人头"
@
input=
"getradio"
/>
<q-radio
v-model=
"addMsg.Type"
val=
"2"
label=
"百分比"
@
input=
"getradio"
/>
</div>
<div
class=
"Okr_Length"
v-if=
"addMsg.Type==1"
>
金额
<span
class=
"FormItem-asterisk"
>
*
</span></div>
<div
class=
"Okr_Length"
v-if=
"addMsg.Type==1"
>
活动提成
金额
<span
class=
"FormItem-asterisk"
>
*
</span></div>
<el-input
v-if=
"addMsg.Type==1"
type=
"text"
v-model=
"addMsg.CommissionMoney"
style=
"margin: 10px 0;"
onkeyup=
"this.value= this.value.match(/\d+(\.\d
{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''" size="small">
<template
slot=
"append"
>
元
</
template
>
</el-input>
<div
class=
"Okr_Length"
v-if=
"addMsg.Type==2"
>
百分比
<span
class=
"FormItem-asterisk"
>
*
</span></div>
<div
class=
"Okr_Length"
v-if=
"addMsg.Type==2"
>
活动提成比例
<span
class=
"FormItem-asterisk"
>
*
</span></div>
<el-input
v-if=
"addMsg.Type==2"
type=
"number"
:min=
'1'
:max=
'100'
v-model=
"addMsg.CommissionMoney"
style=
"margin: 10px 0;"
@
input=
"getbaifenbi"
size=
"small"
>
<
template
slot=
"append"
>
%
</
template
>
</el-input>
...
...
src/pages/financial/reportform/activityStatistics.vue
0 → 100644
View file @
1f000930
This diff is collapsed.
Click to expand it.
src/router/routes.js
View file @
1f000930
...
...
@@ -583,7 +583,11 @@ const routes = [{
component
:
()
=>
import
(
"pages/financial/reportform/activityCommissionUserList.vue"
)
},
{
path
:
"/financial/reportform/activityStatistics"
,
//工作台 获取活动提成统计
component
:
()
=>
import
(
"pages/financial/reportform/activityStatistics.vue"
)
},
{
...
...
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