Skip to content

S
SuperMan
Commit ed7751bd authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

地接提成页面修改，新增一件制单

parent 32dabcd7
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 35 deletions
src/components/administrative/DjCommissionDetail2.vue
View file @ ed7751bd
...@@ -12,23 +12,19 @@ ...@@ -12,23 +12,19 @@
<th width="120px">实际发放<br>15元/人</th> <th width="120px">实际发放<br>15元/人</th>
<th width="120px">总合计</th> <th width="120px">总合计</th>
<th v-for="(item, index) in dataList[0].OPCommissionDetailsList" :key="index">{{item.EmployeeName + item.CommissionPercent + '%'}}</th> <th v-for="(item, index) in dataList[0].OPCommissionDetailsList" :key="index">{{item.EmployeeName + item.CommissionPercent + '%'}}</th>
<th>{{$t('system.table_operation')}}</th> <th width="80px">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item, index) in dataList" :key="index"> <tr v-for="(item, index) in dataList" :key="index">
<td>{{item.BranchName}}</td> <td>{{item.BranchId === -1 ? '合计' : item.BranchName}}</td>
<td>{{item.GuestNum}}</td> <td>{{item.BranchId === -1 ? allGuestNum : item.GuestNum }}</td>
<td>{{15}}</td> <td>{{15}}</td>
<td>{{item.GuestNum * 15}}</td> <td>{{item.BranchId === -1 ? allGuestNum * 15 : item.GuestNum * 15}}</td>
<td v-for="(Sitem, Sindex) in item.OPCommissionDetailsList" :key="Sindex">{{Sitem.CommissionMoney}}</td> <td v-for="(Sitem, Sindex) in item.OPCommissionDetailsList" :key="Sindex">{{Sitem.CommissionMoney}}</td>
<td>查看</td> <td>
</tr> <div style='width:80px;height:40px;text-align:center;position: relative;padding-top: 6px;padding-top:6px;'>
<tr> <el-button type="primary" size='mini' icon="el-icon-view" circle @click="getInfo(item,index)"></el-button>
<td>合计</td> </div>
<td>{{allGuestNum}}</td> </td>
<td>{{15}}</td>
<td>{{allGuestNum * 15}}</td>
<td>{{}}</td>
<td></td>
</tr> </tr>
</table> </table>
<div class="noDataNotice" v-if="dataList.length<1"> <div class="noDataNotice" v-if="dataList.length<1">
...@@ -51,24 +47,79 @@ export default { ...@@ -51,24 +47,79 @@ export default {
allGuestNum: 0, allGuestNum: 0,
loading: false, loading: false,
dataList: [], dataList: [],
list: [ empList: [],
{ oPComissionPeriods: {},
name: 'xxx'
},{
name: 'yyy'
},{
name: 'ttt'
},{
name: 'uuu'
},{
name: 'iii'
},
]
} }
},mounted(){ },mounted(){
this.msg.ID = this.$route.query.ID;
this.getList() this.getList()
}, },
methods : { methods : {
//跳转
getInfo(item) {
this.$router.push({
path: "ClausesOrder",
query: {
StartDate: this.oPComissionPeriods.PeriodsDate,
blank:'y'
}
});
},
ZhiDan(data){
let msg={
TemplateId:27,
RB_Branch_Id:data.RB_Branch_Id,
IsPublic:6,
BType:4,
AccountId:22,
CostTypeID:189,
WBMoney:data.CommissionMoney,
Remark:'',
TCID:0,
IsRelevanceTravel:1,
OrderID:0,
vorcherInos:[],
Description:'',
RemitterName:'',
TradeDate:moment().format('YYYY-MM-DD'),
OrderSource:14,
};
this.$confirm('提成金额是否正确?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.loading = true;
this.apipost(
"Financial_post_SetFinanceInfoCommonForIn",
msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.apipost(
"OPCommission_UpdatePeriodsFrID",
{ID:this.oPComissionPeriods.ID,FrId:res.data.data},
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
null
);
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost( this.apipost(
...@@ -77,11 +128,18 @@ export default { ...@@ -77,11 +128,18 @@ export default {
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.detailsList; this.dataList = res.data.data.detailsList;
this.$forceUpdate() this.empList = res.data.data.empList;
} else { this.oPComissionPeriods=res.data.data.oPComissionPeriods;
this.Error(res.data.message); let num = 0
} this.dataList.forEach(x=>{
num = num + x.GuestNum
})
this.allGuestNum = num
this.$forceUpdate()
} else {
this.Error(res.data.message);
}
}, },
null null
); );
......
src/components/administrative/DjCommissionsmangment.vue
View file @ ed7751bd
...@@ -7,15 +7,15 @@ ...@@ -7,15 +7,15 @@
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne">
<div class="query-box"> <!-- <div class="query-box">
<ul> <ul>
<li> <li>
<input type="button" class="normalBtn" @click="goUrlZD(195)" value="签证制单"/> <input type="button" class="normalBtn" @click="goUrlZD(195)" value="签证制单"/>
<input type="button" class="normalBtn" @click="goUrlZD(196)" value="地接制单"/> <input type="button" class="normalBtn" @click="goUrlZD(196)" value="地接制单"/>
</li> </li>
</ul> </ul>
</div> </div> -->
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>期数</th> <th>期数</th>
<th>提成总金额</th> <th>提成总金额</th>
...@@ -32,6 +32,9 @@ ...@@ -32,6 +32,9 @@
<!-- <el-tooltip class="item" effect="dark" content="取消" placement="top"> <!-- <el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" icon="el-icon-delete" circle></el-button> <el-button type="danger" icon="el-icon-delete" circle></el-button>
</el-tooltip> --> </el-tooltip> -->
<el-tooltip class="item" effect="dark" content="一键制单" placement="top">
<el-button @click="YijianZD(item)" type="danger" class="CM_look" icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('DjCommissionDetail',item.ID)" icon="iconfont icon-chakan" circle></el-button> <el-button type="primary" class="CM_look" @click="goUrl('DjCommissionDetail',item.ID)" icon="iconfont icon-chakan" circle></el-button>
</el-tooltip> </el-tooltip>
...@@ -67,6 +70,31 @@ ...@@ -67,6 +70,31 @@
this.getList(); this.getList();
}, },
methods: { methods: {
YijianZD(item){
this.$confirm('提成金额是否正确?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.loading=true;
this.apipost(
"Financial_post_SetDiJieCommissionBetchImport",
{PeriodsId:item.ID},
res => {
if(res.data.resultCode==1){
this.Success(res.data.message)
this.getList();
}else{
this.loading=false;
this.Error(res.data.message)
}
},
null
);
}).catch(() => {
});
},
goUrlZD(num){ goUrlZD(num){
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
......
src/router/config.js
View file @ ed7751bd
...@@ -417,7 +417,7 @@ export default { ...@@ -417,7 +417,7 @@ export default {
{ {
path: '/DjCommissionDetail', //提成详情 path: '/DjCommissionDetail', //提成详情
name: 'DjCommissionDetail', name: 'DjCommissionDetail',
component: resolve => require(['@/components/administrative/DjCommissionDetail'], resolve), component: resolve => require(['@/components/administrative/DjCommissionDetail2'], resolve),
meta: { meta: {
title: '提成详情' title: '提成详情'
}, },
......
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