Skip to content

S
SuperMan
Commit 39d34047 authored by 黄奎's avatar 黄奎
Browse files
Options

用款计划页面修改

parent 4ef12217
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 39d34047
......@@ -16,7 +16,7 @@
</tr>
<tr v-for='item in nav'>
<td>
{{item.OutBranchName}}
{{item.OutBranchName}}
</td>
<td>{{item.StartCityNames}}
</td>
......@@ -47,9 +47,9 @@
<th width="100">使用时间</th>
<th width="80">司机姓名</th>
<th width="80">司机电话</th>
<th width="100">车牌号</th>
<th width="80">车辆大小</th>
<th width="100">车配号</th>
<th width="100">车辆号</th>
<th width="100">司机住宿</th>
<th width="60">用车方式</th>
<th width="60">车费</th>
<th width="120">车费付款方式</th>
......@@ -59,16 +59,26 @@
<th width="60">金额小计</th>
<th width="60">总金额</th>
<th width="100">备注</th>
<th width="60">凭证</th>
<th width="60">供应商</th>
</tr>
<tr v-for='(item,index) in list.BusList'>
<td>{{item.PlanDateStr}}</td>
<td>{{item.DriverName}}</td>
<td>{{item.DriverTel}}</td>
<td>{{item.BusPriceUseNum?item.BusPriceUseNum+"座":""}}</td>
<td>{{item.BusCode}}</td>
<td>{{item.BusNum}}</td>
<td>{{item.BusPriceUseNum?item.BusPriceUseNum+"座":""}}</td>
<td>
<template v-if="item.AccommodationType==1">
外宿&nbsp;{{item.AccommodationRemark}}
<br />
</template>
<template v-else-if="item.AccommodationType==2">
跟团
</template>
<template v-else-if="item.AccommodationType==3">
不住
</template>
</td>
<td>
{{item.AirportPickUpStr}}
</td>
......@@ -105,7 +115,6 @@
</td>
<td>
{{moneyFormat( item.HighSpeedPrice + Number(item.CostPrice) + Number(item.StopPrice))}}
<!-- {{Number(moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))) <= 0 ? '' : moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))}} -->
</td>
<td v-if='index==0' :rowspan='list.BusList.length'>
{{busTotalPrice(list.BusList)}}
......@@ -113,13 +122,6 @@
<td>
{{item.Remarks}}
</td>
<td>
<div class="uploadListDiv ownScrollbarStyle">
<p v-for="(img,index) in item.VoucherPicList" @click="analyzeItem(item.VoucherPicList,index)">
{{img.FileName}}
</p>
</div>
</td>
<td>
<span>
<span>{{item.SupplierName}} <span v-if="item.SupplierPayType !== 0"
......@@ -370,7 +372,7 @@
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
) </span>
</span>
</td>
</tr>
......@@ -400,10 +402,10 @@
<td v-if="childIndex==0&&subIndex==0" :rowspan="3*item.DiningSummaryList.length">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0" :rowspan="3">
<template v-if="subItem.DiningName!=subItem.NewDiningName">
{{subItem.NewDiningName}}
{{subItem.NewDiningName}}
</template>
<template v-else>
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
......@@ -469,7 +471,7 @@
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
) </span>
</span>
</td>
</tr>
......@@ -626,7 +628,7 @@
<template v-else>
{{currencyTypeObj[leadr.CurrencyId]}}
</template>
) </span>
) </span>
</span>
</p>
<el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
......@@ -667,8 +669,7 @@
</th>
<th :colspan="1" width="200">
<div v-for="item in nav" style="margin: 10px 0;">
<input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn"
@click="ZhuiJiaTuanKuan(item)">
<input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn" @click="ZhuiJiaTuanKuan(item)">
</div>
</th>
</tr>
......@@ -755,7 +756,7 @@
data() {
return {
isUpdate: 'false',
LineId:0,
LineId: 0,
loading: false,
defaultSelectValue: 0,
initialIndex: 0,
......@@ -791,7 +792,7 @@
CurrencyListMoney: [],
currencyTypeObj: [],
//判断是否显示人民币
IsShowRMB:false,
IsShowRMB: false,
}
},
components: {
......@@ -890,7 +891,7 @@
}, err => {})
},
ZhuiJiaTuanKuan(item) {
let TCIDARR =[item.TCIDS]// [this.$route.query.id]
let TCIDARR = [item.TCIDS] // [this.$route.query.id]
let orderObj = {
OrderID: 0,
OrderSource: 8,
......@@ -973,15 +974,14 @@
CurrencyId: leadr.CurrencyId,
}
let id = [];
if (obj.LineId==this.LineId){
id = [98, 99]
}
else{
if (obj.OutBranchId === 0) {
id = [43, 48]
} else {
id = [56, 53]
}
if (obj.LineId == this.LineId) {
id = [98, 99]
} else {
if (obj.OutBranchId === 0) {
id = [43, 48]
} else {
id = [56, 53]
}
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
......@@ -1098,16 +1098,16 @@
100);
}
if((obj.OPState==1||obj.DMCState==1)&&item.HouseType!=6){
if ((obj.OPState == 1 || obj.DMCState == 1) && item.HouseType != 6) {
totalPrice += item.BookNum * obj.InTangTax;
}
}
} else {
totalPrice += 0;
}
})
totalPrice += obj.ParkFee + obj.CityTax ;
totalPrice += obj.ParkFee + obj.CityTax;
return this.moneyFormat(totalPrice)
},
diningTotalPrice(sObj, obj) {
......@@ -1185,8 +1185,8 @@
}, res => {
if (res.data.resultCode == 1) {
let nav = res.data.data.list;
if(nav[0].OutBranchId==1216){
this.IsShowRMB=true;
if (nav[0].OutBranchId == 1216) {
this.IsShowRMB = true;
}
let num = 0;
nav.forEach(x => {
......@@ -1294,8 +1294,8 @@
this.isUpdate = this.$route.query.isUpdate;
this.msg.TCIDs = this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
if(this.$route.query.OutBranchId==1216){
this.IsShowRMB=true;
if (this.$route.query.OutBranchId == 1216) {
this.IsShowRMB = true;
}
this.getList();
this.getTotalNav();
......
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