Skip to content

S
SuperMan
Commit 5a14f5ce authored by zhengke's avatar zhengke
Browse files
Options

no message

parent a02c9ae1
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 45 deletions
src/assets/css/cssReset.css
View file @ 5a14f5ce
...@@ -847,10 +847,12 @@ input:-webkit-autofill { ...@@ -847,10 +847,12 @@ input:-webkit-autofill {
background-color: #E95252!important; background-color: #E95252!important;
color: #fff; color: #fff;
} }
.el-checkbox__input.is-indeterminate .el-checkbox__inner{
background-color: #E95252!important;
border-color:#E95252!important;
}
.el-checkbox__input.is-checked .el-checkbox__inner { .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #E95252!important; background-color: #E95252!important;
;
border-color: #E95252!important; border-color: #E95252!important;
} }
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue
View file @ 5a14f5ce
<style> <style scoped>
.CM_look { .CM_look {
padding: 4px !important; padding: 4px !important;
position: relative; position: relative;
...@@ -19,6 +19,14 @@ ...@@ -19,6 +19,14 @@
text-decoration: underline; text-decoration: underline;
color: red; color: red;
} }
/deep/.el-checkbox__input.is-checked .el-checkbox__inner{
background-color: #E95252!important;
border-color:#E95252!important;
}
/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner{
background-color: #E95252!important;
border-color:#E95252!important;
}
</style> </style>
<template> <template>
<div class="flexOne domesticCommission"> <div class="flexOne domesticCommission">
...@@ -92,7 +100,57 @@ ...@@ -92,7 +100,57 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'> layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination> </el-pagination>
<!-- 制单人员选择 -->
<el-dialog custom-class='w1006' title="选择制单人员" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<template>
<div
class="cm_content"
style="width: 100%;margin-bottom: 35px;margin-top: 30px;"
>
<el-table
v-loading="BillMakingLoading"
ref="orderMakerList"
:data="orderMakerList"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
label="公司"
width="120">
<template slot-scope="scope">{{ scope.row.BranchName }}</template>
</el-table-column>
<el-table-column
prop="DeptName"
label="部门">
</el-table-column>
<el-table-column
prop="EmName"
label="姓名"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="Commission"
label="提成金额"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="是否已发放"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.IsGiveOut==2? '否':'是' }}</template>
</el-table-column>
</el-table>
</div>
<div style="margin-top: 10px">金额总额:{{ totalAmount }}</div>
</template>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
<button class="normalBtn" type="primary" @click="BillMaking">确定</button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -101,6 +159,8 @@ ...@@ -101,6 +159,8 @@
export default { export default {
data() { data() {
return { return {
orderMakerList:[],//制单人列表
outerVisible: false,
Month: moment().subtract(1, 'months').format("YYYY-MM"), Month: moment().subtract(1, 'months').format("YYYY-MM"),
msg: { msg: {
pageIndex: 1, pageIndex: 1,
...@@ -113,6 +173,14 @@ ...@@ -113,6 +173,14 @@
btnShow: false, btnShow: false,
btnLoading: false, btnLoading: false,
cMaker: false,//是否可以制单 cMaker: false,//是否可以制单
BillMakingLoading: false,
totalAmount:0,
multipleSelection:[],
BillMakingMsg:{
PeroidsId: null,
Type: 1,
EmpIds:''
}
} }
}, },
mounted() { mounted() {
...@@ -125,9 +193,20 @@ ...@@ -125,9 +193,20 @@
if (ActionMenuCode.indexOf('home_DCommissionZD') != -1) { if (ActionMenuCode.indexOf('home_DCommissionZD') != -1) {
this.cMaker = true; this.cMaker = true;
} }
this.getList(); this.getList()
}, },
methods: { methods: {
handleSelectionChange(val){
this.multipleSelection = val;
let zong = 0;
this.multipleSelection.forEach((x) => {
zong += x.Commission;
});
this.totalAmount = zong;
},
closeChangeMachie(done){//弹出框关闭初始化弹框内表单
done();
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
...@@ -182,52 +261,79 @@ ...@@ -182,52 +261,79 @@
} }
); );
}, },
YijianZD(item) { // 保存制单人员
// this.Error("该功能暂未开发!") BillMaking(){
return
let Money if(this.multipleSelection.length==0){
if (this.msg.OutBranchId > -1) { this.Error("请选择需要制单的人员！")
if (item.BranchCommission > 0) { return
Money = item.BranchCommission
} else {
this.Error("公司提成为0,不能制单!")
return;
}
} else {
Money = item.SumPrice
} }
let obj = { if(this.totalAmount==0){
CostType: 112, this.Error("金额总额必须大于0！")
Money: Money, return
// CurrencyId: 1,
// XSTC: 1,
OtherType: 48,
ReFinanceId: item.Id,
SelectState: true,
OrderSource: 8,
OrderID: 0,
} }
let data = []
this.multipleSelection.map(item=>{
data.push(item.EmpId)
})
this.BillMakingMsg.EmpIds = data.join(',')
let query = { let query = {
blank: "y", blank: "y",
tab: "新增付款单据", tab: "新增付款单据",
Type: 2, Type: 2,
IsUploadPic: 1, orderObj: JSON.stringify(this.BillMakingMsg)
orderObj: JSON.stringify(obj)
}
if (this.msg.OutBranchId > -1) {
query.id = 31
query.Name = "分公司销售提成单"
} else {
query.id = 29
query.Name = "总部销售提成单"
} }
this.$router.push({ this.$router.push({
path: "/addFinancialDocuments", path: "/ChoiceAddFinancialDocuments",
query query
}); });
this.outerVisible = false
return
this.crmapipost(
'/api/Commission/SetCommissionSendEmployee', this.BillMakingMsg,
res => {
if (res.data.resultCode == 1) {
this.Success('制单人员选择成功')
} else {
this.Error(res.data.message)
}
this.outerVisible = false
this.BillMakingMsg = {
PeroidsId: null,
Type: 1,
EmpIds:''
}
},
err => {}
)
},
// 点击制单
YijianZD(item) {
this.outerVisible = true
this.GetCommissionSendEmployeeList(item)
},
// 获取可制单人员
GetCommissionSendEmployeeList(item){
this.BillMakingMsg.PeroidsId = item.Id
let msg = {
PeroidsId: this.BillMakingMsg.PeroidsId,
Type: this.BillMakingMsg.Type
}
this.crmapipost(
'/api/Commission/GetCommissionSendEmployeeList', msg,
res => {
if (res.data.resultCode == 1) {
this.BillMakingLoading = false;
this.orderMakerList = res.data.data;
// this.total = res.data.data.count;
} else {
this.BillMakingLoading = false;
this.Error(res.data.message)
}
},
err => {}
)
}, },
gofinancialdetail(id) { gofinancialdetail(id) {
this.$router.push({ this.$router.push({
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue
View file @ 5a14f5ce
<style> <style scoped>
.CM_look { .CM_look {
padding: 4px !important; padding: 4px !important;
position: relative; position: relative;
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
.domesticCommissionUser .opUl li input{ .domesticCommissionUser .opUl li input{
height: 34px !important; height: 34px !important;
} }
.domesticCommissionUser .singeRowTable{
/* position: absolute; */
}
.domesticCommissionUser .singeRowTable tr td { .domesticCommissionUser .singeRowTable tr td {
padding: 8px 5px; padding: 8px 5px;
} }
...@@ -21,6 +24,18 @@ ...@@ -21,6 +24,18 @@
text-decoration: underline; text-decoration: underline;
color: red; color: red;
} }
.text-fixed{
/* height: 100%;
position: absolute;
left: 0;
top: 0; */
}
.cursor-p{
cursor: pointer;
}
.cursor-p:hover{
color: #409EFF;
}
</style> </style>
<template> <template>
<div class="flexOne domesticCommissionUser"> <div class="flexOne domesticCommissionUser">
...@@ -84,9 +99,10 @@ ...@@ -84,9 +99,10 @@
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
<td>{{item.ProfitMoney}}</td> <td>{{item.ProfitMoney}}</td>
<td>{{item.EmpType!=1?item.LureNum:'-'}}</td> <td>{{item.EmpType!=1?item.LureNum:'-'}}</td>
<td>{{item.EmpType!=1?item.OrderNum:'-'}}</td> <td>{{item.EmpType!=1?item.OrderNum:'-'}}</td>
<td>{{item.WageType!=1?'上季度定档':'新员工比例'}}</td> <td @click="GenerateScale(item)">
<span class="cursor-p">{{item.WageType!=1?'上季度定档':'新员工比例'}}</span>
</td>
<td>{{item.WageMoney}}</td> <td>{{item.WageMoney}}</td>
<td>{{item.Commission}}</td> <td>{{item.Commission}}</td>
<td>{{item.BonusMoney}}</td> <td>{{item.BonusMoney}}</td>
...@@ -109,7 +125,132 @@ ...@@ -109,7 +125,132 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'> layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination> </el-pagination>
<!-- 查看生成比例 -->
<el-dialog custom-class='w1006' title="员工生成比例" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<template>
<div
class="cm_content"
style="width: 100%;margin-bottom: 35px;margin-top: 30px;"
>
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<tr>
<th width="100" style="min-width: 100px;max-width: 100px;">工资</th>
<th width="100" style="min-width: 100px;max-width: 100px;">提成比例</th>
<th width="100" style="min-width: 100px;max-width: 100px;">平均引流数量</th>
<th width="100" style="min-width: 100px;max-width: 100px;">平均成交单数</th>
</tr>
<tr>
<td>
<span>{{commissionratioList.WageMoney}}</span>
</td>
<td>
<span>{{commissionratioList.CommissionRate}}</span>
</td>
<td style="padding: 0 10px;">
<span>
{{commissionratioList.AvgLureNum}}
</span>
</td>
<td style="padding: 0 10px;">
<span>
{{commissionratioList.AvfOrderNum}}
</span>
</td>
</tr>
</table>
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
v-loading="loading">
<tr>
<th>期数</th>
<th>类型</th>
<th>利润</th>
<th>引流数量</th>
<th>成交订单</th>
</tr>
<tr v-for="(item,index) in commissionratioList.List"
:key="index">
<td>{{item.Month}}</td>
<td>{{item.EmpType!=1?'引流':'销售'}}</td>
<td>{{item.ProfitMoney}}</td>
<td>{{item.LureNum}}</td>
<td>{{item.OrderNum}}</td>
</tr>
<tr>
<td colspan="1">平均利润：</td>
<td colspan="4">{{commissionratioList.AvgProfit}}</td>
</tr>
</table>
<!-- <div style="width:100%;overflow-x: auto;">
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
>
<tr>
<td rowspan="2" width="100" style="min-width: 100px;" class="text-fixed">工资</td>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in commissionratioList.WageRateList"
:key="sIndex"
>
<template v-if="EmpType==2">
{{ '平均引流 '+son.StartValue+' 条, ' }} <span>{{son.EndValue && son.EndValue!=-1?'成交 ':'成交 '}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue+' 单' }}</span>
</template>
<template v-if="EmpType==1">
{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<平均利润<=':'<平均利润'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span>
</template>
</th>
</tr>
<tr>
<td style="min-width: 220px;" v-for="( son , sIndex ) in commissionratioList.WageRateList" :key="sIndex">{{ son.Rate }}</td>
</tr>
</table>
</div>
<div style="width:100%;overflow-x: auto;">
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
>
<tr>
<td rowspan="2" width="100" style="min-width: 100px;" class="text-fixed">提成比例</td>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in commissionratioList.CommissionRateList"
:key="sIndex"
>{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<平均利润<=':'<平均利润'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span></th>
</tr>
<tr>
<td style="min-width: 220px;" v-for="( son , sIndex ) in commissionratioList.CommissionRateList" :key="sIndex">{{ son.Rate }}%</td>
</tr>
</table>
</div> -->
</div>
<!-- <div v-if="commissionratioList.length==0"
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
>暂无数据</div> -->
</template>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
<button class="normalBtn" type="primary" @click="outerVisible = false">确定</button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -118,6 +259,9 @@ ...@@ -118,6 +259,9 @@
export default { export default {
data() { data() {
return { return {
EmpType:'',
commissionratioList:[],//提成比例
outerVisible:false,//提成比例弹窗
Month: moment().format("YYYY-MM"), Month: moment().format("YYYY-MM"),
msg: { msg: {
pageIndex: 1, pageIndex: 1,
...@@ -152,6 +296,29 @@ ...@@ -152,6 +296,29 @@
this.GetCommissionPeroidsList()//期数 this.GetCommissionPeroidsList()//期数
}, },
methods: { methods: {
closeChangeMachie(done){//弹出框关闭初始化弹框内表单
done();
},
// 获取员工生成比例
GenerateScale(item){
// if(!item.WageReId){
// return
// }
this.EmpType = item.EmpType
let msg = {
WageReId:item.WageReId?item.WageReId:6
}
this.crmapipost(
"/api/Commission/GetCommissionSource",msg,res => {
if (res.data.resultCode == 1) {
this.outerVisible = true
this.commissionratioList = res.data.data
} else {
this.Error(res.data.message);
}
}
);
},
GetCommissionPeroidsList() { //期数下拉 GetCommissionPeroidsList() { //期数下拉
this.crmapipost( this.crmapipost(
"/api/Commission/GetCommissionPeroidsList",{},res => { "/api/Commission/GetCommissionPeroidsList",{},res => {
......
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