Skip to content

C
CRM
Commit b5886b87 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 851de27e
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 114 deletions
src/components/customerManage/orderList.vue
View file @ b5886b87
...@@ -371,23 +371,7 @@ export default { ...@@ -371,23 +371,7 @@ export default {
// 多选发生变化 // 多选发生变化
clickMultipleChoice(row, index, num) { clickMultipleChoice(row, index, num) {
if (num == 1) { if (num == 1) {
if (row.checkList.slice(-1)[0] == 4) { row.selectedType = row.checkList.join(",");
this.delType(row, 1);
this.delType(row, 2);
this.delType(row, 3);
this.delType(row, 5);
row.selectedType = row.checkList.join(",");
} else if (row.checkList.slice(-1)[0] == 5) {
this.delType(row, 1);
this.delType(row, 2);
this.delType(row, 3);
this.delType(row, 4);
row.selectedType = row.checkList.join(",");
} else {
this.delType(row, 4);
this.delType(row, 5);
row.selectedType = row.checkList.join(",");
}
} }
}, },
// 删除套餐值 // 删除套餐值
...@@ -1325,15 +1309,6 @@ export default { ...@@ -1325,15 +1309,6 @@ export default {
.agreement-IncomeMoney-box{ .agreement-IncomeMoney-box{
position: relative; position: relative;
} }
.agreement-IncomeMoney-pop{
position: absolute;
top: -20px;
left: -270px;
z-index: 1;
background: #fff;
padding: 10px 19px 10px 19px;
Box-shadow:5px 5px 10px 5px #ccc;
}
.agreement-Cancel{ .agreement-Cancel{
text-align: right; text-align: right;
color: #409eff; color: #409eff;
...@@ -1750,7 +1725,7 @@ li { ...@@ -1750,7 +1725,7 @@ li {
.agreement-IncomeMoney-pop { .agreement-IncomeMoney-pop {
position: absolute; position: absolute;
top: -20px; top: -20px;
left: -270px; left: -350px;
z-index: 1; z-index: 1;
background: #fff; background: #fff;
padding: 10px 19px 10px 19px; padding: 10px 19px 10px 19px;
......
src/components/guestManagement/Agreement.vue
View file @ b5886b87
...@@ -757,23 +757,7 @@ ...@@ -757,23 +757,7 @@
// 多选发生变化 // 多选发生变化
clickMultipleChoice(row, index, num) { clickMultipleChoice(row, index, num) {
if(num == 1){ if(num == 1){
if(row.checkList.slice(-1)[0] == 4){ row.selectedType = row.checkList.join(',')
this.delType(row,1)
this.delType(row,2)
this.delType(row,3)
this.delType(row,5)
row.selectedType = row.checkList.join(',')
}else if(row.checkList.slice(-1)[0] == 5){
this.delType(row,1)
this.delType(row,2)
this.delType(row,3)
this.delType(row,4)
row.selectedType = row.checkList.join(',')
}else{
this.delType(row,4)
this.delType(row,5)
row.selectedType = row.checkList.join(',')
}
} }
}, },
// 删除套餐值 // 删除套餐值
......
src/components/guestManagement/ticketOrder.vue
View file @ b5886b87
...@@ -1135,6 +1135,62 @@ ...@@ -1135,6 +1135,62 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 套餐 -->
<div v-if="obj.checkList.indexOf('4')!=-1">
<div class="BillMakingType-box">
<div class="BillMakingType-left">{{combo.title}}</div>
<div class="BillMakingType-right">
<div class="BillMakingType-right-list" v-for="(item,index) in combo.detailList" :key="index">
<div class="BillMakingType-right-box">
<div class="BillMakingType-right-center">
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="请选择费用">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</div>
<div class="BillMakingType-right-center">
<span>数量：</span>
<el-input size="mini" placeholder="请输入数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.Number"></el-input>
</div>
<div class="BillMakingType-right-center">
<span>单价：</span>
<el-input size="mini" placeholder="请输入单价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.UnitPrice"></el-input>
</div>
<div class="BillMakingType-right-center">
<span>原币：</span>
<el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.OriginalMoney" disabled></el-input>
</div>
<div class="BillMakingType-right-center">
<el-input
size="mini"
type="textarea"
:rows="1"
placeholder="备注"
v-model="item.Remark"></el-input>
</div>
</div>
<i class="iconfont clickJia" v-if="index==0" @click="addTypeList(4)">&#xe615;</i>
<i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,4)">&#xe67a;</i>
</div>
</div>
</div>
<div class="BillingTotal-box">
<div class="BillingTotal-center">
<span>手续费：</span>
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="combo.OriginalFee"></el-input>
</div>
<div class="BillingTotal-center">
<span>应收金额：</span>
<span style="min-width:50px">{{combo.WBMoney}}</span>
</div>
</div>
</div>
<div class="appendix-box"> <div class="appendix-box">
<div class="appendix-top"> <div class="appendix-top">
<template v-for="(items,index) in vorcherInos"> <template v-for="(items,index) in vorcherInos">
...@@ -1286,11 +1342,27 @@ ...@@ -1286,11 +1342,27 @@
companyList:[],// 公司 companyList:[],// 公司
// 流程 // 流程
processList:[], processList:[],
combo:{
title:"套餐",
WBMoney:0,//原币总金额
OriginalFee:0,//原币手续费
RelevanceFrId:"4",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[
{
CostTypeId:"",//费用ID
Number:"",//数量
UnitPrice:"",//单价
OriginalMoney:"",//金额
Remark:"",//备注
}
]
},
ground:{ ground:{
title:"地接", title:"地接",
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:0,//原币手续费 OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"3",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"", TotalCost:"",
detailList:[ detailList:[
{ {
...@@ -1306,7 +1378,7 @@ ...@@ -1306,7 +1378,7 @@
title:"签证", title:"签证",
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:0,//原币手续费 OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"2",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"", TotalCost:"",
detailList:[ detailList:[
{ {
...@@ -1529,6 +1601,9 @@ ...@@ -1529,6 +1601,9 @@
}; };
}, },
computed: { computed: {
monthCombo(){
return this.combo.detailList
},
monthGround(){ monthGround(){
return this.ground.detailList return this.ground.detailList
}, },
...@@ -1538,6 +1613,9 @@ ...@@ -1538,6 +1613,9 @@
monthAirTickets(){ monthAirTickets(){
return this.airTickets.detailList return this.airTickets.detailList
}, },
monthComboTotalCost(){
return this.combo.OriginalFee
},
monthGroundTotalCost(){ monthGroundTotalCost(){
return this.ground.OriginalFee return this.ground.OriginalFee
}, },
...@@ -1585,6 +1663,12 @@ ...@@ -1585,6 +1663,12 @@
}, },
deep: true, deep: true,
}, },
monthCombo:{
handler(val, oldVal) {
this.sum(4)
},
deep: true,
},
monthGround:{ monthGround:{
handler(val, oldVal) { handler(val, oldVal) {
this.sum(3) this.sum(3)
...@@ -1603,6 +1687,12 @@ ...@@ -1603,6 +1687,12 @@
}, },
deep: true, deep: true,
}, },
monthComboTotalCost:{
handler(val, oldVal) {
this.TotalCost(4)
},
deep: true,
},
monthGroundTotalCost:{ monthGroundTotalCost:{
handler(val, oldVal) { handler(val, oldVal) {
this.TotalCost(3) this.TotalCost(3)
...@@ -1812,6 +1902,10 @@ ...@@ -1812,6 +1902,10 @@
this.ground.WBMoney = 0 this.ground.WBMoney = 0
this.ground.WBMoney = this.ground.TotalCost-this.ground.OriginalFee this.ground.WBMoney = this.ground.TotalCost-this.ground.OriginalFee
} }
if(num=='4'){
this.combo.WBMoney = 0
this.combo.WBMoney = this.combo.TotalCost-this.combo.OriginalFee
}
}, },
// 合计 // 合计
sum(num){ sum(num){
...@@ -1857,6 +1951,20 @@ ...@@ -1857,6 +1951,20 @@
} }
this.TotalCost(num) this.TotalCost(num)
} }
if(num=='4'){
for(let i=0;i<this.combo.detailList.length;i++){
this.combo.detailList[i].OriginalMoney = this.combo.detailList[i].Number*this.combo.detailList[i].UnitPrice
}
let OriginalMoney = this.combo.detailList.map(item=>{
return item.OriginalMoney
})
this.combo.TotalCost= 0
for(let j=0;j<OriginalMoney.length;j++){
this.combo.TotalCost += OriginalMoney[j]
}
this.TotalCost(num)
}
}, },
// 删除 // 删除
deleteTypeList(item,index,num){ deleteTypeList(item,index,num){
...@@ -1887,6 +1995,9 @@ ...@@ -1887,6 +1995,9 @@
if(item=='3'){ if(item=='3'){
this.ground.detailList.push(data) this.ground.detailList.push(data)
} }
if(item=='4'){
this.combo.detailList.push(data)
}
}, },
Financial_post_GetCostTypeList() { //获取支出费用类型 Financial_post_GetCostTypeList() { //获取支出费用类型
if(this.BillMaking.TemplateId){ if(this.BillMaking.TemplateId){
...@@ -1970,50 +2081,37 @@ ...@@ -1970,50 +2081,37 @@
// 多选发生变化 // 多选发生变化
clickMultipleChoice() { clickMultipleChoice() {
if (this.checkList.length > 0) { if (this.checkList.length > 0) {
this.checkList.forEach(item => {
if (this.checkList.slice(-1)[0] == 4) { if (item == '1') {
this.delType(1) this.AirTicketsShow = false
this.delType(2)
this.delType(3)
this.AirTicketsShow = true
this.visaShow = true
this.groundShow = true
this.comboShow = false
this.form.TicketMoney = 0
this.form.VisaMoney = 0
this.form.DiJieMoney = 0
} else {
this.delType(4)
this.checkList.forEach(item => {
if (item == '1') {
this.AirTicketsShow = false
}
if (item == '2') {
this.visaShow = false
}
if (item == '3') {
this.groundShow = false
}
});
if (this.checkList.indexOf('1') == -1) {
this.AirTicketsShow = true
this.form.TicketMoney = 0
} }
if (this.checkList.indexOf('2') == -1) { if (item == '2') {
this.visaShow = true this.visaShow = false
this.form.VisaMoney = 0
} }
if (this.checkList.indexOf('3') == -1) { if (item == '3') {
this.groundShow = true this.groundShow = false
this.form.DiJieMoney = 0
} }
if (this.checkList.indexOf('4') == -1) { if (item == '4') {
this.comboShow = true this.comboShow = false
this.form.MealMoney = 0
this.form.MealDescription = ""
} }
});
if (this.checkList.indexOf('1') == -1) {
this.AirTicketsShow = true
this.form.TicketMoney = 0
}
if (this.checkList.indexOf('2') == -1) {
this.visaShow = true
this.form.VisaMoney = 0
}
if (this.checkList.indexOf('3') == -1) {
this.groundShow = true
this.form.DiJieMoney = 0
}
if (this.checkList.indexOf('4') == -1) {
this.comboShow = true
this.form.MealMoney = 0
this.form.MealDescription = ""
} }
this.form.OrderType = this.checkList.join(',') this.form.OrderType = this.checkList.join(',')
} else if (this.checkList.length == 0) { } else if (this.checkList.length == 0) {
this.AirTicketsShow = true this.AirTicketsShow = true
...@@ -2040,39 +2138,31 @@ ...@@ -2040,39 +2138,31 @@
clickLossMultipleChoice() { clickLossMultipleChoice() {
if (this.checkList.length > 0) { if (this.checkList.length > 0) {
if (this.checkList.slice(-1)[0] == 4) { this.checkList.forEach(item => {
this.delType(1) if (item == '1') {
this.delType(2) this.AirTicketsShow = false
this.delType(3)
this.AirTicketsShow = true
this.visaShow = true
this.groundShow = true
this.comboShow = false
} else {
this.delType(4)
this.checkList.forEach(item => {
if (item == '1') {
this.AirTicketsShow = false
}
if (item == '2') {
this.visaShow = false
}
if (item == '3') {
this.groundShow = false
}
});
if (this.checkList.indexOf('1') == -1) {
this.AirTicketsShow = true
} }
if (this.checkList.indexOf('2') == -1) { if (item == '2') {
this.visaShow = true this.visaShow = false
} }
if (this.checkList.indexOf('3') == -1) { if (item == '3') {
this.groundShow = true this.groundShow = false
} }
if (this.checkList.indexOf('4') == -1) { if (item == '4') {
this.comboShow = true this.comboShow = false
} }
});
if (this.checkList.indexOf('1') == -1) {
this.AirTicketsShow = true
}
if (this.checkList.indexOf('2') == -1) {
this.visaShow = true
}
if (this.checkList.indexOf('3') == -1) {
this.groundShow = true
}
if (this.checkList.indexOf('4') == -1) {
this.comboShow = true
} }
this.form.OrderType = this.checkList.join(',') this.form.OrderType = this.checkList.join(',')
...@@ -2243,6 +2333,7 @@ ...@@ -2243,6 +2333,7 @@
Type: this.form.Type, Type: this.form.Type,
Voucher: this.Voucher Voucher: this.Voucher
} }
this.clickShow = true
this.apipost("/api/Order/SetGuestOrderState", data, (res) => { this.apipost("/api/Order/SetGuestOrderState", data, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dialogTableVisible = false; this.dialogTableVisible = false;
...@@ -2250,7 +2341,9 @@ ...@@ -2250,7 +2341,9 @@
this.MsgBus.$emit("closeTicketOrderDialogBox"); this.MsgBus.$emit("closeTicketOrderDialogBox");
this.MsgBus.$emit("closeGetList"); this.MsgBus.$emit("closeGetList");
this.resetForm("form"); this.resetForm("form");
this.clickShow = false
} else { } else {
this.clickShow = false
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}); });
...@@ -2265,6 +2358,7 @@ ...@@ -2265,6 +2358,7 @@
Money: this.form.Money, Money: this.form.Money,
Remark: this.form.Remark Remark: this.form.Remark
} }
this.clickShow = true
this.apipost("/api/Order/SetGuestOrderMoney", data, (res) => { this.apipost("/api/Order/SetGuestOrderMoney", data, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dialogTableVisible = false; this.dialogTableVisible = false;
...@@ -2272,7 +2366,9 @@ ...@@ -2272,7 +2366,9 @@
this.MsgBus.$emit("closeTicketOrderDialogBox"); this.MsgBus.$emit("closeTicketOrderDialogBox");
this.MsgBus.$emit("closeGetList"); this.MsgBus.$emit("closeGetList");
this.resetForm("form"); this.resetForm("form");
this.clickShow = false
} else { } else {
this.clickShow = false
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}); });
...@@ -2344,6 +2440,7 @@ ...@@ -2344,6 +2440,7 @@
MealMoney: this.form.MealMoney, //套餐应收 MealMoney: this.form.MealMoney, //套餐应收
} }
} }
this.clickShow = true
this.apipost("/api/Order/SetGuestOrderInfo", data, (res) => { this.apipost("/api/Order/SetGuestOrderInfo", data, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dialogTableVisible = false; this.dialogTableVisible = false;
...@@ -2355,8 +2452,10 @@ ...@@ -2355,8 +2452,10 @@
this.visaShow = true this.visaShow = true
this.groundShow = true this.groundShow = true
this.comboShow = true this.comboShow = true
this.clickShow = false
this.resetForm("form"); this.resetForm("form");
} else { } else {
this.clickShow = false
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}); });
...@@ -2369,6 +2468,7 @@ ...@@ -2369,6 +2468,7 @@
OrderId: this.form.OrderId, OrderId: this.form.OrderId,
EnterId: this.form.EnterId, EnterId: this.form.EnterId,
} }
this.clickShow = true
this.apipost("/api/Order/SetGuestOrderCareOf", data, (res) => { this.apipost("/api/Order/SetGuestOrderCareOf", data, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dialogTableVisible = false; this.dialogTableVisible = false;
...@@ -2376,7 +2476,9 @@ ...@@ -2376,7 +2476,9 @@
this.MsgBus.$emit("closeTicketOrderDialogBox"); this.MsgBus.$emit("closeTicketOrderDialogBox");
this.MsgBus.$emit("closeGetList"); this.MsgBus.$emit("closeGetList");
this.resetForm("form"); this.resetForm("form");
this.clickShow = false
} else { } else {
this.clickShow = false
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}); });
...@@ -2437,6 +2539,20 @@ ...@@ -2437,6 +2539,20 @@
return return
} }
}) })
this.obj.checkList.indexOf('4')!=-1&&this.combo.detailList.forEach(item=>{
if(!item.CostTypeId){
this.$message.warning('请选择费用说明');
return
}
if(!item.Number){
this.$message.warning('请输入套餐数量');
return
}
if(!item.UnitPrice){
this.$message.warning('请输入套餐单价');
return
}
})
if(this.BillMaking.vorcherInos.length==0){ if(this.BillMaking.vorcherInos.length==0){
this.$message.warning('请上传凭证'); this.$message.warning('请上传凭证');
return return
...@@ -2528,6 +2644,32 @@ ...@@ -2528,6 +2644,32 @@
} }
this.msgList.push(this.BillMaking) this.msgList.push(this.BillMaking)
} }
if(this.obj.checkList.indexOf('4')!=-1&&this.combo.detailList){
this.BillMaking = {
IsPublic:this.BillMaking.IsPublic,// 账户类型 0私账 1公账
BType:this.BillMaking.BType,//银行类型 看财务单据那边有枚举列表
AccountId:this.BillMaking.AccountId,// 账户ID
WBMoney:this.combo.WBMoney,//原币总金额
OriginalFee:this.combo.OriginalFee,//原币手续费
RB_Branch_Id:this.BillMaking.RB_Branch_Id,//公司ID
RB_Depart_Id:this.BillMaking.RB_Depart_Id,//部门ID
RemitterName:this.BillMaking.RemitterName,// 汇款人
TradeDate:this.BillMaking.TradeDate,//交易日期
AccountNumber:this.BillMaking.AccountNumber,//流水号
TemplateId:this.BillMaking.TemplateId,//流程ID
OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.BillMaking.ReFinanceId,//订单ID
ReFinanceId2:this.BillMaking.ReFinanceId2,//类型 1收款
GuestId:this.BillMaking.GuestId,//客人ID
RelevanceFrId:'4',
vorcherInos:this.BillMaking.vorcherInos,
detailList:this.combo.detailList
}
this.msgList.push(this.BillMaking)
}
this.clickShow = true this.clickShow = true
this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{ this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
......
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