Commit b6c60923 authored by youjie's avatar youjie

no message

parent 57fd1c38
...@@ -502,7 +502,9 @@ ...@@ -502,7 +502,9 @@
<p> <p>
手配费: 手配费:
<span> <span>
<el-select v-model='HandFee.BranchId' class="w135 _border_b_1" @change="chooseHandFee"> <el-select v-model='HandFee.BranchId' class="w135 _border_b_1"
placeholder="请选择手配费"
@change="chooseHandFee">
<el-option v-for='item in HandFeeList' <el-option v-for='item in HandFeeList'
:label='item.BranchName' :label='item.BranchName'
:value='item.BranchId' :value='item.BranchId'
...@@ -522,13 +524,13 @@ ...@@ -522,13 +524,13 @@
style="border-collapse:collapse;margin-top: 10px;"> style="border-collapse:collapse;margin-top: 10px;">
<tr> <tr>
<th colspan="3">明细</th> <th colspan="3">明细</th>
<th rowspan="2">合计</th> <th rowspan="2" width="150">合计</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th> <th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
</tr> </tr>
<tr> <tr>
<th width="100">类型</th> <th width="80">类型</th>
<th width="100">数量</th> <th width="150">数量</th>
<th width="100">金额</th> <th width="150">金额</th>
</tr> </tr>
<template v-for="(x,index) in HandFeeDetail.DetailList"> <template v-for="(x,index) in HandFeeDetail.DetailList">
<tr v-if="x.show" class="addList2"> <tr v-if="x.show" class="addList2">
...@@ -781,8 +783,7 @@ export default { ...@@ -781,8 +783,7 @@ export default {
TCID:'', TCID:'',
HandFeeList: [],//手配费配置列表 HandFeeList: [],//手配费配置列表
HandFee:{ HandFee:{
BranchId:null, BranchId:null
Type:null
}, },
HandFeeDetail:null,//已选手配费信息 HandFeeDetail:null,//已选手配费信息
TypeListArr: [ TypeListArr: [
...@@ -795,6 +796,7 @@ export default { ...@@ -795,6 +796,7 @@ export default {
} }
}, },
methods:{ methods:{
// 是否开启手配费
getHandFee(){ getHandFee(){
if(this.isHandFee){ if(this.isHandFee){
this.chooseHandFee() this.chooseHandFee()
...@@ -803,6 +805,7 @@ export default { ...@@ -803,6 +805,7 @@ export default {
this.msg.KingdeeBranchId = null this.msg.KingdeeBranchId = null
} }
}, },
// 获取当前手配费选项
chooseHandFee(){ chooseHandFee(){
if(this.msg.detailList.length>0){ if(this.msg.detailList.length>0){
let HandFeeObj = this.HandFeeList.map(item=>{if(item.BranchId==this.HandFee.BranchId) return item}) let HandFeeObj = this.HandFeeList.map(item=>{if(item.BranchId==this.HandFee.BranchId) return item})
...@@ -827,7 +830,7 @@ export default { ...@@ -827,7 +830,7 @@ export default {
} }
}) })
}else{ }else{
this.HandFeeDetail.DetailList.forEach((y,indexs)=>{ this.HandFeeDetail&&this.HandFeeDetail.DetailList.forEach((y,indexs)=>{
y.show=false y.show=false
}) })
} }
...@@ -850,8 +853,8 @@ export default { ...@@ -850,8 +853,8 @@ export default {
arrList(x.DetailList) arrList(x.DetailList)
}) })
this.HandFeeList = res.data.data; this.HandFeeList = res.data.data;
this.HandFee.BranchId = this.HandFeeList[0].BranchId // this.HandFee.BranchId = this.HandFeeList[0].BranchId
this.HandFeeDetail.CurrencyName = this.HandFeeList[0].CurrencyName // this.HandFeeDetail.CurrencyName = this.HandFeeList[0].CurrencyName
} }
}, },
err => {} err => {}
...@@ -1044,16 +1047,20 @@ export default { ...@@ -1044,16 +1047,20 @@ export default {
AddFinancial(z){ //保存 AddFinancial(z){ //保存
// 手配费参数 // 手配费参数
if(this.isHandFee){ if(this.isHandFee){
this.msg.KingdeeBranchId = this.HandFeeDetail.BranchId if(!this.HandFee.BranchId){
this.Error('请选择手配费')
return
}
this.msg.KingdeeBranchId = this.HandFee.BranchId
this.msg.HandFeeList = [] this.msg.HandFeeList = []
for(let i=0;i<4;i++){ for(let i=0;i<4;i++){
if(this.HandFeeDetail.DetailList[i].show&&(!this.HandFeeDetail.DetailList[i].Num if(this.HandFeeDetail&&this.HandFeeDetail.DetailList[i].show&&(!this.HandFeeDetail.DetailList[i].Num
||!this.HandFeeDetail.DetailList[i].Unit_Price)){ ||!this.HandFeeDetail.DetailList[i].Unit_Price)){
this.Error('手配费数量及金额需大于0') this.Error('手配费数量及金额需大于0')
return return
} }
} }
this.HandFeeDetail.DetailList.forEach(x=>{ this.HandFeeDetail&&this.HandFeeDetail.DetailList.forEach(x=>{
let obj={ let obj={
Type:x.Type, Type:x.Type,
Num:x.Num, Num:x.Num,
...@@ -1065,8 +1072,6 @@ export default { ...@@ -1065,8 +1072,6 @@ export default {
} }
}) })
} }
// console.log(this.msg,'----HandFeeList',this.msg.KingdeeBranchId)
// return
if(z){ if(z){
this.msg.Status = 0; this.msg.Status = 0;
}else{ }else{
......
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