Skip to content

S
SuperMan
Commit 222a1019 authored by youjie's avatar youjie
Browse files
Options

no message

parent aa452e06
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 43 deletions
src/components/FinancialModule/OpCommission/OPCommissionDetail.vue
View file @ 222a1019
......@@ -223,10 +223,10 @@
</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="11">暂无数据</td>
</tr>
</table>
<div v-if="dataList.length==0">
<div style="text-align:center">暂无数据</div>
</div>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
......@@ -296,18 +296,21 @@
let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.OutBranchId = this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
// this.msg.OutBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
// this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
this.disabled = false;
this.msg.OutBranchId = -1
this.msg.RB_Branch_Id = -1
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
// this.msg.RB_Branch_Id = -1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):-1
// this.msg.RB_Department_Id = -1
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{
this.disabled = true;
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
}
this.GetCommissionPeroidsList()//期数
......
src/components/FinancialModule/OpCommission/OPcommissionPeriods.vue
View file @ 222a1019
......@@ -60,9 +60,11 @@
<tr>
<th>期数</th>
<th>总追加工资</th>
<th>所属公司追加工资</th>
<th>总提成</th>
<th>公司提成</th>
<th>财务单据</th>
<th>财务提成单据</th>
<th>追加工资单据</th>
<th>操作信息</th>
<th>操作</th>
</tr>
......@@ -72,6 +74,7 @@
<p> {{item.SumWage>0?'+' + item.SumWage:item.SumWage}}</p>
</td>
<td>{{item.BranchWage?item.BranchWage:'-'}}</td>
<td>{{item.SumPrice}}</td>
<td>{{item.BranchCommission}}</td>
<td>
......@@ -84,6 +87,16 @@
</span>
</template>
</td>
<td>
<template v-if="item.WageFinanceIdList.length>0">
<span v-for="(x,y) in item.WageFinanceIdList">
<span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
{{x}}
</span>
{{item.FinanceIdList.length == y+1 ?'':'、'}}
</span>
</template>
</td>
<td>
<div>{{item.CreateByStr}}</div>
<div>{{item.CreateStr}}</div>
......@@ -98,16 +111,20 @@
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
<el-tooltip v-if="cMaker==true" class="item" effect="dark" content="追加工资" placement="top">
<el-button @click="YijianZD(item,1)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="当期利润" placement="top">
<el-button @click="goUrl('ImpressionCurrentProfit',item.ID,1)" type="danger" class="CM_look"
icon="iconfont icon-money" circle></el-button>
</el-tooltip> -->
</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="7">暂无数据</td>
</tr>
</table>
<div v-if="dataList.length==0">
<div style="text-align:center">暂无数据</div>
</div>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
......@@ -231,25 +248,34 @@
);
},
// 点击制单
YijianZD(item) {
YijianZD(item,type) {
if(this.msg.OutBranchId==-1){
this.Error("请选择出团公司!")
return;
}
let Money
if(this.msg.OutBranchId>-1){
if(item.BranchCommission>0){
Money=item.BranchCommission
}else{
this.Error("公司提成为0,不能制单!")
return;
}
if(type==1){
if(item.BranchWage>0){
Money = item.BranchWage
}else{
this.Error("所属公司追加工资为0,不能制单!")
return;
}
}else{
Money=item.SumPrice
if(item.BranchCommission>0){
Money=item.BranchCommission
}else{
this.Error("公司提成为0,不能制单!")
return;
}
}
let obj = {
CostType: 112,
CostType: type==1?15:112,
Money: Money,
CurrencyId: 1,
XSTC: 1,
OtherType:73,
OtherType:type==1?77:73,
ReFinanceId: item.ID,
SelectState: true,
isRB_Branch_Id: true,
......
src/components/FinancialModule/TradeCommission/TicketCommission.vue
View file @ 222a1019
......@@ -60,9 +60,11 @@
<tr>
<th>期数</th>
<th>总追加工资</th>
<th>所属公司追加工资</th>
<th>总提成</th>
<th>公司提成</th>
<th>财务单据</th>
<th>财务提成单据</th>
<th>追加工资单据</th>
<th>操作信息</th>
<th>操作</th>
</tr>
......@@ -72,6 +74,7 @@
<p> {{item.SumWage>0?'+' + item.SumWage:item.SumWage}}</p>
</td>
<td>{{item.BranchWage?item.BranchWage:'-'}}</td>
<td>{{item.SumPrice}}</td>
<td>{{item.BranchCommission}}</td>
<td>
......@@ -84,6 +87,16 @@
</span>
</template>
</td>
<td>
<template v-if="item.WageFinanceIdList.length>0">
<span v-for="(x,y) in item.WageFinanceIdList">
<span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
{{x}}
</span>
{{item.FinanceIdList.length == y+1 ?'':'、'}}
</span>
</template>
</td>
<td>
<div>{{item.CreateByStr}}</div>
<div>{{item.CreateStr}}</div>
......@@ -98,16 +111,20 @@
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
<el-tooltip v-if="cMaker==true" class="item" effect="dark" content="追加工资" placement="top">
<el-button @click="YijianZD(item,1)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="当期利润" placement="top">
<el-button @click="goUrl('ImpressionCurrentProfit',item.Id,1)" type="danger" class="CM_look"
icon="iconfont icon-money" circle></el-button>
</el-tooltip> -->
</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="7">暂无数据</td>
</tr>
</table>
<div v-if="dataList.length==0">
<div style="text-align:center">暂无数据</div>
</div>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
......@@ -258,7 +275,11 @@
);
},
// 点击制单
YijianZD(item) {
YijianZD(item,type) {
if(this.msg.OutBranchId==-1){
this.Error("请选择出团公司!")
return;
}
let Money
// if(this.msg.OutBranchId>-1){
// if(item.BranchCommission>0){
......@@ -271,18 +292,28 @@
// }else{
// Money=item.SumPrice
// }
if(type==1){
if(item.BranchWage>0){
Money = item.BranchWage
}else{
this.Error("所属公司追加工资为0,不能制单!")
return;
}
}else{
if(item.BranchCommission>0){
Money=item.BranchCommission
}else{
this.Error("公司提成为0,不能制单!")
return;
this.Error("公司提成为0,不能制单!")
return;
}
}
let obj = {
CostType: 16,
CostType: type==1?186:16,
Money: Money,
CurrencyId: 1,
XSTC: 1,
OtherType:72,
OtherType:type==1?76:72,
ReFinanceId:item.Id,
isRB_Branch_Id: true,
RB_Branch_Id: this.msg.OutBranchId
......@@ -295,11 +326,11 @@
orderObj: JSON.stringify(obj)
}
if(this.msg.OutBranchId>0){
query.id = 30
query.Name = "分公司销售提成单"
query.id = type==1?87:30
query.Name = type==1?"分公司追加工资提成单":"分公司销售提成单"
}else{
query.id = 28
query.Name = "总部销售提成单"
query.id = type==1?86:28
query.Name = type==1?"总部追加工资提成单":"总部销售提成单"
}
this.$router.push({
......
src/components/FinancialModule/TradeCommission/TicketUserDetails.vue
View file @ 222a1019
......@@ -230,10 +230,11 @@
</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="11">暂无数据</td>
</tr>
</table>
<div v-if="dataList.length==0">
<div style="text-align:center">暂无数据</div>
</div>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
......@@ -306,19 +307,22 @@
let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.OutBranchId = this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
// this.msg.OutBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
this.disabled = false;
this.msg.OutBranchId = -1
this.msg.RB_Branch_Id = -1
// this.msg.OutBranchId = -1
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
// this.msg.RB_Branch_Id = -1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):-1
// this.msg.RB_Department_Id = -1
this.msg.UserId = this.$route.query.UserId?this.$route.query.UserId:-1
}else{
this.disabled = true;
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.UserId = this.$route.query.UserId?this.$route.query.UserId:Number(userInfo.EmployeeId)
}
......
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