Skip to content

C
confucius
Commit 14632dbb authored by Mac's avatar Mac
Browse files
Options

活动提成页面修改

parent 7141389f
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 43 deletions
src/components/sale/activeOrder-item.vue
View file @ 14632dbb
......@@ -72,6 +72,8 @@
<div>{{item.StartTime}}</div>
<div>活动结束时间：</div>
<div>{{item.EndTime}}</div>
<div v-if="item.IsCommission == 2" style="color:#f00;cursor: pointer;text-decoration: underline;" @click="gourlactive(item)">提成金额:{{item.CommissionPrice}}</div>
<!-- <div style="margin-top: 10px">{{item.CreateTime}}</div> -->
<template v-if="AuthorityObj.isShowName">
<div style="font-weight: bold;color:#2961FE;cursor:pointer;" @click="getClassInfo(item)">
......@@ -1328,6 +1330,11 @@
}else if(type===2){
this.$emit("refuse",item)
}
},
gourlactive(item){
this.OpenNewUrl('/financial/reportform/activityCommissionForOrderList', {
ActivityId: item.ActivityId,
});
}
}
}
......
src/pages/activity/payment.vue
View file @ 14632dbb
......@@ -270,10 +270,15 @@
<div class="pay_ListOne">当前利润</div>
<div class="pay_Inner orangeStyle">¥{{dataList.ProfitNow}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">活动提成</div>
<div class="pay_Inner">{{dataList.ActivityCommission}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">注</div>
<div class="pay_Inner">实收-(应付/实付)+其他收入-总支出</div>
<div class="pay_Inner">实收-(应付/实付)+其他收入-总支出-活动提成</div>
</div>
</div>
<!-- <div class="col paymentList">
<div class="pay_topList">
......
src/pages/financial/activityCommission.vue
View file @ 14632dbb
......@@ -133,7 +133,6 @@
GetClassTypePageList,
} from '../../api/system/index';
import{
setSellCommissionInfo,//生成提成
getActivityCommissionSendEmployeeList,//获取发放用户
setActivityCommissionSendEmployee,//设置发放用户
getActivityCommissionPeriodsPageList,//获取提成列表
......@@ -202,8 +201,11 @@
scCommission(){//生成提成
if(this.loading1 == false){
this.loading1= true;
setSellCommissionInfo({Month:this.value2}).then(res => {
if (res.Code == 1) {
let CreateBy = this.getLocalStorage().Id;
this.apipostDS("/api/Education/SetActivityCommissionInfo",{Month:this.value2,CreateBy:CreateBy}, (res) => {
this.loading = false
if (res.data.resultCode === 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
......@@ -212,10 +214,14 @@
position: 'top'
})
this.getList()
}else{
this.$q.notify({
type: 'negative',
position: "top",
message: res.data.message
})
}
this.loading1= false;
}).catch(err=>{
this.loading1= false;
})
}
},
......@@ -261,7 +267,7 @@
tab: "新增付款单据",
Type: 2,
IsUploadPic: 1,
Name:'销售提成单',
Name:'活动提成单',
id:143,
orderObj: JSON.stringify(obj)
}
......@@ -274,7 +280,7 @@
tishi(Money,Id){
let that = this
this.$q.dialog({
title: "销售制单",
title: "活动制单",
message: "你正在进行所有活动一起制单操作？",
persistent: true,
cancel: {
......
src/pages/financial/reportform/activityCommissionDetails.vue
View file @ 14632dbb
......@@ -66,19 +66,31 @@
</el-table-column>
<el-table-column prop="OrderId" label="订单号">
<template slot-scope="scope">
<div v-if="scope.row.OrderId" style="cursor: pointer;text-decoration: underline;" @click="goUrlorderList(scope.row)">
<div v-if="scope.row.OrderId" style="cursor: pointer;text-decoration: underline;" @click="goUrlactivityList(scope.row)">
{{scope.row.OrderId}}
</div>
</template>
</el-table-column>
<el-table-column prop="ActivityName" label="活动名称" > </el-table-column>
<el-table-column prop="ActivityName" label="活动名称" >
<template slot-scope="scope">
<div v-if="scope.row.ActivityName" style="cursor: pointer;text-decoration: underline;" @click="goUrlorderList(scope.row)">
{{scope.row.ActivityName}}
</div>
</template>
</el-table-column>
<el-table-column prop="ActivityTime" label="活动日期" > </el-table-column>
<el-table-column prop="DSUserName" label="报名用户" >
<template slot-scope="scope">
<div v-if="scope.row.DSUserName">
{{scope.row.DSUserName}} <span>({{scope.row.DSUserId}})</span>
</div>
</template>
</el-table-column>
<el-table-column prop="CommissionMoney" label="提成金额" sortable :sort-method="CommissionMoney">
<template slot-scope="scope">
<div style="color: rgb(233, 82, 82);">{{scope.row.CommissionMoney}}</div>
</template>
</el-table-column>
<el-table-column prop="DSUserName" label="报名用户" ></el-table-column>
<el-table-column prop="Periods" label="周期"> </el-table-column>
<el-table-column prop="Remark" label="备注" ></el-table-column>
......@@ -224,11 +236,17 @@
this.$router.push({
path: '/financial/reportform/activityCommissionForOrderList',
query: {
OrderId: row.OrderId,
ActivityId: row.ActivityId,
blank: 'y',
}
})
},
goUrlactivityList(row) {
this.OpenNewUrl('/sale/activeOrderStatistics', {
OrderId: row.OrderId,
});
},
filterHandler(value, row, column) {
const property = column['property'];
return row[property] === value;
......
src/pages/financial/reportform/activityCommissionForOrderList.vue
View file @ 14632dbb
......@@ -65,12 +65,18 @@
</el-table-column>
<el-table-column prop="ActivityName" label="活动名称"></el-table-column>
<el-table-column prop="ActivityTime" label="活动日期"></el-table-column>
<el-table-column prop="CommissionMoney" label="提成金额" sortable :sort-method="CommissionMoney">
<el-table-column prop="DSUserName" label="报名用户" >
<template slot-scope="scope">
<div v-if="scope.row.DSUserName">
{{scope.row.DSUserName}} <span>({{scope.row.DSUserId}})</span>
</div>
</template>
</el-table-column>
<el-table-column prop="CommissionMoney" label="提成金额" >
<template slot-scope="scope">
<div style="color: rgb(233, 82, 82);">{{scope.row.CommissionMoney}}</div>
</template>
</el-table-column>
<el-table-column prop="DSUserName" label="报名用户" ></el-table-column>
<el-table-column width='90' prop="Periods" label="期数"> </el-table-column>
<el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
</el-table>
......@@ -99,7 +105,7 @@
loading: false,
//列表数据参数
msg: {
OrderId: 0,
ActivityId: 0,
},
pageCount: 0,
......@@ -114,8 +120,8 @@
},
created() {},
mounted() {
if (this.$route.query && this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId
if (this.$route.query && this.$route.query.ActivityId) {
this.msg.ActivityId = this.$route.query.ActivityId
}
this.getList()
},
......@@ -170,21 +176,12 @@
return (arg1 * m + arg2 * m) / m;
},
goorderUrl(row) {
this.$router.push({
path: '/financial/cycleOrderList',
query: {
OrderId: row.OrderId,
UserId:row.UserId,
blank: 'y',
}
})
},
goreturn() {
this.$router.go(-1);
},
goUrlorderList(path,row){//订单跳转
this.OpenNewUrl(path, {
this.OpenNewUrl('/sale/activeOrderStatistics', {
OrderId: row.OrderId,
// EnterID:row.UserId
});
......
src/pages/financial/reportform/activityDeploy.vue
View file @ 14632dbb
......@@ -97,8 +97,8 @@
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeProcess">
<q-card style="margin-top:61px;width:400px" class="no-border-radius classinfo_Dialog">
<div class="baseSetForm_Dialog">
<div class="cycle_Title">周期设置</div>
<div class="Okr_Length">活动类型<span class="FormItem-asterisk">*</span></div>
<div class="cycle_Title">活动设置修改</div>
<div class="Okr_Length">提成方式<span class="FormItem-asterisk">*</span></div>
<div class="q-gutter-sm" style="margin: 10px 0;">
<q-radio v-model="addMsg.Type" val="1" label="人头" @input="getradio"/>
<q-radio v-model="addMsg.Type" val="2" label="百分比" @input="getradio"/>
......
src/pages/sale/activeOrderStatistics.vue
View file @ 14632dbb
......@@ -186,11 +186,14 @@
created() {
if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId;
this.msg.Id = this.$route.query.OrderId;
}
this.getEmployee(0);
this.getList();
},
mounted() {
this.getList();
},
methods: {
//筛选员工
......
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