Skip to content

C
confucius
Commit 2d112cab authored by Mac's avatar Mac
Browse files
Options

解决冲突

parents 2cd1d1fc 01476801
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 29 deletions
src/api/finance/index.js
View file @ 2d112cab
......@@ -777,6 +777,18 @@ export function GetBonusPlan(data) {
});
}
/**
* 员工人头奖励 详情
*/
export function GetPersonnelPeriodDetails(data) {
return request({
url: '/Bonus/GetPersonnelPeriodDetails',
method: 'post',
data
});
}
......
src/pages/financial/market/empBonus.vue
View file @ 2d112cab
<style>
</style>
<template>
<div class="page-body empBonus">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div>
<div class="block" style="display:flex">
<span style="margin-right: 5px;">选择月份</span>
<el-date-picker v-model="value2" type="month" placeholder="选择月">
</el-date-picker>
<q-btn :loading="loading1"  color="primary"  size="11px"  label="生成提成"  @click="createBonus"
 style="margin-left:10px" />
</div>
</div>
</div>
</div>
<template>
<el-table ref="filterTable" :data="dataList" v-loading='loading'
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
<el-table-column prop="Periods" label="周期"></el-table-column>
<el-table-column prop="Name" label="名称"></el-table-column>
<el-table-column prop="SumPrice" label="人头奖励总金额"> </el-table-column>
<el-table-column prop="FrIdList" label="财务单据">
<template slot-scope="scope">
</template>
</el-table-column>
<el-table-column prop="CreateByName" label="创建人"> </el-table-column>
<el-table-column prop="CreateTime" label="创建时间"> </el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div class="_icon_btn">
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="制单" placement="top" >
<i class="iconfont icon-add" ></i>
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table>
<div style="margin-top: 10px;text-align: center;">
<el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper"
:current-page.sync="msg.PageIndex" :page-size="msg.PageSize" :total='pageCount'>
</el-pagination>
</div>
</template>
</div>
</template>
<script>
import {
getSchoolDropdown
} from '../../../api/school/index'
CreateEmpBonus,
queryPersonnelPeriodPage
} from '../../../api/finance/index'
export default {
meta: {
title: "员工人头奖励"
},
props: {},
components: {
selectTree
},
data() {
return {
loading: false,
loading1: false,
//列表数据参数
msg: {
PageIndex: 1,
PageSize: 10,
},
pageCount: 0,
total: 0,
dataList: [],
value2: "",
}
},
created() {
let userinfo = this.getLocalStorage();
},
mounted() {
this.getList();
},
methods: {
//生成提成
createBonus() {
console.log("value2", this.value2);
},
//获取分页列表
getList() {
queryPersonnelPeriodPage(this.msg).then(res => {
console.log("res", res);
this.dataList = res.Data.PageData
this.pageCount = res.Data.PageCount;
});
},
handleCurrentChanges(val) {
this.msg.PageIndex = val;
this.getList()
},
//跳转详情
goUrl(Id){
this.OpenNewUrl('../market/empBonusDetail', {
Id: Id
})
}
},
}
</script>
......
src/pages/financial/market/empBonusDetail.vue 0 → 100644
View file @ 2d112cab
<style>
.empDetailDiv {
width: 400px;
height: 400px;
overflow: auto;
}
</style>
<template>
<div class="page-body empBonus">
<template>
<el-table ref="filterTable" :data="dataList" v-loading='loading'
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
<el-table-column prop="EmployeeName" label="人员名称"> </el-table-column>
<el-table-column prop="YearNum" label="年份"> </el-table-column>
<el-table-column prop="MonthNum" label="月份"> </el-table-column>
<el-table-column prop="BasicSalary" label="基本薪资"></el-table-column>
<el-table-column prop="OpenBonus" label="开单奖金"> </el-table-column>
<el-table-column prop="WorkAgeSalary" label="工龄工资"> </el-table-column>
<el-table-column prop="ClueNumSalary" label="线索奖励"> </el-table-column>
<el-table-column prop="CurGuestNum" label="当月订单人数"> </el-table-column>
<el-table-column prop="CurRewardMoney" label="当月奖励金额"> </el-table-column>
<el-table-column prop="BeforeMoney" label="以前月份的冲抵金额"></el-table-column>
<el-table-column prop="CreateByName" label="创建人"> </el-table-column>
<el-table-column prop="CreateTime" label="创建时间"> </el-table-column>
<el-table-column prop="CurOrderMoney" label="当月订单金额"> </el-table-column>
<el-table-column prop="DeductionMoney" label="待抵扣金额"> </el-table-column>
<el-table-column prop="FinishDeductionMoney" label="已抵扣金额"> </el-table-column>
<el-table-column prop="IsReachStr" label="是否达标"> </el-table-column>
<el-table-column label="操作" width="110">
<template slot-scope="scope">
<el-popover placement="left" title="标题" width="420" trigger="click">
<div class="empDetailDiv">
<el-table ref="filterTable" :data="scope.row.DetailList">
<el-table-column prop="BonusId" label="BonusId"></el-table-column>
<el-table-column prop="OrderGuestNum" label="OrderGuestNum"></el-table-column>
<el-table-column prop="OrderId" label="OrderId"> </el-table-column>
<el-table-column prop="OrderMoney" label="OrderMoney"> </el-table-column>
<el-table-column prop="OrderState" label="OrderState"> </el-table-column>
</el-table>
</div>
<el-button slot="reference" size="mini">点击查看</el-button>
</el-popover>
</template>
</el-table-column>
</el-table>
<div style="margin-top: 10px;text-align: center;">
<el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper"
:current-page.sync="msg.pageIndex" :page-size="msg.pageSize" :total='pageCount'>
</el-pagination>
</div>
</template>
</div>
</template>
<script>
import {
CreateEmpBonus,
queryPersonnelPeriodPage,
GetPersonnelPeriodDetails
} from '../../../api/finance/index'
export default {
meta: {
title: "员工人头奖励"
},
props: {},
components: {
},
data() {
return {
loading: false,
//列表数据参数
msg: {
pageIndex: 1,
pageSize: 10,
PeriodId: 0
},
pageCount: 0,
dataList: [],
}
},
created() {},
mounted() {
if (this.$route.query.Id) {
this.msg.PeriodId = this.$route.query.Id;
this.getList();
}
},
methods: {
//获取分页列表
getList() {
GetPersonnelPeriodDetails(this.msg).then(res => {
console.log("res", res);
this.dataList = res.Data.PageData
this.pageCount = res.Data.PageCount;
});
},
handleCurrentChanges(val) {
this.msg.pageIndex = val;
this.getList()
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
src/pages/test.vue
View file @ 2d112cab
......@@ -44,9 +44,7 @@
</tr>
<tr>
<td colspan="2" style="text-align:center;">
<input type="button" @click="Test(1)" value="11月" />
<input type="button" @click="Test(2)" value="订单变更" />
<input type="button" @click="Test(3)" value="12月" />
<input type="button" @click="Test()" value="执行" />
</td>
</tr>
</thead>
......@@ -158,24 +156,9 @@
tempStr = "{" + tempStr.substring(1, tempStr.length) + "}";
data = JSON.parse(tempStr);
}
if (type == 1) {
this.ActionStr = "/Bonus/CreateEmpBonus"
data = {
StartDate: "2021-11-01"
data = {
};
}
if (type == 2) {
this.ActionStr = "/Bonus/ChangeOrder"
data = {
OrderId: 1057
};
}
if (type == 3) {
this.ActionStr = "/Bonus/CreateEmpBonus"
data = {
StartDate: "2021-12-01"
};
}
var tempMsg = {
Msg: data
};
......
src/router/routes.js
View file @ 2d112cab
......@@ -749,6 +749,11 @@ const routes = [{
component: () =>
import("pages/financial/market/empBonus.vue")
},
{
path: "/financial/market/empBonusDetail", // 员工人头奖励详情
component: () =>
import("pages/financial/market/empBonusDetail.vue")
},
{
path: "/administration/document", //行政公告
component: () =>
......
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