Commit 4cb4797f authored by Mac's avatar Mac

1

parent 4457a195
...@@ -171,10 +171,18 @@ ...@@ -171,10 +171,18 @@
<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 <!-- <div
v-if="scope.row.TotalCommissionMoney" v-if="scope.row.TotalCommissionMoney"
style="color: rgb(255, 156, 0);" style="color: rgb(255, 156, 0);"
>应发:{{ scope.row.TotalCommissionMoney }}</div> >应发:{{ 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>
...@@ -231,6 +239,7 @@ import { ...@@ -231,6 +239,7 @@ import {
} from '../../../api/system/index'; } from '../../../api/system/index';
import { import {
getSellAchievementsUserDetailList, getSellAchievementsUserDetailList,
getSellAchievementsChangeLog
} from '../../../api/finance/index' } from '../../../api/finance/index'
import { import {
getClassDropDownList, getClassDropDownList,
...@@ -264,6 +273,7 @@ export default { ...@@ -264,6 +273,7 @@ export default {
department: [], department: [],
ClassList: [], ClassList: [],
allClassList: [], allClassList: [],
ChangeLog:'',
} }
}, },
created() { }, created() { },
...@@ -429,7 +439,20 @@ export default { ...@@ -429,7 +439,20 @@ export default {
EndMonth: EndMonth, EndMonth: EndMonth,
comefrom: 1, comefrom: 1,
}); });
} },
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
}
});
}
}, },
} }
</script> </script>
......
...@@ -208,7 +208,8 @@ ...@@ -208,7 +208,8 @@
import{ import{
getSellAchievementsStatistics, getSellAchievementsStatistics,
getSellAchievementsPeriodsList getSellAchievementsPeriodsList,
getSellAchievementsChangeLog
} from '../../../api/finance/index' } from '../../../api/finance/index'
import { import {
getClassDropDownList, getClassDropDownList,
......
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