Commit 1f000930 authored by Mac's avatar Mac

活动提成统计

parent 8e380c29
...@@ -303,6 +303,23 @@ export function setActivityCommissionSendEmployee(data) { ...@@ -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
});
}
...@@ -1334,6 +1334,7 @@ ...@@ -1334,6 +1334,7 @@
gourlactive(item){ gourlactive(item){
this.OpenNewUrl('/financial/reportform/activityCommissionForOrderList', { this.OpenNewUrl('/financial/reportform/activityCommissionForOrderList', {
ActivityId: item.ActivityId, ActivityId: item.ActivityId,
OrderId:item.Id
}); });
} }
} }
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
//列表数据参数 //列表数据参数
msg: { msg: {
ActivityId: 0, ActivityId: 0,
OrderId:0,
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
...@@ -123,6 +123,9 @@ ...@@ -123,6 +123,9 @@
if (this.$route.query && this.$route.query.ActivityId) { if (this.$route.query && this.$route.query.ActivityId) {
this.msg.ActivityId = 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() this.getList()
}, },
methods: { methods: {
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<div>{{activityobj.Type==1?'按人头':'百分比'}}</div> <div>{{activityobj.Type==1?'按人头':'百分比'}}</div>
</div> </div>
<div class="Period_Spreate"> <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>{{activityobj.Type==1?activityobj.CommissionMoney+'元':activityobj.CommissionMoney+'%'}}</div>
</div> </div>
</div> </div>
...@@ -103,12 +103,12 @@ ...@@ -103,12 +103,12 @@
<q-radio v-model="addMsg.Type" val="1" label="人头" @input="getradio"/> <q-radio v-model="addMsg.Type" val="1" label="人头" @input="getradio"/>
<q-radio v-model="addMsg.Type" val="2" label="百分比" @input="getradio"/> <q-radio v-model="addMsg.Type" val="2" label="百分比" @input="getradio"/>
</div> </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"> <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> <template slot="append"></template>
</el-input> </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"> <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> <template slot="append">%</template>
</el-input> </el-input>
......
This diff is collapsed.
...@@ -583,7 +583,11 @@ const routes = [{ ...@@ -583,7 +583,11 @@ const routes = [{
component: () => component: () =>
import("pages/financial/reportform/activityCommissionUserList.vue") import("pages/financial/reportform/activityCommissionUserList.vue")
}, },
{
path: "/financial/reportform/activityStatistics", //工作台 获取活动提成统计
component: () =>
import("pages/financial/reportform/activityStatistics.vue")
},
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment