Commit 4457a195 authored by Mac's avatar Mac

修改

parent f2facf90
...@@ -743,6 +743,17 @@ export function GetBonusPlan(data) { ...@@ -743,6 +743,17 @@ export function GetBonusPlan(data) {
}); });
} }
/**
* 业绩提成 提成明细界面 查询应发提成 变更记录
*/
export function getSellAchievementsChangeLog(data) {
return request({
url: '/SellAchievements/GetSellAchievementsChangeLog',
method: 'post',
data
});
}
......
...@@ -88,7 +88,14 @@ ...@@ -88,7 +88,14 @@
</el-table-column> </el-table-column>
<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 v-if="scope.row.TotalCommissionMoney" style="color: rgb(255, 156, 0);">应发:{{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>
...@@ -150,6 +157,7 @@ ...@@ -150,6 +157,7 @@
} from '../../../api/system/index'; } from '../../../api/system/index';
import { import {
getSellAchievementsForOrderList, getSellAchievementsForOrderList,
getSellAchievementsChangeLog
} from '../../../api/finance/index' } from '../../../api/finance/index'
import { import {
getClassDropDownList, getClassDropDownList,
...@@ -183,6 +191,7 @@ ...@@ -183,6 +191,7 @@
DeptNamelist: [], DeptNamelist: [],
UserNamelist: [], UserNamelist: [],
see_tcdetailed: false, see_tcdetailed: false,
ChangeLog:'',
} }
}, },
...@@ -341,6 +350,18 @@ ...@@ -341,6 +350,18 @@
// EnterID:row.UserId // EnterID:row.UserId
}); });
}, },
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
}
});
}
......
...@@ -201,19 +201,7 @@ ...@@ -201,19 +201,7 @@
>当期课时:{{ scope.row.CurrentHours >= 0 ? scope.row.CurrentHours : '-' }}</div> >当期课时:{{ scope.row.CurrentHours >= 0 ? scope.row.CurrentHours : '-' }}</div>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="TotalHours" label="总课时"> </el-table-column>
<el-table-column width='110' prop="TotalLearn" label="已学习课时">
<template slot-scope="scope">
<div >
{{scope.row.TotalLearn}}
</div>
</template>
</el-table-column>
<el-table-column width='110' prop="CurrentHours" label="当期消费课时">
<template slot-scope="scope">
<div>{{scope.row.CurrentHours>=0 ?scope.row.CurrentHours:'-'}}</div>
</template>
</el-table-column>-->
<el-table-column width="160" prop="CurrentPeriodMoney" label="当期发放信息"> <el-table-column width="160" prop="CurrentPeriodMoney" label="当期发放信息">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
......
...@@ -144,7 +144,14 @@ ...@@ -144,7 +144,14 @@
</el-table-column> </el-table-column>
<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 style="color: rgb(255, 156, 0);">应发:{{scope.row.TotalCommissionMoney}}</div> <div 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>累计已发:{{scope.row.GiveOutMoney}}</div> <div>累计已发:{{scope.row.GiveOutMoney}}</div>
</template> </template>
...@@ -253,6 +260,7 @@ ...@@ -253,6 +260,7 @@
AllemployeeList: [], //所有员工 AllemployeeList: [], //所有员工
PeriodsList:[],//周期列表 PeriodsList:[],//周期列表
TotalCommission:0, TotalCommission:0,
ChangeLog:'',
} }
}, },
created() { created() {
...@@ -441,6 +449,18 @@ ...@@ -441,6 +449,18 @@
// EnterID:row.UserId // EnterID:row.UserId
}); });
}, },
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
}
});
}
}, },
} }
......
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