Skip to content

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

页面修改

parent 885ee5e6
Show whitespace changes
Inline Side-by-side
Showing with 454 additions and 239 deletions
src/components/Hotel/HotelWorkList.vue
View file @ edca8e54
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
<div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存 <div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存
</div> </div>
</template> </template>
<template v-else style="display:none;"> <template v-else >
<template <template
v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0"> v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
<template v-for="(childItem,childIndex) in scope.row.DayList[index].HotelJourneyOrderList" > <template v-for="(childItem,childIndex) in scope.row.DayList[index].HotelJourneyOrderList" >
<el-popover width="760" trigger="click" popper-class="Bus_HotelPop"> <el-popover width="760" trigger="click" popper-class="Bus_HotelPop">
<commonHotelWork :ref="'commonHotelWork_'+scope.$index+'_'+index+'_'+childIndex+''" :TCID="childItem.TCID" :HotelId="scope.row.Hotel" :DateStr="item.DateAllStr"> <!-- <commonHotelWork :ref="'commonHotelWork_'+scope.$index+'_'+index+'_'+childIndex+''" :TCID="childItem.TCID" :HotelId="scope.row.Hotel" :DateStr="item.DateAllStr">
</commonHotelWork> </commonHotelWork style="display:none;"> -->
<div :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0" slot="reference" class="w80" <div :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0" slot="reference" class="w80"
style="white-space:nowrap;color:red;cursor:pointer;text-decoration:underline;" style="white-space:nowrap;color:red;cursor:pointer;text-decoration:underline;"
@click="ClickChild(item.DateAllStr,scope.$index,index,childIndex)"> @click="ClickChild(item.DateAllStr,scope.$index,index,childIndex)">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</template> </template>
</template> </template>
<template v-else> <template v-else>
<el-popover width="760" trigger="click" popper-class="Bus_HotelPop"> <el-popover width="760" trigger="click" popper-class="Bus_HotelPop" style="display:none;">
<commonHotelWork :ref="'commonHotelWork_'+scope.$index+'_'+index+'_no'" :TCID="0" :HotelId="scope.row.Hotel" :DateStr="item.DateAllStr"> <commonHotelWork :ref="'commonHotelWork_'+scope.$index+'_'+index+'_no'" :TCID="0" :HotelId="scope.row.Hotel" :DateStr="item.DateAllStr">
</commonHotelWork> </commonHotelWork>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;" <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ edca8e54
...@@ -147,10 +147,10 @@ ...@@ -147,10 +147,10 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th colspan="24" class="bgwhite">酒店使用 </th> <th colspan="25" class="bgwhite">酒店使用 </th>
</tr> </tr>
<tr> <tr>
<th colspan="24" class="bgwhite"> <th colspan="25" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br /> 税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br /> 税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
司导间【月结】不计入总金额 司导间【月结】不计入总金额
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
<th width="60">税入<br />税别</th> <th width="60">税入<br />税别</th>
<th width="60">总金额</th> <th width="60">总金额</th>
<th width="60">付款<br />方式</th> <th width="60">付款<br />方式</th>
<th width="60">币种</th>
<th width="60">司导间<br />付款方式</th> <th width="60">司导间<br />付款方式</th>
<th width="100">供应商</th> <th width="100">供应商</th>
<th width="100">状态</th> <th width="100">状态</th>
...@@ -308,6 +309,9 @@ ...@@ -308,6 +309,9 @@
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td v-if="childIndex==0" :rowspan="6">
{{GetCurrency(subItem.CurrencyId)}}
</td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
<span v-if="subItem.DMCPayType === 1">现付</span> <span v-if="subItem.DMCPayType === 1">现付</span>
<span v-else-if="subItem.DMCPayType === 2">签单</span> <span v-else-if="subItem.DMCPayType === 2">签单</span>
...@@ -346,7 +350,7 @@ ...@@ -346,7 +350,7 @@
</template> </template>
<tr v-if="TotalNav.planPriceList"> <tr v-if="TotalNav.planPriceList">
<td>总金额</td> <td>总金额</td>
<td colspan="23"> <td colspan="24">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span> </span>
...@@ -356,7 +360,7 @@ ...@@ -356,7 +360,7 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th colspan="12" class="bgwhite">餐食使用</th> <th colspan="13" class="bgwhite">餐食使用</th>
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="100">使用时间</th> <th width="100">使用时间</th>
...@@ -370,6 +374,7 @@ ...@@ -370,6 +374,7 @@
<th width="">返佣</th> <th width="">返佣</th>
<th width="">总金额</th> <th width="">总金额</th>
<th width="">付款方式</th> <th width="">付款方式</th>
<th width="">币种</th>
<th width="100">备注</th> <th width="100">备注</th>
</tr> </tr>
<template v-for='(item,index) in list.DiningList'> <template v-for='(item,index) in list.DiningList'>
...@@ -395,7 +400,6 @@ ...@@ -395,7 +400,6 @@
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
{{ moneyFormat(childItem.PeoplePrice) }} {{ moneyFormat(childItem.PeoplePrice) }}
<!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} -->
</p> </p>
</td> </td>
<td> <td>
...@@ -415,6 +419,9 @@ ...@@ -415,6 +419,9 @@
<span v-else></span> <span v-else></span>
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{GetCurrency(subItem.CurrencyId)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{subItem.Remarks}} {{subItem.Remarks}}
...@@ -424,7 +431,7 @@ ...@@ -424,7 +431,7 @@
</template> </template>
<tr v-if="TotalNav.planPriceList"> <tr v-if="TotalNav.planPriceList">
<td>总金额</td> <td>总金额</td>
<td colspan="11"> <td colspan="12">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span> </span>
...@@ -560,14 +567,15 @@ ...@@ -560,14 +567,15 @@
<td style="padding: 5px 20px;"> <td style="padding: 5px 20px;">
<div style="margin:10px 0" v-for="cur in CurrencyListMoney"> <div style="margin:10px 0" v-for="cur in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr"> <template v-for="leadr in cur.LeaderGetPriceArr">
<p style="padding-left:20px;display:inline-block" > <p style="padding-left:20px;display:inline-block">
已领款： 已领款：
<span style="color: red;"> <span style="color: red;">
{{moneyFormat(leadr.LeaderGetPrice)}} {{moneyFormat(leadr.LeaderGetPrice)}}
<span v-if="cur.CurrencyId > 0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span> <span v-if="cur.CurrencyId > 0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span>
</span> </span>
</p> </p>
<el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number" v-model="leadr.LeaderGetPriceT"></el-input> <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
v-model="leadr.LeaderGetPriceT"></el-input>
</template> </template>
</div> </div>
</td> </td>
...@@ -581,9 +589,11 @@ ...@@ -581,9 +589,11 @@
<td width="80" class="_zhidan"> <td width="80" class="_zhidan">
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney"> <div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr"> <template v-for="leadr in cur.LeaderGetPriceArr">
<input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn" @click="goZhiDan(item, 2)" /> <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
@click="goZhiDan(item, 2)" />
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top"> <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr)" /> <input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn"
@click="goZhiDan(item,0,leadr)" />
</el-tooltip> </el-tooltip>
</template> </template>
</div> </div>
...@@ -593,13 +603,9 @@ ...@@ -593,13 +603,9 @@
<table border="0" cellspacing="1" class="leaderReimbursementTable"> <table border="0" cellspacing="1" class="leaderReimbursementTable">
<tr> <tr>
<th :colspan="7"> <th :colspan="7">
<span >追加团款</span> <span>追加团款</span>
</th> </th>
<th :colspan="1"><input <th :colspan="1"><input type="button" value="制单" class="leader2Btn" @click="ZhuiJiaTuanKuan()"></th>
type="button"
value="制单"
class="leader2Btn"
@click="ZhuiJiaTuanKuan()"></th>
</tr> </tr>
<tr> <tr>
<th>单号</th> <th>单号</th>
...@@ -614,10 +620,7 @@ ...@@ -614,10 +620,7 @@
<tr class="_item_list" v-for="(item,index) in zhuijiaList"> <tr class="_item_list" v-for="(item,index) in zhuijiaList">
<td>{{item.BranchName}}</td> <td>{{item.BranchName}}</td>
<td class="Bill_par"> <td class="Bill_par">
<el-popover <el-popover popper-class="detailsIT_Journal" placement="bottom-start" trigger="click">
popper-class="detailsIT_Journal"
placement="bottom-start"
trigger="click">
<template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)"> <template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
<my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill> <my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill>
</template> </template>
...@@ -630,19 +633,23 @@ ...@@ -630,19 +633,23 @@
<template v-else-if="item.Is_Merge===1&&item.modelShow"> <template v-else-if="item.Is_Merge===1&&item.modelShow">
<my-HB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </template>
<span slot="reference" @click="item.modelShow = true" class="text_d PingFangSC" >{{item.FrID}}</span> <span slot="reference" @click="item.modelShow = true" class="text_d PingFangSC">{{item.FrID}}</span>
</el-popover> </el-popover>
</td> </td>
<td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span></td> <td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
</td>
<td> <td>
<template v-for="(s,si) in item.CostTypeList"> <template v-for="(s,si) in item.CostTypeList">
<span class="_tag_span">{{s}}</span><br/> <span class="_tag_span">{{s}}</span><br />
</template> </template>
</td> </td>
<td class="_number"> <td class="_number">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0"> <template v-if="item.TradeWayList&&item.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList"> <div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList">
<p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type" :class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span> </p> <p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span
class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type"
:class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span>
</p>
<p>{{tw.BankNo}}</p> <p>{{tw.BankNo}}</p>
</div> </div>
</template> </template>
...@@ -653,8 +660,10 @@ ...@@ -653,8 +660,10 @@
</template> </template>
</td> </td>
<td> <td>
<p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.Money)}}</span></p> <p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.Money)}}</span>
<p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p> </p>
<p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span
class="">{{moneyFormat(item.PayMoney)}}</span></p>
</td> </td>
<td> <td>
<template v-if='item.Type===1'> <template v-if='item.Type===1'>
...@@ -690,7 +699,9 @@ ...@@ -690,7 +699,9 @@
<script> <script>
import commonHotelInfo from "../commonPage/commonHotelInfo.vue"; import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
import { constants } from 'os'; import {
constants
} from 'os';
export default { export default {
data() { data() {
return { return {
...@@ -705,7 +716,7 @@ import { constants } from 'os'; ...@@ -705,7 +716,7 @@ import { constants } from 'os';
TCIDs: '', TCIDs: '',
NewCombinationNum: '' NewCombinationNum: ''
}, },
zhuijiaList:[], zhuijiaList: [],
list: [], list: [],
nav: [], nav: [],
TravelDayNum: 0, TravelDayNum: 0,
...@@ -727,27 +738,80 @@ import { constants } from 'os'; ...@@ -727,27 +738,80 @@ import { constants } from 'os';
showCaozuoTime: true, //操作时间 showCaozuoTime: true, //操作时间
colspanLength: 6 //跨行 colspanLength: 6 //跨行
}, },
CurrencyListMoney:[], CurrencyListMoney: [],
currencyTypeObj:[], currencyTypeObj: [],
} }
}, },
components: { components: {
commonHotelInfo commonHotelInfo
}, },
methods: { methods: {
financeinfo_post_GetList(){ // 币种类型 GetCurrency(Id) {
this.apipost('financeinfo_post_GetList',{Name:''},res=>{ var str = "";
if(res.data.resultCode==1){ switch (Id) {
let data=res.data.data; case 0:
data.forEach(item=>{ str = "日元";
this.currencyTypeObj[item.ID]=item.Name; break;
case 1:
str = "人民币";
break;
case 2:
str = "美元";
break;
case 3:
str = "日元";
break;
case 4:
str = "韩元";
break;
case 5:
str = "欧元";
break;
case 6:
str = "英镑";
break;
case 7:
str = "港币";
break;
case 8:
str = "加拿大元";
break;
case 9:
str = "澳大利亚元";
break;
case 10:
str = "新西兰元";
break;
case 11:
str = "新台币";
break;
case 12:
str = "泰国铢";
break;
case 13:
str = "新加坡元";
break;
case 14:
str = "瑞士法郎";
break;
}
return str;
},
financeinfo_post_GetList() { // 币种类型
this.apipost('financeinfo_post_GetList', {
Name: ''
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(item => {
this.currencyTypeObj[item.ID] = item.Name;
}) })
}else{ } else {
} }
},err=>{}) }, err => {})
}, },
ZhuiJiaTuanKuan(){ ZhuiJiaTuanKuan() {
let TCIDARR = [this.$route.query.id] let TCIDARR = [this.$route.query.id]
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
...@@ -755,7 +819,8 @@ import { constants } from 'os'; ...@@ -755,7 +819,8 @@ import { constants } from 'os';
Obj: {}, Obj: {},
SourceID: 0, SourceID: 0,
TCIDList: TCIDARR, TCIDList: TCIDARR,
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route.query.id TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route
.query.id
} }
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
...@@ -768,10 +833,11 @@ import { constants } from 'os'; ...@@ -768,10 +833,11 @@ import { constants } from 'os';
} }
}); });
}, },
getzhuijiaList(){ getzhuijiaList() {
this.apipost( this.apipost(
'Financial_post_GetTravelFinanceReplenishList', { 'Financial_post_GetTravelFinanceReplenishList', {
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route.query.id TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route
.query.id
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -814,12 +880,12 @@ import { constants } from 'os'; ...@@ -814,12 +880,12 @@ import { constants } from 'os';
} }
}); });
}, },
goZhiDan2: function (obj,type,leadr) { goZhiDan2: function (obj, type, leadr) {
if (leadr) { if (leadr) {
// let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95 // let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95
let allMoney = leadr.PlanPrice; let allMoney = leadr.PlanPrice;
let totailMoney = 0; let totailMoney = 0;
totailMoney=Number(leadr.LeaderGetPriceT)+Number(leadr.LeaderGetPrice); totailMoney = Number(leadr.LeaderGetPriceT) + Number(leadr.LeaderGetPrice);
// this.nav.forEach(x => { // this.nav.forEach(x => {
// totailMoney += parseFloat(x.LeaderGetPriceT) // totailMoney += parseFloat(x.LeaderGetPriceT)
// totailMoney += x.LeaderGetPrice // totailMoney += x.LeaderGetPrice
...@@ -837,7 +903,7 @@ import { constants } from 'os'; ...@@ -837,7 +903,7 @@ import { constants } from 'os';
CostType: 56, CostType: 56,
Money: leadr.LeaderGetPriceT, Money: leadr.LeaderGetPriceT,
TCNUMS: obj.TCNUMS, TCNUMS: obj.TCNUMS,
CurrencyId:leadr.CurrencyId, CurrencyId: leadr.CurrencyId,
} }
let id = []; let id = [];
if (obj.OutBranchId === 0) { if (obj.OutBranchId === 0) {
...@@ -857,19 +923,19 @@ import { constants } from 'os'; ...@@ -857,19 +923,19 @@ import { constants } from 'os';
} }
}); });
}, },
goZhiDan: function (obj,num,leadr) { goZhiDan: function (obj, num, leadr) {
if (this.list.hotelNoSureInfo !== '') { if (this.list.hotelNoSureInfo !== '') {
this.$confirm(`${this.list.hotelNoSureInfo},是否去制单？`, this.$t('tips.tips'), { this.$confirm(`${this.list.hotelNoSureInfo},是否去制单？`, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.goZhiDan2(obj,num,leadr) this.goZhiDan2(obj, num, leadr)
}).catch(() => { }).catch(() => {
return false return false
}); });
} else { } else {
this.goZhiDan2(obj,num,leadr) this.goZhiDan2(obj, num, leadr)
} }
}, },
addOtherList(index, id) { addOtherList(index, id) {
...@@ -1038,40 +1104,40 @@ import { constants } from 'os'; ...@@ -1038,40 +1104,40 @@ import { constants } from 'os';
let nav = res.data.data.list; let nav = res.data.data.list;
let num = 0; let num = 0;
nav.forEach(x => { nav.forEach(x => {
x.CurrencyIdArr=[]; x.CurrencyIdArr = [];
nav.LeaderGetPriceT = 0; nav.LeaderGetPriceT = 0;
num += x.LeaderGetPrice num += x.LeaderGetPrice
x.hideZDBtn = false; x.hideZDBtn = false;
if (Number(x.DMCRemark) >= 0) { if (Number(x.DMCRemark) >= 0) {
x.hideZDBtn = true; x.hideZDBtn = true;
} }
x.LeaderGetPriceList.forEach(lead=>{ x.LeaderGetPriceList.forEach(lead => {
if(x.CurrencyIdArr.indexOf(lead.CurrencyId) < 0){ if (x.CurrencyIdArr.indexOf(lead.CurrencyId) < 0) {
x.CurrencyIdArr.push(lead.CurrencyId) x.CurrencyIdArr.push(lead.CurrencyId)
} }
}) })
}) })
// 预付合计总金额 // 预付合计总金额
let CurrencyIdArr=[]; let CurrencyIdArr = [];
this.CurrencyListMoney=[]; this.CurrencyListMoney = [];
if(this.TotalNav.planPriceList){ if (this.TotalNav.planPriceList) {
this.TotalNav.planPriceList.forEach(item=>{ this.TotalNav.planPriceList.forEach(item => {
if(CurrencyIdArr.indexOf(item.CurrencyId) < 0){ if (CurrencyIdArr.indexOf(item.CurrencyId) < 0) {
CurrencyIdArr.push(item.CurrencyId) CurrencyIdArr.push(item.CurrencyId)
} }
}) })
CurrencyIdArr.forEach(id=>{ CurrencyIdArr.forEach(id => {
let obj={ let obj = {
money:0, money: 0,
CurrencyId:0 CurrencyId: 0
}; };
this.TotalNav.planPriceList.forEach(item=>{ this.TotalNav.planPriceList.forEach(item => {
if(item.CurrencyId==id){ if (item.CurrencyId == id) {
obj.money+=item.PlanTotalPrice; obj.money += item.PlanTotalPrice;
obj.CurrencyId=item.CurrencyId; obj.CurrencyId = item.CurrencyId;
} }
}) })
this.CurrencyListMoney.push(obj); this.CurrencyListMoney.push(obj);
...@@ -1080,31 +1146,31 @@ import { constants } from 'os'; ...@@ -1080,31 +1146,31 @@ import { constants } from 'os';
} }
this.CurrencyListMoney.forEach((cur,i)=>{ this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr=[]; cur.LeaderGetPriceArr = [];
let obj={ let obj = {
CurrencyId:cur.CurrencyId, CurrencyId: cur.CurrencyId,
LeaderGetPrice:0, LeaderGetPrice: 0,
LeaderGetPriceT:0, LeaderGetPriceT: 0,
}; };
nav.forEach(x => { nav.forEach(x => {
x.LeaderGetPriceList.forEach(price=>{ x.LeaderGetPriceList.forEach(price => {
if(cur.CurrencyId==price.CurrencyId){ if (cur.CurrencyId == price.CurrencyId) {
obj.CurrencyId=price.CurrencyId; obj.CurrencyId = price.CurrencyId;
obj.LeaderGetPrice+=price.OrderMakingPrice; obj.LeaderGetPrice += price.OrderMakingPrice;
} }
}) })
}) })
cur.LeaderGetPriceArr.push(obj); cur.LeaderGetPriceArr.push(obj);
}) })
this.CurrencyListMoney.forEach((cur,i)=>{ this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr.forEach(lead=>{ cur.LeaderGetPriceArr.forEach(lead => {
if (i === 0) { if (i === 0) {
lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) *100) / 100; lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) * 100) / 100;
lead.PlanPrice=cur.money * 0.95; lead.PlanPrice = cur.money * 0.95;
} else { } else {
lead.LeaderGetPriceT = 0; lead.LeaderGetPriceT = 0;
lead.PlanPrice=cur.money * 0.95; lead.PlanPrice = cur.money * 0.95;
} }
}) })
...@@ -1217,6 +1283,7 @@ import { constants } from 'os'; ...@@ -1217,6 +1283,7 @@ import { constants } from 'os';
background: #fff; background: #fff;
text-align: center; text-align: center;
} }
.leader2Btn { .leader2Btn {
color: #fff; color: #fff;
padding: 0 15px; padding: 0 15px;
...@@ -1225,44 +1292,192 @@ import { constants } from 'os'; ...@@ -1225,44 +1292,192 @@ import { constants } from 'os';
border: 1px solid #e95252; border: 1px solid #e95252;
cursor: pointer; cursor: pointer;
border-radius: 15px; border-radius: 15px;
} }
.Receipt_box{padding: 15px;color: #c94052;width: 614px;background-color: rgba(242, 242, 242, 1);border: 1px solid rgba(228, 228, 228, 1)}
.Receipt_box.color_blur{color: #106BAF;} .Receipt_box {
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px} padding: 15px;
.rb_tit{font-size: 18px;text-align: center} color: #c94052;
.rb_stit{font-size: 14px;text-align: center} width: 614px;
.rb_stit span{display: inline-block;border-bottom: 2px solid #C94052;padding: 0 20px} background-color: rgba(242, 242, 242, 1);
.rb_top_row{display: flex;justify-content: space-between;font-size: 12px;} border: 1px solid rgba(228, 228, 228, 1)
.rb_top_row span._r_name{color: #333333} }
.rb_top_row span._r_bold{font-weight: bold}
.rb_top_row ._r_time span{color: #333333} .Receipt_box.color_blur {
._r_mb5{margin-bottom: 5px;} color: #106BAF;
.Receipt_table{width: 100%;font-size: 14px;text-align: center} }
.Receipt_table .th{font-weight: 200 !important}
._r_mt10{margin-top: 10px;} .Receipt_box.color_blur .rb_stit span {
._bg__{display: inline-block;padding: 2px 8px;color: white;border-radius: 4px} display: inline-block;
._bg_red{background-color: #E95252;} border-bottom: 2px solid #106BAF;
._bg_green{background-color: #2BB87C} padding: 0 20px
.text_d{text-decoration: underline;cursor: pointer;} }
.PingFangSC{font-weight: bold}
.Bill_par{position: relative;} .rb_tit {
tr._item_list{border-bottom: 1px solid #E5E5E5;height: 78px;} font-size: 18px;
tr._item_list td{border-bottom: 1px solid #e5e5e5; padding: 10px;} text-align: center
}
.rb_stit {
font-size: 14px;
text-align: center
}
.rb_stit span {
display: inline-block;
border-bottom: 2px solid #C94052;
padding: 0 20px
}
.rb_top_row {
display: flex;
justify-content: space-between;
font-size: 12px;
}
.rb_top_row span._r_name {
color: #333333
}
.rb_top_row span._r_bold {
font-weight: bold
}
.rb_top_row ._r_time span {
color: #333333
}
._r_mb5 {
margin-bottom: 5px;
}
.Receipt_table {
width: 100%;
font-size: 14px;
text-align: center
}
.Receipt_table .th {
font-weight: 200 !important
}
._r_mt10 {
margin-top: 10px;
}
._bg__ {
display: inline-block;
padding: 2px 8px;
color: white;
border-radius: 4px
}
._bg_red {
background-color: #E95252;
}
._bg_green {
background-color: #2BB87C
}
.text_d {
text-decoration: underline;
cursor: pointer;
}
.PingFangSC {
font-weight: bold
}
.Bill_par {
position: relative;
}
tr._item_list {
border-bottom: 1px solid #E5E5E5;
height: 78px;
}
tr._item_list td {
border-bottom: 1px solid #e5e5e5;
padding: 10px;
}
/* tr._t_head th{border-top: 1px solid #e5e5e5;} */ /* tr._t_head th{border-top: 1px solid #e5e5e5;} */
tr._item_list td:first-child{border-left: 1px solid #e5e5e5;} tr._item_list td:first-child {
tr._item_list td:last-child{border-right: 1px solid #e5e5e5;} border-left: 1px solid #e5e5e5;
._head_img{width: 28px;height: 28px;border-radius: 50%;vertical-align:middle;} }
._btn_group{font-size: 14px;}
.icon-daiqueren{color: #4BCA81} tr._item_list td:last-child {
.icon-yiqueren{color: #4BCA81} border-right: 1px solid #e5e5e5;
.icon-yiquxiao{color: #959595} }
.icon-shenhebohui{color: #E95252}
.icon-icon-zancun{color: #FF9C01} ._head_img {
.singeRowTable tr:hover{background-color: white} width: 28px;
._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px} height: 28px;
._bold{font-weight: bold} border-radius: 50%;
._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;} vertical-align: middle;
._bank_name{margin-left: 10px;} }
._bank_type{background-color: #2AAEF2}
._bank_type2{background-color: #FF9C01} ._btn_group {
font-size: 14px;
}
.icon-daiqueren {
color: #4BCA81
}
.icon-yiqueren {
color: #4BCA81
}
.icon-yiquxiao {
color: #959595
}
.icon-shenhebohui {
color: #E95252
}
.icon-icon-zancun {
color: #FF9C01
}
.singeRowTable tr:hover {
background-color: white
}
._TradeWayList {
padding: 5px 10px;
background-color: #EEEEEE;
border-radius: 4px;
margin: 10px 0;
width: 230px
}
._bold {
font-weight: bold
}
._bank_name,
._bank_type {
display: inline-block;
background-color: #333333;
color: white;
padding: 2px 4px;
border-radius: 4px;
margin-left: 10px;
}
._bank_name {
margin-left: 10px;
}
._bank_type {
background-color: #2AAEF2
}
._bank_type2 {
background-color: #FF9C01
}
</style> </style>
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