Skip to content

S
SuperMan
Commit 50dc5b0d authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 5a14f5ce
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 41 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 50dc5b0d
......@@ -104,6 +104,7 @@
Handmsg:{},
czmsg:{},
crmOrderObj: null,
commissionObj: null,
}
},
computed: {
......@@ -179,7 +180,6 @@
this.$router.push({ name: path,query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}else{
// crm自动登陆传过来的参数
if(this.crmOrderObj){
this.$router.push({
......@@ -198,7 +198,20 @@
tab:'新增付款单'
}
})
}else{
}else if(this.commissionObj){//印象提成制单
this.$router.push({
name: path,
query:{
"id":id,
"Name":Name,
"Type":Type,
"commissionObj":JSON.stringify(this.commissionObj),
'path':this.$route.query.path,
blank:'y',
tab:'新增付款单'
}
})
} else{
this.$router.push({
name: path,
query:{
......@@ -340,7 +353,11 @@
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.active = this.crmOrderObj.type
this.showTab = this.crmOrderObj.type
}else{
}else if(this.$route.query.commissionObj){
this.commissionObj = JSON.parse(this.$route.query.commissionObj)
this.active = this.$route.query.Type
this.showTab = this.$route.query.Type
} else{
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
}
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue
View file @ 50dc5b0d
......@@ -84,11 +84,14 @@
<el-button type="primary" class="CM_look" @click="goUrl('ImpressionTicketUserDetails',item.Id)"
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
<el-tooltip v-if="cMaker==true" class="item" effect="dark" content="制单" placement="top">
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
<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 v-if="cMaker==true" class="item" effect="dark" content="工资制单" placement="top">
<el-button @click="YijianZD(item,2)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
</td>
</tr>
......@@ -127,17 +130,29 @@
prop="DeptName"
label="部门">
</el-table-column>
<el-table-column
prop="EmpId"
label="用户Id"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="EmName"
label="姓名"
show-overflow-tooltip>
</el-table-column>
<el-table-column
v-if="BillMakingMsg.Type==1"
prop="Commission"
label="提成金额"
show-overflow-tooltip>
</el-table-column>
<el-table-column
v-else
prop="WageMoney"
label="工资"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="是否已发放"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.IsGiveOut==2? '否':'是' }}</template>
......@@ -172,13 +187,13 @@
total: 0,
btnShow: false,
btnLoading: false,
cMaker: false,//是否可以制单
cMaker: true,//是否可以制单
BillMakingLoading: false,
totalAmount:0,
multipleSelection:[],
BillMakingMsg:{
PeroidsId: null,
Type: 1,
Type: null,
EmpIds:''
}
}
......@@ -190,9 +205,6 @@
if (ActionMenuCode.indexOf('F_DCommissionSend') != -1) {
this.btnShow = true;
}
if (ActionMenuCode.indexOf('home_DCommissionZD') != -1) {
this.cMaker = true;
}
this.getList()
},
methods: {
......@@ -200,7 +212,12 @@
this.multipleSelection = val;
let zong = 0;
this.multipleSelection.forEach((x) => {
zong += x.Commission;
if(this.BillMakingMsg.Type==1){
zong += x.Commission;
}else{
zong += x.WageMoney;
}
});
this.totalAmount = zong;
},
......@@ -263,12 +280,11 @@
},
// 保存制单人员
BillMaking(){
if(this.multipleSelection.length==0){
this.Error("请选择需要制单的人员！")
return
}
if(this.totalAmount==0){
if(this.totalAmount<=0){
this.Error("金额总额必须大于0！")
return
}
......@@ -277,56 +293,57 @@
data.push(item.EmpId)
})
this.BillMakingMsg.EmpIds = data.join(',')
let query = {
blank: "y",
tab: "新增付款单据",
Type: 2,
orderObj: JSON.stringify(this.BillMakingMsg)
}
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
query
});
this.outerVisible = false
return
this.crmapipost(
'/api/Commission/SetCommissionSendEmployee', this.BillMakingMsg,
res => {
if (res.data.resultCode == 1) {
this.Success('制单人员选择成功')
this.BillMakingMsg.totalAmount = this.totalAmount
let query = {
blank: "y",
tab: "新增付款单据",
Type: 2,
commissionObj: JSON.stringify(this.BillMakingMsg)
}
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
query
});
this.Success('制单人员保存成功')
this.outerVisible = false
this.BillMakingMsg = {
PeroidsId: null,
Type: null,
EmpIds:''
}
} else {
this.Error(res.data.message)
}
this.outerVisible = false
this.BillMakingMsg = {
PeroidsId: null,
Type: 1,
EmpIds:''
}
},
err => {}
)
},
// 点击制单
YijianZD(item) {
YijianZD(item,type) {
this.outerVisible = true
this.GetCommissionSendEmployeeList(item)
this.GetCommissionSendEmployeeList(item,type)
},
// 获取可制单人员
GetCommissionSendEmployeeList(item){
GetCommissionSendEmployeeList(item,type){
this.BillMakingMsg.PeroidsId = item.Id
this.BillMakingMsg.Type = type
let msg = {
PeroidsId: this.BillMakingMsg.PeroidsId,
Type: this.BillMakingMsg.Type
}
this.BillMakingLoading = true
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)
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue
View file @ 50dc5b0d
......@@ -227,7 +227,7 @@
},
exportExcel() { //导出
var fileName = "印象票务提成人员表.xls";
this.crmGetLocalFile("/api/Commission/GetCommissionEmpStatisticsToExcel", this.msg, fileName);
this.crmGetLocalFile("/api/Commission/GetCommissionOrderDetialToExcel", this.msg, fileName);
}
}
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue
View file @ 50dc5b0d
......@@ -384,7 +384,7 @@
},
exportExcel() { //导出
var fileName = "印象票务提成明细表.xls";
this.crmGetLocalFile("/api/Commission/GetCommissionOrderDetialToExcel", this.msg, fileName);
this.crmGetLocalFile("/api/Commission/GetCommissionEmpStatisticsToExcel", this.msg, fileName);
}
}
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 50dc5b0d
......@@ -693,7 +693,8 @@ export default {
czmsg:{},
czmsgState:false,
maxmoneyTips:false,
crmOrderObj:{}
crmOrderObj:{},
commissionObj:{}
}
},
methods:{
......@@ -919,6 +920,18 @@ export default {
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2?this.orderObj.ReFinanceId2:0;
this.msg.ECOrderList = this.orderObj.ECOrderList?this.orderObj.ECOrderList:[];
}
if(this.commissionObj){
this.msg.OtherType = this.commissionObj.Type?this.commissionObj.Type:0;
this.msg.PeroidsId = this.commissionObj.PeroidsId?this.commissionObj.PeroidsId:0;
this.msg.EmpIds = this.commissionObj.EmpIds?this.commissionObj.EmpIds:0;
let totalAmount = this.$commonUtils.addCommas(Math.round(this.commissionObj.totalAmount* 100) / 100)
if(this.allPriceTo!=totalAmount){
this.Error(`实付金额不能大于小于${this.commissionObj.totalAmount}！`)
return
}
}
// crm自动登陆传过来的参数
if(this.crmOrderObj){
this.msg.OtherType = this.crmOrderObj.OtherType
......@@ -1631,7 +1644,9 @@ export default {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj);
}else{
}else if(this.$route.query.commissionObj){//印象提成参数
this.commissionObj = JSON.parse(this.$route.query.commissionObj);
} else{
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
}
this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
......
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