Commit 80d744b5 authored by youjie's avatar youjie

收款制单 日本客户 是否有转账手续费

parent 7a8ea3b1
...@@ -1117,7 +1117,7 @@ ...@@ -1117,7 +1117,7 @@
Name: '门票', Name: '门票',
Id: 4, Id: 4,
disabled: false disabled: false
}, },
{Name:'房费送客手数料',Id:5,disabled:false}, {Name:'房费送客手数料',Id:5,disabled:false},
{Name:'餐费送客手数料',Id:6,disabled:false}, {Name:'餐费送客手数料',Id:6,disabled:false},
{Name:'门票送客手数料',Id:7,disabled:false}, {Name:'门票送客手数料',Id:7,disabled:false},
...@@ -1181,7 +1181,7 @@ ...@@ -1181,7 +1181,7 @@
}, },
// 是否开启手配费 // 是否开启手配费
getHandFee() { getHandFee() {
if (this.is_HandFee) { if (this.is_HandFee) {
this.chooseHandFee() this.chooseHandFee()
} else { } else {
...@@ -1207,13 +1207,13 @@ ...@@ -1207,13 +1207,13 @@
this.is_HandFee=false; this.is_HandFee=false;
} }
} }
if (!this.is_HandFee) return if (!this.is_HandFee) return
if (this.msg.detailList.length > 0) { if (this.msg.detailList.length > 0) {
let HandFeeObj = this.HandFeeList.map(item => { let HandFeeObj = this.HandFeeList.map(item => {
if (item.BranchId == this.HandFee.BranchId) return item if (item.BranchId == this.HandFee.BranchId) return item
}) })
this.HandFeeDetail = HandFeeObj[0] this.HandFeeDetail = HandFeeObj[0]
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach(x => { this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach(x => {
x.show = false x.show = false
...@@ -1223,7 +1223,7 @@ ...@@ -1223,7 +1223,7 @@
let numToCE = 0 let numToCE = 0
let numToMEN = 0 let numToMEN = 0
let states = true let states = true
this.msg.detailList.forEach((x, index) => { this.msg.detailList.forEach((x, index) => {
let obj = x let obj = x
if (x.CostTypeName.indexOf('房') != -1 || if (x.CostTypeName.indexOf('房') != -1 ||
...@@ -1231,7 +1231,7 @@ ...@@ -1231,7 +1231,7 @@
x.CostTypeName.indexOf('车') != -1 || x.CostTypeName.indexOf('车') != -1 ||
x.CostTypeName.indexOf('门票') != -1) { x.CostTypeName.indexOf('门票') != -1) {
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => { this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
if (x.CostTypeName.indexOf('房') != -1&&x.CostTypeName.indexOf('房费送客手数料') == -1 && y.Type == 1&&companyID!=1220) { if (x.CostTypeName.indexOf('房') != -1&&x.CostTypeName.indexOf('房费送客手数料') == -1 && y.Type == 1&&companyID!=1220) {
y.show = true, numToFANG += Number(obj.Number)//, y.Num = numToFANG y.show = true, numToFANG += Number(obj.Number)//, y.Num = numToFANG
} }
...@@ -1254,7 +1254,7 @@ ...@@ -1254,7 +1254,7 @@
} }
if (x.CostTypeName.indexOf('餐费送客手数料') != -1 && y.Type == 6) { if (x.CostTypeName.indexOf('餐费送客手数料') != -1 && y.Type == 6) {
y.Num=x.Number y.Num=x.Number
if(x.UnitPrice<0){ if(x.UnitPrice<0){
y.Unit_Price=-x.UnitPrice; } y.Unit_Price=-x.UnitPrice; }
else{ else{
y.Unit_Price=x.UnitPrice y.Unit_Price=x.UnitPrice
...@@ -1273,7 +1273,7 @@ ...@@ -1273,7 +1273,7 @@
}) })
} }
}) })
if (states) { if (states) {
this.msg.detailList.forEach((x, index) => { this.msg.detailList.forEach((x, index) => {
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => { this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
...@@ -1722,7 +1722,7 @@ ...@@ -1722,7 +1722,7 @@
if (this.orderObj && this.orderObj.TravelReplenish) { if (this.orderObj && this.orderObj.TravelReplenish) {
this.msg.TravelReplenish = this.orderObj.TravelReplenish this.msg.TravelReplenish = this.orderObj.TravelReplenish
} }
this.loading = true;
this.msg.Description = this.Description; this.msg.Description = this.Description;
...@@ -1741,6 +1741,33 @@ ...@@ -1741,6 +1741,33 @@
this.msg.OtherType = this.czmsg.OtherType; this.msg.OtherType = this.czmsg.OtherType;
this.msg.ReTCID = this.czmsg.ReTCID; this.msg.ReTCID = this.czmsg.ReTCID;
} }
// 是否是日本客户
let that = this
let ClientAccountObj = this.ClientAccountList.find(x=>{
return x.ID==this.msg.ClientID
})
// 是否存在转账手续费
let detailObj = this.msg.detailList.find(x=>{
return x.CostTypeId==114
})
if(ClientAccountObj.ClientAccountType==1&&!detailObj){
let title = z?'暂存':'制单'
this.$confirm('转账付款给日本账户,请确认此单无转账手续费吗?', this.$t('tips.tips'), {
confirmButtonText: `继续${title}`,
cancelButtonText: `取消${title}`,
type: 'warning'
}).then(() => {
that.loading = true;
that.FinancialPostSet()
}).catch(() => {})
}else{
that.loading = true;
that.FinancialPostSet()
}
},
// 提交 暂存接口
FinancialPostSet(z){
this.apipost('Financial_post_Set', this.msg, res => { this.apipost('Financial_post_Set', this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
//清除旅客名单数据 //清除旅客名单数据
...@@ -1789,6 +1816,7 @@ ...@@ -1789,6 +1816,7 @@
} }
this.loading = false; this.loading = false;
}, err => {}) }, err => {})
}, },
FinancialFlowTemplate_post_GetProcessList(id) { FinancialFlowTemplate_post_GetProcessList(id) {
this.apipost('FinancialFlowTemplate_post_GetProcessList', { this.apipost('FinancialFlowTemplate_post_GetProcessList', {
...@@ -2019,6 +2047,7 @@ ...@@ -2019,6 +2047,7 @@
OpenBankName: x.OpenBankName, OpenBankName: x.OpenBankName,
allName: x.CardNum + " " + x.OpenBankName, allName: x.CardNum + " " + x.OpenBankName,
ObjID: x.ObjID, ObjID: x.ObjID,
ClientAccountType: x.ClientAccountType,
} }
ClientAccountList.push(obj) ClientAccountList.push(obj)
}) })
...@@ -2031,6 +2060,7 @@ ...@@ -2031,6 +2060,7 @@
Nom: x.CardNum, Nom: x.CardNum,
OpenBankName: x.OpenBankName, OpenBankName: x.OpenBankName,
ObjID: x.ObjID, ObjID: x.ObjID,
ClientAccountType: x.ClientAccountType,
} }
ClientAccountList.push(obj) ClientAccountList.push(obj)
}) })
......
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