Skip to content

S
SuperMan
Commit 2644d87f authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 804dcd76 88d7dce0
Hide whitespace changes
Inline Side-by-side
Showing with 718 additions and 370 deletions
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ 2644d87f
...@@ -89,11 +89,10 @@ ...@@ -89,11 +89,10 @@
padding: 0 !important; padding: 0 !important;
} }
/deep/.page_CompanyAccDetail .el-table .el-table__cell { /deep/.page_CompanyAccDetail .el-table .el-table__cell {
padding: 0 12px!important; padding: 0 3px!important;
} }
.cm_content{ .cm_content{
width: 100%; width: 100%;
height: 600px;
} }
.BalanceBox{ .BalanceBox{
...@@ -111,13 +110,20 @@ ...@@ -111,13 +110,20 @@
right: 0; right: 0;
top: 0; top: 0;
bottom: 0; bottom: 0;
width: 479px; width: 330px;
background: #fff; background: #fff;
z-index: 2; z-index: 2;
} }
/deep/.page_CompanyAccDetail .el-table__row.hover-row .BalanceListBox{ /deep/.page_CompanyAccDetail .el-table__row.hover-row .BalanceListBox{
background: #F5F7FA; background: #F5F7FA;
} }
/deep/.page_CompanyAccDetail .el-table th.el-table__cell>.cell{
/* font-size: 13px; */
}
/deep/.page_CompanyAccDetail .el-table .cell{
padding-left: 0;
padding-right: 0;
}
</style> </style>
<template> <template>
...@@ -188,7 +194,7 @@ ...@@ -188,7 +194,7 @@
</div> </div>
<div class="cm_content"> <div class="cm_content">
<el-table ref="table" :data="SubjectList" <el-table ref="table" :data="SubjectList"
style="width: 100%;" height="600" style="width: 100%;"
v-loading="loadingTable" v-loading="loadingTable"
:span-method="objectSpanMethod" :span-method="objectSpanMethod"
:header-cell-style="{ width: '200px' }" :header-cell-style="{ width: '200px' }"
...@@ -211,7 +217,7 @@ ...@@ -211,7 +217,7 @@
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div> <div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template> </template>
<el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center"> <el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center">
<el-table-column prop="" :label="$t('objFill.v103.yinhangshouru')" width="120" align="center"> <el-table-column prop="" :label="$t('objFill.v103.yinhangshouru')" width="83" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" class="textnowrap"> <div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" class="textnowrap">
...@@ -230,7 +236,7 @@ ...@@ -230,7 +236,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" :label="$t('objFill.v103.danjusr')" width="120" align="center"> <el-table-column prop="" :label="$t('objFill.v103.danjusr')" width="83" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],1)" <div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],1)"
class="BalanceBox" class="BalanceBox"
...@@ -239,14 +245,14 @@ ...@@ -239,14 +245,14 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" :label="$t('objFill.v103.yinhangzhichu')" width="120" align="center"> <el-table-column prop="" :label="$t('objFill.v103.yinhangzhichu')" width="83" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5"> <div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5">
{{ scope.row.BalanceList[index].Expenses }} {{ scope.row.BalanceList[index].Expenses }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" :label="$t('objFill.v103.danjuzc')" width="120" align="center"> <el-table-column prop="" :label="$t('objFill.v103.danjuzc')" width="83" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],2)" <div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],2)"
class="BalanceBox" class="BalanceBox"
...@@ -258,9 +264,9 @@ ...@@ -258,9 +264,9 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
</div> </div>
<div style="height:30px"></div>
<SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList> <SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList>
<addSubject v-if="isShowAdd" :obj="addMsg" @changeData="changeData" @change="close"></addSubject> <addSubject v-if="isShowAdd" :obj="addMsg" @changeData="changeData" @change="close"></addSubject>
<BankStatement v-if="isShowBankSta" :obj="BankStaObj" @changeData="changeDataBan" @change="isShowBankSta=false"></BankStatement> <BankStatement v-if="isShowBankSta" :obj="BankStaObj" @changeData="changeDataBan" @change="isShowBankSta=false"></BankStatement>
...@@ -330,7 +336,7 @@ export default { ...@@ -330,7 +336,7 @@ export default {
}, },
created(){ created(){
let mon1= this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")); let mon1= this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
let mon2= this.getBeforeDate(2, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))) let mon2= this.getBeforeDate(4, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
// let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd")); // let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd"));
// let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))) // let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
this.titleStart = mon2.slice(5,7)>9?mon2.slice(5,7):mon2.slice(6,7) this.titleStart = mon2.slice(5,7)>9?mon2.slice(5,7):mon2.slice(6,7)
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 2644d87f
...@@ -978,7 +978,7 @@ ...@@ -978,7 +978,7 @@
<td @click="gotoTravelList(o)" v-if="GetDetail.CreateBy!=userInfo.EmployeeId"> <span class="_jump_page _font_bold">{{$t('objFill.cktd')}}</span> </td> <td @click="gotoTravelList(o)" v-if="GetDetail.CreateBy!=userInfo.EmployeeId"> <span class="_jump_page _font_bold">{{$t('objFill.cktd')}}</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span
class="_jump_page _font_bold">{{$t('salesModule.LookBM')}}</span> </td> class="_jump_page _font_bold">{{$t('salesModule.LookBM')}}</span> </td>
<td v-if="(qjGroupId==userInfo.RB_Group_id || TeamShouZhi) && GetDetail.CreateBy!=userInfo.EmployeeId" <td v-if="(qjGroupId==userInfo.RB_Group_id || TeamShouZhi) && (GetDetail.CreateBy!=userInfo.EmployeeId || ActionMenuCode.indexOf('S_Travel_AirLoss') != -1)"
@click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)">
<span class="_jump_page _font_bold">{{$t('objFill.tdsz')}}</span> </td> <span class="_jump_page _font_bold">{{$t('objFill.tdsz')}}</span> </td>
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 2644d87f
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td> <td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="7" class="_color_b"> <td height="34px" colspan="7" class="_color_b">
<template v-for="(item,index) in GetDetail.CashierDetail"> <template v-for="(item,index) in GetDetail.CashierDetail">
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（<span v-if="item.Rate!=1" style="margin-right:10px;">{{item.OriginalMoney}}/</span>{{item.Money}}） </p> <p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（<span v-if="item.Rate!=1" style="margin-right:10px;">{{item.OriginalMoney}}/</span>{{item.Money}}） <span v-if="item.MultiplePay>0">{{item.MultPayDate}}[{{item.MultiplePay}}]</span></p>
</template> </template>
</td> </td>
</tr> </tr>
......
src/components/FinancialModule/accDetail/AccountStatementDetail.vue
View file @ 2644d87f
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<td> <td>
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)"> <input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td> </td>
<td>{{item.AllotDate}}</td> <td>{{item.AllotDate}}<span v-if="item.MultiplePay>0"> [{{item.MultiplePay}}]</span></td>
<td>{{(item.FType==1?$t('restaurant.res_income'):item.FType==2?$t('restaurant.res_outcome'):item.FType==4?$t('objFill.tiaobo'):'-')}}</td> <td>{{(item.FType==1?$t('restaurant.res_income'):item.FType==2?$t('restaurant.res_outcome'):item.FType==4?$t('objFill.tiaobo'):'-')}}</td>
<!-- <td>{{item.FrIdStr}}</td> --> <!-- <td>{{item.FrIdStr}}</td> -->
<td>{{item.SubjectName}}</td> <td>{{item.SubjectName}}</td>
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 2644d87f
...@@ -183,6 +183,7 @@ ...@@ -183,6 +183,7 @@
</el-form> </el-form>
<ul> <ul>
<li> <li>
<input type="button" class="hollowFixedBtn" value="追加付款" @click="MultPay"/>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
...@@ -488,6 +489,211 @@ ...@@ -488,6 +489,211 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog custom-class='w750 height="34px"' title="多期付款" :visible.sync="MultPayShow" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit">
单据应付 <span>{{ moneyFormat(MultPayData.WBAgoMoney) }}</span>{{MultPayData.CurrencyName}} &nbsp;&nbsp;&nbsp;&nbsp;
剩余待付 <span>{{ moneyFormat(MultPayData.WBMoney) }}{{MultPayData.CurrencyName}}</span>
</p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template>
<tr >
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<th height="34px">{{$t('fnc.jine')}}</th>
<th height="34px" width="70">{{$t('hotel.hotel_Currency')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<th height="34px" width="100px">{{$t('fnc.a_zongjine')}}</th>
</tr>
<template v-for="(item,index) in payMsgList">
<tr v-if="!item.show" @click="payMsgList[index].show=true">
<td height="34px">{{item.AccName}}</td>
<td height="34px">{{item.Name}}</td>
<td height="34px">{{item.Account}}</td>
<td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>
<td height="34px">{{item.CurrenName}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{moneyFormat(item.allMoney)}}</td>
</tr>
<tr v-else class="_show_class">
<td>
<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)"
@blur="item.show=false,CalculationMoney()"
:placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{item.CurrenName}}</p>
</td>
<td>
<el-input v-model="item.Rate" @blur="item.show=false,CalculationMoney()" @change="Calculation(1,index)"
type="number" class=" _border_b_1"></el-input>
</td>
<td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney()" class="_delete_row iconfont icon-img_delete_small"></i></td>
</tr>
</template>
<tr>
<td>
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank(),addList()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type),addList()" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')"
@change="setAccountName(payMsg.AccountId,2),addList()" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
</td>
<td>
<el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{moneyFormat(payMsg.allMoney)}}</td>
</tr>
</template>
<tr>
<td height="34px">{{$t('fnc.a_zongjine')}}</td>
<td height="34px" colspan="7">
<el-input v-model="listAllMoney" type="number" :placeholder="$t('rule.qsrzjine')" class=" _border_b_1"></el-input>
</td>
</tr>
<tr v-if="BillType===2">
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="5">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
:default-value="TradeDate"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
<tr v-if="BillType===1">
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="1">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="1">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
<td>{{$t('objFill.v103.liushukemu')}}</td>
<td colspan="2">
<el-select class="width100b" v-model="addMsg.BankSubjectId"
filterable
:placeholder="$t('objFill.v103.qingxuanzlskm')">
<el-option
v-for="item in SubjectTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
/>
</el-select>
</td>
</tr>
</table>
<el-form label-width="110px">
<el-row>
<el-col :span="12" :gutter="35">
<el-form-item :label="$t('objFill.shangchuanpz')">
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
</template>
<div class="_pic_upload">
<el-upload
drag
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitMultPay">{{$t('pub.saveBtn')}}</button>
&nbsp;
<button class="hollowFixedBtn" @click="initAddChuNa">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]"> <div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]">
<div style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;"> <div style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;">
<el-carousel :initial-index=initialIndex height="600px" :interval="5000" trigger="click"> <el-carousel :initial-index=initialIndex height="600px" :interval="5000" trigger="click">
...@@ -601,6 +807,8 @@ export default { ...@@ -601,6 +807,8 @@ export default {
TradeDate:'', TradeDate:'',
initialIndex: 0, initialIndex: 0,
SubjectTypeList: [], SubjectTypeList: [],
MultPayShow:false,
MultPayData:{}
} }
}, },
created(){ created(){
...@@ -842,6 +1050,7 @@ export default { ...@@ -842,6 +1050,7 @@ export default {
this.huikuanren = ''; this.huikuanren = '';
this.TradeDate=''; this.TradeDate='';
this.addChuNa = false; this.addChuNa = false;
this.MultPayShow= false;
this.payMsg = { this.payMsg = {
ID:0, ID:0,
FinanceId:'', FinanceId:'',
...@@ -1000,6 +1209,47 @@ export default { ...@@ -1000,6 +1209,47 @@ export default {
this.payMsg.Type = ''; this.payMsg.Type = '';
this.payMsg.AccountId = ''; this.payMsg.AccountId = '';
}, },
submitMultPay(){
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error(this.$t('rule.qtxhkuanren')) ;
let str = '';
this.checkList.forEach(x=>{
if(x.FinanceId){
str = str+x.FinanceId+','
}
});
this.addMsg.FrIDs = str.substring(0,str.length-1);
this.addMsg.BankList = this.payMsgList;
this.addMsg.Money = this.listAllMoney;
this.allLoading = true
this.apipost('Financial_post_SetMultipleMergePay',this.addMsg,r=>{
if(r.data.resultCode === 1) {
this.MultPayShow = false;
this.saveMsg=[];
this.payMsgList = []
this.payMsg = {
ID:0,
FinanceId:'',
Type:'',
AccountId:'',
OriginalMoney:0,
CurrencyId:'',
Rate:0,
Fee:0,
Name:'',
CurrenName:'',
Account:'',
balance:'',
allMoney:0,
show:false,
}
this.$message.success(r.data.message)
}else{
this.$message.error(r.data.message)
}
this.allLoading = false
},null)
},
submitAddChuNa(){ submitAddChuNa(){
// if(this.payMsgList.length===0) return this.$message.error(this.$t('fnc.a_qxzjyfangshi')); // if(this.payMsgList.length===0) return this.$message.error(this.$t('fnc.a_qxzjyfangshi'));
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi')); if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
...@@ -1139,6 +1389,30 @@ export default { ...@@ -1139,6 +1389,30 @@ export default {
this.$message.error(this.$t('fnc.a_qxzdanju')) this.$message.error(this.$t('fnc.a_qxzdanju'))
} }
}, },
MultPay(){ // 添加出纳按钮点击事件
this.checkList.forEach(x=>{
if(x.FinanceId){
this.addMsg.FrIDs = this.addMsg.FrIDs + x.FinanceId + ',';
}
});
if(this.addMsg.FrIDs){
let s = this.addMsg.FrIDs;
s = s.substring(0,s.length - 1);
this.addMsg.FrIDs = s;
this.addMsg.IsAdvanceFinance='0';
this.addMsg.vorcherInos=[];
}else{
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
this.apipost('Financial_post_GetMultipleMergePayBalance',this.addMsg,res=>{
if(res.data.resultCode==1){
this.MultPayData = res.data.data;
this.MultPayShow=true;
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
addList(){ addList(){
if(this.payMsg.AccountId==='')return; if(this.payMsg.AccountId==='')return;
if(this.payMsg.OriginalMoney===0||this.payMsg.OriginalMoney==='')return; if(this.payMsg.OriginalMoney===0||this.payMsg.OriginalMoney==='')return;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 2644d87f
...@@ -1053,6 +1053,7 @@ ...@@ -1053,6 +1053,7 @@
@click="goFncUrl('DebitNote', subItem.FinanceId)">{{$t('objFill.jiezhidan')}}</span></p> @click="goFncUrl('DebitNote', subItem.FinanceId)">{{$t('objFill.jiezhidan')}}</span></p>
</td> </td>
<td width="80" class="_zhidan"> <td width="80" class="_zhidan">
<template v-if="myLineId==90"> <template v-if="myLineId==90">
<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" v-if=" leadr.TCNUMS == item.TCNUMS"> <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
...@@ -1071,6 +1072,7 @@ ...@@ -1071,6 +1072,7 @@
<span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span> <span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template> </template>
</template> </template>
<input style="margin-top:5px;" type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" />
</div> </div>
</template> </template>
<template v-else> <template v-else>
...@@ -1098,6 +1100,7 @@ ...@@ -1098,6 +1100,7 @@
<template v-else-if="!item.hideZDBtn && index2==0"> <template v-else-if="!item.hideZDBtn && index2==0">
<span>{{$t('objFill.chaoguowtsjxzwfzd')}}</span> <span>{{$t('objFill.chaoguowtsjxzwfzd')}}</span>
</template> </template>
<input style="margin-top:5px;" type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" />
</template> </template>
</div> </div>
</template> </template>
...@@ -1760,8 +1763,20 @@ ...@@ -1760,8 +1763,20 @@
err => {} err => {}
); );
}, },
//跳转报报价单
gotoOfferChange(offerId) {
if (offerId) {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': offerId,
'Qtype': 3,
'blank': 'y',
}
});
}
},
ZhuiJiaTuanKuan(item) { ZhuiJiaTuanKuan(item) {
this.apipost('financestatistics_post_GetTravelPrerealContrast', { this.apipost('financestatistics_post_GetTravelPrerealContrast', {
TCID: item.TCIDS TCID: item.TCIDS
}, res => { }, res => {
...@@ -1773,14 +1788,7 @@ ...@@ -1773,14 +1788,7 @@
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.gotoOfferChange(res.data.data.OfferId);
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => { }).catch(() => {
}); });
...@@ -1790,14 +1798,7 @@ ...@@ -1790,14 +1798,7 @@
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.gotoOfferChange(res.data.data.OfferId);
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => { }).catch(() => {
}); });
...@@ -1916,14 +1917,7 @@ ...@@ -1916,14 +1917,7 @@
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.gotoOfferChange(res.data.data.OfferId)
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => { }).catch(() => {
}); });
...@@ -1933,17 +1927,8 @@ ...@@ -1933,17 +1927,8 @@
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.gotoOfferChange(res.data.data.OfferId)
name: 'OfferChange', }).catch(() => {});
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => {
});
} }
} else { } else {
this.goDiJieZhiDan(obj, num, leadr, cur); this.goDiJieZhiDan(obj, num, leadr, cur);
...@@ -2342,7 +2327,8 @@ ...@@ -2342,7 +2327,8 @@
LeaderGetPriceT: 0, LeaderGetPriceT: 0,
ShowTotalPrice: 0, ShowTotalPrice: 0,
TCNUMS: x.TCNUMS, TCNUMS: x.TCNUMS,
TCIDS: x.TCIDS TCIDS: x.TCIDS,
OfferId: x.OfferId,
}; };
x.LeaderGetPriceList.forEach(price => { x.LeaderGetPriceList.forEach(price => {
if (cur.CurrencyId == price.CurrencyId) { if (cur.CurrencyId == price.CurrencyId) {
...@@ -3152,11 +3138,6 @@ ...@@ -3152,11 +3138,6 @@
border-collapse: collapse; border-collapse: collapse;
} }
/* table.OtherExpensesList th:first {
border: 1px solid #ccc;
padding: 8px;
background-color: #dedede ;
} */
table.OtherExpensesList th { table.OtherExpensesList th {
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 8px; padding: 8px;
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 2644d87f
...@@ -155,15 +155,16 @@ ...@@ -155,15 +155,16 @@
<td class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel_CurrentRate')}}</td> <td class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel_CurrentRate')}}</td>
<td v-for='(item,index) in CostCurrencyList' :key="index+20000" style=" white-space: nowrap;"> <td v-for='(item,index) in CostCurrencyList' :key="index+20000" style=" white-space: nowrap;">
{{item.ExchangeRate}} {{item.ExchangeRate}}
<template v-if="item.OtherChangeModel!=null"> <font style="color:red;"> <template v-if="item.OtherChangeModel!=null">
<template v-if="item.OtherChangeModel.HotelChangeValue>0"> <font style="color:red;">
+{{item.OtherChangeModel.HotelChangeValue}} <template v-if="item.OtherChangeModel.HotelChangeValue>0">
</template> +{{item.OtherChangeModel.HotelChangeValue}}
<template v-else> </template>
{{item.OtherChangeModel.HotelChangeValue}} <template v-else>
</template> {{item.OtherChangeModel.HotelChangeValue}}
</font></template> </template>
</font>
</template>
<!-- </br><a v-if="IsEdit==3" style="color:blue;cursor:pointer" <!-- </br><a v-if="IsEdit==3" style="color:blue;cursor:pointer"
@click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a> --> @click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a> -->
</td> </td>
...@@ -174,18 +175,19 @@ ...@@ -174,18 +175,19 @@
<td class="CP_ComTitle2 CostcomCenter">{{$t('admin.admin_personNumber')}}</td> <td class="CP_ComTitle2 CostcomCenter">{{$t('admin.admin_personNumber')}}</td>
<td v-for="(item,index) in CostNumberList" :key="index+30000"> <td v-for="(item,index) in CostNumberList" :key="index+30000">
{{item.PeopleNumber}} {{item.PeopleNumber}}
<template v-if="item.OtherChangeModel!=null"> <font style="color:red;"> <template v-if="item.OtherChangeModel!=null">
<template v-if="item.OtherChangeModel.HotelChangeValue>0"> <font style="color:red;">
+{{item.OtherChangeModel.HotelChangeValue}} <template v-if="item.OtherChangeModel.HotelChangeValue>0">
</template> +{{item.OtherChangeModel.HotelChangeValue}}
<template v-else> </template>
{{item.OtherChangeModel.HotelChangeValue}} <template v-else>
</template> {{item.OtherChangeModel.HotelChangeValue}}
</font></template> </template>
</font>
</template>
<!-- <br/> <!-- <br/>
<a v-if="IsEdit==3" style="color:blue;cursor:pointer" <a v-if="IsEdit==3" style="color:blue;cursor:pointer"
@click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a> --> @click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a> -->
</td> </td>
<td :colspan="13-2-CostNumberList.length+1"> <td :colspan="13-2-CostNumberList.length+1">
</td> </td>
...@@ -219,6 +221,7 @@ ...@@ -219,6 +221,7 @@
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('system.query_airName')}}</td> <td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('system.query_airName')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('Operation.Op_price')}}</td> <td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('Operation.Op_price')}}</td>
</tr> </tr>
<template v-for="(subItem,subIndex) in dayCostPrice"> <template v-for="(subItem,subIndex) in dayCostPrice">
<tr :key="subIndex+100000"> <tr :key="subIndex+100000">
<td align="center"> <td align="center">
...@@ -288,8 +291,16 @@ ...@@ -288,8 +291,16 @@
<template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''"> <template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
{{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br /> {{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br />
</template> </template>
<template v-if="subItem.LunchName&&subItem.LunchName!=''"> <template
{{$t('objFill.v101.wucanmc')}}: {{subItem.LunchName}}<br /> v-if="(subItem.LunchName&&subItem.LunchName!='')||(subItem.IsLunchChange&&subItem.LunchChangeContent!='')">
{{$t('objFill.v101.wucanmc')}}:
<font v-if="subItem.LunchName!=''"
:style="(subItem.IsLunchChange&&subItem.LunchChangeContent!='')?'text-decoration: line-through;':''">
{{subItem.LunchName}}</font>
<font v-if="subItem.IsLunchChange&&subItem.LunchChangeContent!=''" style="color:red;">
<br /> {{subItem.LunchChangeContent}}
</font>
<br />
<template v-if="subItem.LunchRealName&&subItem.LunchRealName!=''"> <template v-if="subItem.LunchRealName&&subItem.LunchRealName!=''">
<font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}: <font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}:
<template v-if="subItem.LunchUrl&&subItem.LunchUrl!=''"> <template v-if="subItem.LunchUrl&&subItem.LunchUrl!=''">
...@@ -301,8 +312,16 @@ ...@@ -301,8 +312,16 @@
</font><br /> </font><br />
</template> </template>
</template> </template>
<template v-if="subItem.DinnerName&&subItem.DinnerName!=''"> <template
{{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerName}}<br /> v-if="(subItem.DinnerName&&subItem.DinnerName!='')||(subItem.IsDinnerChange&&subItem.DinnerChangeContent!='')">
{{$t('objFill.v101.wancaimc')}}:
<font v-if="subItem.DinnerName!=''"
:style="(subItem.IsDinnerChange&&subItem.DinnerChangeContent!='')?'text-decoration: line-through;':''">
{{subItem.DinnerName}}
</font>
<font v-if="subItem.IsDinnerChange&&subItem.DinnerChangeContent!=''" style="color:red;">
<br /> {{subItem.DinnerChangeContent}}
</font>
<template v-if="subItem.DinnerRealName&&subItem.DinnerRealName!=''"> <template v-if="subItem.DinnerRealName&&subItem.DinnerRealName!=''">
<font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}: <font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}:
<template v-if="subItem.DinnerUrl&&subItem.DinnerUrl!=''"> <template v-if="subItem.DinnerUrl&&subItem.DinnerUrl!=''">
...@@ -314,6 +333,7 @@ ...@@ -314,6 +333,7 @@
</font><br /> </font><br />
</template> </template>
</template> </template>
</td> </td>
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
<template v-if="subItem.BreakfastCostPrice>0||subItem.IsBreakfastChange"> <template v-if="subItem.BreakfastCostPrice>0||subItem.IsBreakfastChange">
...@@ -367,9 +387,13 @@ ...@@ -367,9 +387,13 @@
</td> </td>
<td> <td>
<template v-for="(childItem,childIndex) in subItem.ScenicList"> <template v-for="(childItem,childIndex) in subItem.ScenicList">
<template v-if="childItem.TicketId>0||childItem.TicketName!=''"> <template
v-if="(childItem.TicketName&&childItem.TicketName!='')||(childItem.NewTicketName&&childItem.NewTicketName!='')">
<font> <font>
{{childIndex+1}}、{{childItem.TicketName}} {{childIndex+1}}、
<font v-if="childItem.TicketName!=''" :style="(childItem.TicketCostPrice+childItem.NewTicketCostPrice==0)?'text-decoration: line-through;':''">{{childItem.TicketName}}</font>
<font v-if="childItem.NewTicketName&&childItem.NewTicketName!=''" style="color：red;">
{{childItem.NewTicketName}}</font>
</font> </font>
<br /> <br />
</template> </template>
...@@ -377,19 +401,26 @@ ...@@ -377,19 +401,26 @@
</td> </td>
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
<template v-for="(childItem,childIndex) in subItem.ScenicList"> <template v-for="(childItem,childIndex) in subItem.ScenicList">
<template v-if="childItem.TicketId>0||childItem.TicketName!=''"> <template
v-if="(childItem.TicketName&&childItem.TicketName!='')||(childItem.NewTicketName&&childItem.NewTicketName!='')">
<font> <font>
{{childItem.TicketCostPrice}} {{childItem.TicketCostPrice}}
</font> </font>
<font v-if="childItem.NewTicketCostPrice!=0" style="color:red;">
<template v-if="childItem.NewTicketCostPrice>0">
+
</template>
{{childItem.NewTicketCostPrice}}={{childItem.TicketCostPrice+childItem.NewTicketCostPrice}}
</font>
<br /> <br />
</template> </template>
</template> </template>
<template v-if="subItem.IsScenicChange"> <template v-if="subItem.IsScenicChange">
<br /> <br />
{{subItem.ScenicCostPrice}} 小计: {{subItem.ScenicCostPrice}}
<el-tooltip class="item" effect="dark" :content="subItem.ScenicChangeRemark" placement="top-start"> <el-tooltip class="item" effect="dark" :content="subItem.ScenicChangeRemark" placement="top-start">
<font style="color:red;"> <font style="color:red;">
<template v-if="subItem.ScenicChangeValue>0"> <template v-if="subItem.ScenicChangeValue>=0">
+ +
</template> </template>
{{subItem.ScenicChangeValue}} {{subItem.ScenicChangeValue}}
...@@ -432,7 +463,7 @@ ...@@ -432,7 +463,7 @@
<template v-else> <template v-else>
{{getDayChangeXiaoJi(1,1)}} {{getDayChangeXiaoJi(1,1)}}
</template> </template>
</font> </font>
=<font style="color:red">{{Number(getDayXiaoJi(1,1))+Number(getDayChangeXiaoJi(1,1))}}</font> =<font style="color:red">{{Number(getDayXiaoJi(1,1))+Number(getDayChangeXiaoJi(1,1))}}</font>
</template> </template>
...@@ -515,17 +546,18 @@ ...@@ -515,17 +546,18 @@
{{getDayChangeXiaoJi(1,2)}} {{getDayChangeXiaoJi(1,2)}}
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(1)!=0"> <template v-if="getRateChangeXiaoJi(1)!=0">
<template v-if="getRateChangeXiaoJi(1)>0"> <template v-if="getRateChangeXiaoJi(1)>0">
+{{getRateChangeXiaoJi(1)}} +{{getRateChangeXiaoJi(1)}}
</template> </template>
<template v-else> <template v-else>
{{getRateChangeXiaoJi(1)}} {{getRateChangeXiaoJi(1)}}
</template>
</template> </template>
</template>
</font> </font>
=<font style="color:red">{{Number(getDayXiaoJi(1,2))+Number(getDayChangeXiaoJi(1,2))+Number(getRateChangeXiaoJi(1))}}</font> =<font style="color:red">
{{Number(getDayXiaoJi(1,2))+Number(getDayChangeXiaoJi(1,2))+Number(getRateChangeXiaoJi(1))}}</font>
</template> </template>
</td> </td>
<!--车资小计--> <!--车资小计-->
...@@ -534,7 +566,7 @@ ...@@ -534,7 +566,7 @@
<template v-if="getDayChangeXiaoJi(2,2)!=0||getRateChangeXiaoJi(2)!=0"> <template v-if="getDayChangeXiaoJi(2,2)!=0||getRateChangeXiaoJi(2)!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getDayChangeXiaoJi(2,2)!=0"> <template v-if="getDayChangeXiaoJi(2,2)!=0">
<template v-if="getDayChangeXiaoJi(2,2)>0"> <template v-if="getDayChangeXiaoJi(2,2)>0">
+{{getDayChangeXiaoJi(2,2)}} +{{getDayChangeXiaoJi(2,2)}}
</template> </template>
<template v-else> <template v-else>
...@@ -542,7 +574,7 @@ ...@@ -542,7 +574,7 @@
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(2)!=0"> <template v-if="getRateChangeXiaoJi(2)!=0">
<template v-if="getRateChangeXiaoJi(2)>0"> <template v-if="getRateChangeXiaoJi(2)>0">
+{{getRateChangeXiaoJi(2)}} +{{getRateChangeXiaoJi(2)}}
</template> </template>
<template v-else> <template v-else>
...@@ -550,7 +582,8 @@ ...@@ -550,7 +582,8 @@
</template> </template>
</template> </template>
</font> </font>
=<font style="color:red">{{Number(getDayXiaoJi(2,2))+Number(getDayChangeXiaoJi(2,2))+Number(getRateChangeXiaoJi(2))}}</font> =<font style="color:red">
{{Number(getDayXiaoJi(2,2))+Number(getDayChangeXiaoJi(2,2))+Number(getRateChangeXiaoJi(2))}}</font>
</template> </template>
</td> </td>
<!--餐小计--> <!--餐小计-->
...@@ -559,15 +592,15 @@ ...@@ -559,15 +592,15 @@
<template v-if="getDayChangeXiaoJi(4,2)!=0||getRateChangeXiaoJi(4)!=0"> <template v-if="getDayChangeXiaoJi(4,2)!=0||getRateChangeXiaoJi(4)!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getDayChangeXiaoJi(4,2)!=0"> <template v-if="getDayChangeXiaoJi(4,2)!=0">
<template v-if="getDayChangeXiaoJi(4,2)>0"> <template v-if="getDayChangeXiaoJi(4,2)>0">
+{{getDayChangeXiaoJi(4,2)}} +{{getDayChangeXiaoJi(4,2)}}
</template> </template>
<template v-else> <template v-else>
{{getDayChangeXiaoJi(4,2)}} {{getDayChangeXiaoJi(4,2)}}
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(4)!=0"> <template v-if="getRateChangeXiaoJi(4)!=0">
<template v-if="getRateChangeXiaoJi(4)>0"> <template v-if="getRateChangeXiaoJi(4)>0">
+{{getRateChangeXiaoJi(4)}} +{{getRateChangeXiaoJi(4)}}
</template> </template>
<template v-else> <template v-else>
...@@ -575,7 +608,8 @@ ...@@ -575,7 +608,8 @@
</template> </template>
</template> </template>
</font> </font>
=<font style="color:red">{{Number(getDayXiaoJi(4,2))+Number(getDayChangeXiaoJi(4,2))+Number(getRateChangeXiaoJi(4))}}</font> =<font style="color:red">
{{Number(getDayXiaoJi(4,2))+Number(getDayChangeXiaoJi(4,2))+Number(getRateChangeXiaoJi(4))}}</font>
</template> </template>
</td> </td>
<!--门票小计--> <!--门票小计-->
...@@ -583,14 +617,14 @@ ...@@ -583,14 +617,14 @@
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,2)}} {{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,2)}}
<template v-if="getDayChangeXiaoJi(3,2)!=0||getRateChangeXiaoJi(3)!=0"> <template v-if="getDayChangeXiaoJi(3,2)!=0||getRateChangeXiaoJi(3)!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getDayChangeXiaoJi(3,2)!=0"> <template v-if="getDayChangeXiaoJi(3,2)!=0">
<template v-if="getDayChangeXiaoJi(3,2)>0"> <template v-if="getDayChangeXiaoJi(3,2)>0">
+{{getDayChangeXiaoJi(3,2)}} +{{getDayChangeXiaoJi(3,2)}}
</template> </template>
<template v-else> <template v-else>
{{getDayChangeXiaoJi(3,2)}} {{getDayChangeXiaoJi(3,2)}}
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(3)!=0"> <template v-if="getRateChangeXiaoJi(3)!=0">
<template v-if="getRateChangeXiaoJi(3)>0"> <template v-if="getRateChangeXiaoJi(3)>0">
+{{getRateChangeXiaoJi(3)}} +{{getRateChangeXiaoJi(3)}}
...@@ -598,9 +632,10 @@ ...@@ -598,9 +632,10 @@
<template v-else> <template v-else>
{{getRateChangeXiaoJi(3)}} {{getRateChangeXiaoJi(3)}}
</template> </template>
</template> </template>
</font> </font>
=<font style="color:red">{{Number(getDayXiaoJi(3,2))+Number(getDayChangeXiaoJi(3,2))+Number(getRateChangeXiaoJi(3))}}</font> =<font style="color:red">
{{Number(getDayXiaoJi(3,2))+Number(getDayChangeXiaoJi(3,2))+Number(getRateChangeXiaoJi(3))}}</font>
</template> </template>
</td> </td>
<!--其它费用小计--> <!--其它费用小计-->
...@@ -608,14 +643,14 @@ ...@@ -608,14 +643,14 @@
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,2)}} {{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,2)}}
<template v-if="(getDayChangeXiaoJi(9,2)!=0||getRateChangeXiaoJi(9))!=0"> <template v-if="(getDayChangeXiaoJi(9,2)!=0||getRateChangeXiaoJi(9))!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getDayChangeXiaoJi(9,2)!=0"> <template v-if="getDayChangeXiaoJi(9,2)!=0">
<template v-if="getDayChangeXiaoJi(9,2)>0"> <template v-if="getDayChangeXiaoJi(9,2)>0">
+{{getDayChangeXiaoJi(9,2)}} +{{getDayChangeXiaoJi(9,2)}}
</template> </template>
<template v-else> <template v-else>
{{getDayChangeXiaoJi(9,2)}} {{getDayChangeXiaoJi(9,2)}}
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(9)!=0"> <template v-if="getRateChangeXiaoJi(9)!=0">
<template v-if="getRateChangeXiaoJi(9)>0"> <template v-if="getRateChangeXiaoJi(9)>0">
+{{getRateChangeXiaoJi(9)}} +{{getRateChangeXiaoJi(9)}}
...@@ -623,15 +658,16 @@ ...@@ -623,15 +658,16 @@
<template v-else> <template v-else>
{{getRateChangeXiaoJi(9)}} {{getRateChangeXiaoJi(9)}}
</template> </template>
</template> </template>
</font> </font>
=<font style="color:red;">{{Number(getDayXiaoJi(9,2))+Number(getDayChangeXiaoJi(9,2))+Number(getRateChangeXiaoJi(9))}}</font> =<font style="color:red;">
{{Number(getDayXiaoJi(9,2))+Number(getDayChangeXiaoJi(9,2))+Number(getRateChangeXiaoJi(9))}}</font>
</template> </template>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="13">{{$t('objFill.qitacbrmb')}} <td colspan="13">{{$t('objFill.qitacbrmb')}}
<!-- <a v-if="IsEdit==3" style="color:blue;cursor:pointer" <!-- <a v-if="IsEdit==3" style="color:blue;cursor:pointer"
@click="showOfferChange(4,teamPrice,0)">{{$t('objFill.dayofferchange')}}</a> --> @click="showOfferChange(4,teamPrice,0)">{{$t('objFill.dayofferchange')}}</a> -->
</td> </td>
</tr> </tr>
...@@ -641,100 +677,100 @@ ...@@ -641,100 +677,100 @@
{{OtherPrice.AirTicketMoeny}} {{OtherPrice.AirTicketMoeny}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===3"> <template v-if="oItem.ChangeType===3">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item :label="$t('objFill.zhongduanjp')"> <el-form-item :label="$t('objFill.zhongduanjp')">
{{OtherPrice.InlandAirTicketMoney}} {{OtherPrice.InlandAirTicketMoney}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===4"> <template v-if="oItem.ChangeType===4">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('objFill.v101.dmc.meildhvpmr')"> <el-form-item :label="$t('objFill.v101.dmc.meildhvpmr')">
{{OtherPrice.InlandTrainTicketMoney}} {{OtherPrice.InlandTrainTicketMoney}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===5"> <template v-if="oItem.ChangeType===5">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('salesModule.Union')"> <el-form-item :label="$t('salesModule.Union')">
{{teamPrice.UnionPrice}} {{teamPrice.UnionPrice}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===6"> <template v-if="oItem.ChangeType===6">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('objFill.qitafeiyong')"> <el-form-item :label="$t('objFill.qitafeiyong')">
{{OtherPrice.OtherShareMoney}} {{OtherPrice.OtherShareMoney}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===7"> <template v-if="oItem.ChangeType===7">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('objFill.qitafeiyongsm')"> <el-form-item :label="$t('objFill.qitafeiyongsm')">
{{OtherPrice.OtherRemark}} {{OtherPrice.OtherRemark}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2" rowspan="2"> <td colspan="2" rowspan="2">
...@@ -750,114 +786,114 @@ ...@@ -750,114 +786,114 @@
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('objFill.shuijin')"> <el-form-item :label="$t('objFill.shuijin')">
{{teamPrice.TaxPrice}} {{teamPrice.TaxPrice}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===8"> <template v-if="oItem.ChangeType===8">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item :label="$t('objFill.guoye')"> <el-form-item :label="$t('objFill.guoye')">
{{teamPrice.NightPrice}} {{teamPrice.NightPrice}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===9"> <template v-if="oItem.ChangeType===9">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('objFill.lingduidyft')"> <el-form-item :label="$t('objFill.lingduidyft')">
{{OtherPrice.AirTicketShareMoney}} {{OtherPrice.AirTicketShareMoney}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===10"> <template v-if="oItem.ChangeType===10">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('active.cl_qianzheng')"> <el-form-item :label="$t('active.cl_qianzheng')">
{{teamPrice.VisaPrice}} {{teamPrice.VisaPrice}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===11"> <template v-if="oItem.ChangeType===11">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('Operation.Op_insurance')"> <el-form-item :label="$t('Operation.Op_insurance')">
{{OtherPrice.SafeMoney}} {{OtherPrice.SafeMoney}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===12"> <template v-if="oItem.ChangeType===12">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item :label="`KB`+$t('objFill.rentoufei')"> <el-form-item :label="`KB`+$t('objFill.rentoufei')">
{{OtherPrice.KBMoney}} {{OtherPrice.KBMoney}}
<font style="color:red;"> <font style="color:red;">
<template v-if="OtherChangeList!=null&&OtherChangeList.length>0"> <template v-if="OtherChangeList!=null&&OtherChangeList.length>0">
<template v-for="(oItem,oIndex) in OtherChangeList"> <template v-for="(oItem,oIndex) in OtherChangeList">
<template v-if="oItem.ChangeType===13"> <template v-if="oItem.ChangeType===13">
<template v-if="oItem.HotelChangeValue>0"> <template v-if="oItem.HotelChangeValue>0">
+{{oItem.HotelChangeValue}} +{{oItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{oItem.HotelChangeValue}} {{oItem.HotelChangeValue}}
</template> </template>
</template> </template>
</template>
</template> </template>
</template>
</font> </font>
</el-form-item> </el-form-item>
</td> </td>
...@@ -1005,14 +1041,16 @@ ...@@ -1005,14 +1041,16 @@
{{$t('fnc.a_heji')}} {{$t('fnc.a_heji')}}
</td> </td>
<td> <td>
{{subItem.PeopleNumber}}<template v-if="subItem.OtherChangeModel!=null"> <font style="color:red;"> {{subItem.PeopleNumber}}<template v-if="subItem.OtherChangeModel!=null">
<font style="color:red;">
<template v-if="subItem.OtherChangeModel.HotelChangeValue>0"> <template v-if="subItem.OtherChangeModel.HotelChangeValue>0">
+{{subItem.OtherChangeModel.HotelChangeValue}} +{{subItem.OtherChangeModel.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{subItem.OtherChangeModel.HotelChangeValue}} {{subItem.OtherChangeModel.HotelChangeValue}}
</template> </template>
</font></template> </font>
</template>
</td> </td>
<td> <td>
{{getDayXiaoJi(1,1)}} {{getDayXiaoJi(1,1)}}
...@@ -1078,7 +1116,8 @@ ...@@ -1078,7 +1116,8 @@
</td> </td>
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}} {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
<template v-if="(getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumJpyChangeTotalMoney(subItem))!=0"> <template
v-if="(getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumJpyChangeTotalMoney(subItem))!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0"> <template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)>0"> <template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)>0">
...@@ -1105,7 +1144,8 @@ ...@@ -1105,7 +1144,8 @@
<td colspan="2"> <td colspan="2">
<template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0"> <template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
{{teamPrice.SingleDMCPrice}} {{teamPrice.SingleDMCPrice}}
<template v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumberChangeTotalMoney(subItem))!=0"> <template
v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumberChangeTotalMoney(subItem))!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0"> <template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0"> <template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
...@@ -1122,7 +1162,7 @@ ...@@ -1122,7 +1162,7 @@
<template v-else> <template v-else>
{{getPeopleNumberChangeTotalMoney(subItem)}} {{getPeopleNumberChangeTotalMoney(subItem)}}
</template> </template>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
{{Number(teamPrice.SingleDMCPrice)+Number(getPeopleNumberChangeTotalMoney(subItem))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}} {{Number(teamPrice.SingleDMCPrice)+Number(getPeopleNumberChangeTotalMoney(subItem))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}}
...@@ -1131,24 +1171,25 @@ ...@@ -1131,24 +1171,25 @@
</template> </template>
<template v-else-if="postConfig.LineId==14||postConfig.LineId==118"> <template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
{{getLocalTotalMoney(subItem.PeopleNumber)}} {{getLocalTotalMoney(subItem.PeopleNumber)}}
<template v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)+getPeopleNumberChangeTotalMoney(subItem))!=0"> <template
v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)+getPeopleNumberChangeTotalMoney(subItem))!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0"> <template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0"> <template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
+{{getLocalChangeTotalMoney(subItem.PeopleNumber)}} +{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template> </template>
<template v-else> <template v-else>
{{getLocalChangeTotalMoney(subItem.PeopleNumber)}} {{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template> </template>
</template> </template>
<template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0">
<template v-if="getPeopleNumberChangeTotalMoney(subItem)>0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)>0">
+{{getPeopleNumberChangeTotalMoney(subItem)}} +{{getPeopleNumberChangeTotalMoney(subItem)}}
</template> </template>
<template v-else> <template v-else>
{{getPeopleNumberChangeTotalMoney(subItem)}} {{getPeopleNumberChangeTotalMoney(subItem)}}
</template> </template>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
{{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))+Number(getPeopleNumberChangeTotalMoney(subItem))}} {{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))+Number(getPeopleNumberChangeTotalMoney(subItem))}}
...@@ -1157,16 +1198,17 @@ ...@@ -1157,16 +1198,17 @@
</template> </template>
<template v-else-if="postConfig.LineId==168"> <template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}} {{getLocalTotalMoney(subItem.PeopleNumber)}}
<template v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)+getPeopleNumberChangeTotalMoney(subItem))!=0"> <template
v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)+getPeopleNumberChangeTotalMoney(subItem))!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0"> <template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0"> <template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
+{{getLocalChangeTotalMoney(subItem.PeopleNumber)}} +{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template> </template>
<template v-else> <template v-else>
{{getLocalChangeTotalMoney(subItem.PeopleNumber)}} {{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template> </template>
</template> </template>
<template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0">
<template v-if="getPeopleNumberChangeTotalMoney(subItem)>0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)>0">
+{{getPeopleNumberChangeTotalMoney(subItem)}} +{{getPeopleNumberChangeTotalMoney(subItem)}}
...@@ -1174,7 +1216,7 @@ ...@@ -1174,7 +1216,7 @@
<template v-else> <template v-else>
{{getPeopleNumberChangeTotalMoney(subItem)}} {{getPeopleNumberChangeTotalMoney(subItem)}}
</template> </template>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
{{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))+Number(getPeopleNumberChangeTotalMoney(subItem))}} {{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))+Number(getPeopleNumberChangeTotalMoney(subItem))}}
...@@ -1187,26 +1229,27 @@ ...@@ -1187,26 +1229,27 @@
</td> </td>
<td colspan="2"> <td colspan="2">
{{subItem.TotalMoney}} {{subItem.TotalMoney}}
<template v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber))!=0||getPeopleNumberChangeTotalMoney(subItem)!=0||getChangeCostTotalMoney()!=0"> <template
v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber))!=0||getPeopleNumberChangeTotalMoney(subItem)!=0||getChangeCostTotalMoney()!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0"> <template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0"> <template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
+{{getLocalChangeTotalMoney(subItem.PeopleNumber)}} +{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template> </template>
<template v-else> <template v-else>
{{getLocalChangeTotalMoney(subItem.PeopleNumber)}} {{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template> </template>
</template> </template>
<template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0">
<template v-if="getPeopleNumberChangeTotalMoney(subItem)>0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)>0">
+{{getPeopleNumberChangeTotalMoney(subItem)}} +{{getPeopleNumberChangeTotalMoney(subItem)}}
</template> </template>
<template v-else> <template v-else>
{{getPeopleNumberChangeTotalMoney(subItem)}} {{getPeopleNumberChangeTotalMoney(subItem)}}
</template> </template>
</template> </template>
<template v-if="getChangeCostTotalMoney()!=0"> <template v-if="getChangeCostTotalMoney()!=0">
<template v-if="getChangeCostTotalMoney()>0"> <template v-if="getChangeCostTotalMoney()>0">
+{{getChangeCostTotalMoney()}} +{{getChangeCostTotalMoney()}}
</template> </template>
<template v-else> <template v-else>
...@@ -1228,7 +1271,9 @@ ...@@ -1228,7 +1271,9 @@
<template v-if="postConfig.OutBranchId==1245"> <template v-if="postConfig.OutBranchId==1245">
<template v-if="subItem.SaleList&&subItem.SaleList.length>0"> <template v-if="subItem.SaleList&&subItem.SaleList.length>0">
<template v-for="(tItem,tIndex) in subItem.SaleList"> <template v-for="(tItem,tIndex) in subItem.SaleList">
<br/> <font :key="`s_`+subIndex+`t_`+tIndex" style="color:blue;">{{tItem.ItemName}}：{{tItem.ItemPrice}}</font> <br />
<font :key="`s_`+subIndex+`t_`+tIndex" style="color:blue;">
{{tItem.ItemName}}：{{tItem.ItemPrice}}</font>
</template> </template>
</template> </template>
</template> </template>
...@@ -1352,31 +1397,33 @@ ...@@ -1352,31 +1397,33 @@
</p> </p>
</template> </template>
</template> </template>
<template v-for="(cItem,cIndex) in CostCurrencyList"> <template v-for="(cItem,cIndex) in CostCurrencyList">
<template <template v-if="cItem.OtherChangeModel!=null&&cItem.OtherChangeModel.HotelChangeValue!=0">
v-if="cItem.OtherChangeModel!=null&&cItem.OtherChangeModel.HotelChangeValue!=0">
<p :key="cIndex">{{cItem.CurrencyName}} <p :key="cIndex">{{cItem.CurrencyName}}
汇率：{{cItem.OtherChangeModel.HotelChangeRemark}} (<font style="color:red">{{cItem.OtherChangeModel.HotelChangeValue}}</font>) 汇率：{{cItem.OtherChangeModel.HotelChangeRemark}} (<font style="color:red">
{{cItem.OtherChangeModel.HotelChangeValue}}</font>)
<template v-if="CostNumberList!=null&&CostNumberList.length>0">
<template v-if="CostNumberList!=null&&CostNumberList.length>0">
<template v-if="CostNumberList[cIndex]!=null&&CostNumberList[cIndex].Id>0"> <template v-if="CostNumberList[cIndex]!=null&&CostNumberList[cIndex].Id>0">
<template <template
v-if="CostNumberList[cIndex].OtherChangeModel!=null&&CostNumberList[cIndex].OtherChangeModel.HotelChangeValue!=0"> v-if="CostNumberList[cIndex].OtherChangeModel!=null&&CostNumberList[cIndex].OtherChangeModel.HotelChangeValue!=0">
人数{{CostNumberList[cIndex].PeopleNumber}} 人数{{CostNumberList[cIndex].PeopleNumber}}
{{CostNumberList[cIndex].OtherChangeModel.HotelChangeRemark}} (<font style="color:red">{{CostNumberList[cIndex].OtherChangeModel.HotelChangeValue>0?"+":""}}{{CostNumberList[cIndex].OtherChangeModel.HotelChangeValue}}</font>) {{CostNumberList[cIndex].OtherChangeModel.HotelChangeRemark}} (<font style="color:red">
{{CostNumberList[cIndex].OtherChangeModel.HotelChangeValue>0?"+":""}}{{CostNumberList[cIndex].OtherChangeModel.HotelChangeValue}}
</font>)
</template> </template>
</template> </template>
</template> </template>
</p> </p>
</template> </template>
</template> </template>
<template v-for="(cItem,cIndex) in OtherChangeList"> <template v-for="(cItem,cIndex) in OtherChangeList">
<template <template v-if="cItem.IsChange">
v-if="cItem.IsChange">
<p :key="cIndex">其它成本(人民币) <p :key="cIndex">其它成本(人民币)
<template > <template>
{{getChangeTypeText(cItem.ChangeType)}}：{{cItem.HotelChangeRemark}} (<font style="color:red">{{cItem.HotelChangeValue}}</font>) {{getChangeTypeText(cItem.ChangeType)}}：{{cItem.HotelChangeRemark}} (<font style="color:red">
{{cItem.HotelChangeValue}}</font>)
</template> </template>
</p> </p>
</template> </template>
...@@ -1409,25 +1456,32 @@ ...@@ -1409,25 +1456,32 @@
<div class="Cost_Line"></div> <div class="Cost_Line"></div>
</el-form> </el-form>
</div> </div>
<template v-if="changMsg.EditType==3"> <template v-if="changMsg.EditType==3">
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center modal> <el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center
<changeOfferExchangeRate v-if="changMsg.isShowChangeOffer" :OfferCurrency="changMsg" :costNumberList="CostNumberList" :costCurrencyList="CostCurrencyList" @success="refreshPage" @closeDialog="closeDialog"> modal>
<changeOfferExchangeRate v-if="changMsg.isShowChangeOffer" :OfferCurrency="changMsg"
:costNumberList="CostNumberList" :costCurrencyList="CostCurrencyList" @success="refreshPage"
@closeDialog="closeDialog">
</changeOfferExchangeRate> </changeOfferExchangeRate>
</el-dialog> </el-dialog>
</template> </template>
<template v-else-if="changMsg.EditType==4"> <template v-else-if="changMsg.EditType==4">
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center modal> <el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center
<changeOfferOtherCost v-if="changMsg.isShowChangeOffer" :OfferCurrency="changMsg" :otherPrice="OtherPrice" :teamPrice="teamPrice" @success="refreshPage" @closeDialog="closeDialog"> modal>
<changeOfferOtherCost v-if="changMsg.isShowChangeOffer" :OfferCurrency="changMsg" :otherPrice="OtherPrice"
:teamPrice="teamPrice" @success="refreshPage" @closeDialog="closeDialog">
</changeOfferOtherCost> </changeOfferOtherCost>
</el-dialog> </el-dialog>
</template> </template>
<template v-else> <template v-else>
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center modal> <el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center
<changeOffer v-if="changMsg.isShowChangeOffer" :qMsg="changMsg" @success="refreshPage" @closeDialog="closeDialog"> modal>
<changeOffer v-if="changMsg.isShowChangeOffer" :qMsg="changMsg" @success="refreshPage"
@closeDialog="closeDialog">
</changeOffer> </changeOffer>
</el-dialog> </el-dialog>
</template> </template>
</div> </div>
</template> </template>
<script> <script>
...@@ -1441,7 +1495,7 @@ ...@@ -1441,7 +1495,7 @@
return { return {
AduitMsg: {}, //审核信息 AduitMsg: {}, //审核信息
OtherPrice: {}, OtherPrice: {},
OtherChangeList:[], OtherChangeList: [],
dayCostPrice: [], dayCostPrice: [],
CostCurrencyList: [], CostCurrencyList: [],
CostNumberList: [], CostNumberList: [],
...@@ -1479,8 +1533,8 @@ ...@@ -1479,8 +1533,8 @@
}, },
components: { components: {
changeOffer: changeOffer, changeOffer: changeOffer,
changeOfferExchangeRate:changeOfferExchangeRate, changeOfferExchangeRate: changeOfferExchangeRate,
changeOfferOtherCost:changeOfferOtherCost, changeOfferOtherCost: changeOfferOtherCost,
}, },
methods: { methods: {
switchOffer(dateStr) { switchOffer(dateStr) {
...@@ -1498,7 +1552,7 @@ ...@@ -1498,7 +1552,7 @@
}) })
if (selectOfferObj) { if (selectOfferObj) {
this.OtherPrice = selectOfferObj.otherPrice; this.OtherPrice = selectOfferObj.otherPrice;
this.OtherChangeList=selectOfferObj.otherChangeList; this.OtherChangeList = selectOfferObj.otherChangeList;
this.teamPrice = selectOfferObj.teamPrice; this.teamPrice = selectOfferObj.teamPrice;
this.CostNumberList = selectOfferObj.CostNumberList; this.CostNumberList = selectOfferObj.CostNumberList;
this.offerDataObj = selectOfferObj; this.offerDataObj = selectOfferObj;
...@@ -1525,26 +1579,23 @@ ...@@ -1525,26 +1579,23 @@
/** /**
* EditType:1-行程相关变更，2-基础数据变更,3-汇率/人数，4-其他成本变更 * EditType:1-行程相关变更，2-基础数据变更,3-汇率/人数，4-其他成本变更
*/ */
showOfferChange(EditType, item,index) { showOfferChange(EditType, item, index) {
this.changMsg.isShowChangeOffer = true; this.changMsg.isShowChangeOffer = true;
this.changMsg.OfferId = item.OfferId; this.changMsg.OfferId = item.OfferId;
this.changMsg.EditType = EditType; this.changMsg.EditType = EditType;
if(EditType==3){ if (EditType == 3) {
this.dialogDiningTitle = "汇率/人数变更" this.dialogDiningTitle = "汇率/人数变更"
var costCurrency=this.CostCurrencyList[index]; var costCurrency = this.CostCurrencyList[index];
} } else if (EditType == 4) {
else if(EditType==4) this.dialogDiningTitle = "其他成本变更"
{ } else {
this.dialogDiningTitle = "其他成本变更" this.dialogDiningTitle = "报价单变更"
}
else{
this.dialogDiningTitle = "报价单变更"
if (item && item.DayNum) { if (item && item.DayNum) {
this.changMsg.DayNum = item.DayNum; this.changMsg.DayNum = item.DayNum;
this.changMsg.checkObj = item; this.changMsg.checkObj = item;
} }
} }
}, },
GetDayStr(dayNum) { GetDayStr(dayNum) {
var str = ""; var str = "";
...@@ -1576,10 +1627,10 @@ ...@@ -1576,10 +1627,10 @@
getDayXiaoJi(type, currencyType) { getDayXiaoJi(type, currencyType) {
var xiaoJi = 0; var xiaoJi = 0;
if (this.dayCostPrice && this.dayCostPrice.length > 0) { if (this.dayCostPrice && this.dayCostPrice.length > 0) {
this.dayCostPrice.forEach((item,index) => { this.dayCostPrice.forEach((item, index) => {
var currencyRate = 1; var currencyRate = 1;
if (currencyType == 2) { if (currencyType == 2) {
currencyRate = this.getCurrencyMoney(item.CurrencyId); currencyRate = this.getCurrencyMoney(item.CurrencyId);
} }
//酒店 //酒店
if (type == 1) { if (type == 1) {
...@@ -1669,69 +1720,70 @@ ...@@ -1669,69 +1720,70 @@
//获取汇率/人数变更合计 //获取汇率/人数变更合计
getRateChangeXiaoJi(type) { getRateChangeXiaoJi(type) {
var xiaoJi = 0; var xiaoJi = 0;
if(this.CostCurrencyList && this.CostCurrencyList.length > 0 && this.dayCostPrice && this.dayCostPrice.length > 0) { if (this.CostCurrencyList && this.CostCurrencyList.length > 0 && this.dayCostPrice && this.dayCostPrice.length >
0) {
this.CostCurrencyList.forEach(currency => {
if(currency.OtherChangeModel!=null&&currency.OtherChangeModel.HotelChangeValue!=0){ this.CostCurrencyList.forEach(currency => {
var currencyRate = currency.OtherChangeModel.HotelChangeValue; if (currency.OtherChangeModel != null && currency.OtherChangeModel.HotelChangeValue != 0) {
var currencyRate = currency.OtherChangeModel.HotelChangeValue;
// 查找 dayCostPrice 中 CurrencyId 匹配当前 currency 的项 // 查找 dayCostPrice 中 CurrencyId 匹配当前 currency 的项
const matchedItems = this.dayCostPrice.filter(item => item.CurrencyId === currency.CurrencyId); const matchedItems = this.dayCostPrice.filter(item => item.CurrencyId === currency.CurrencyId);
// 对匹配到的项进行处理 // 对匹配到的项进行处理
matchedItems.forEach(item => { matchedItems.forEach(item => {
//酒店 //酒店
if (type == 1) { if (type == 1) {
var hotelPrice=Number(item.HotelCostPrice); var hotelPrice = Number(item.HotelCostPrice);
if (item.IsHotelChange) { if (item.IsHotelChange) {
hotelPrice += Number(item.HotelChangeValue) ; hotelPrice += Number(item.HotelChangeValue);
} }
xiaoJi += Number(hotelPrice)* Number(currencyRate); xiaoJi += Number(hotelPrice) * Number(currencyRate);
}
//车
if (type == 2) {
var busPrice = Number(item.BusCostPrice);
if (item.IsBusChange) {
busPrice += Number(item.BusChangeValue);
}
xiaoJi += Number(item.PassFee) * Number(currencyRate);
xiaoJi += Number(busPrice) * Number(currencyRate);
}
//景点
if (type == 3) {
var scenicPrice = Number(item.ScenicCostPrice);
if (item.IsScenicChange) {
scenicPrice += Number(item.ScenicChangeValue);
} }
//车 xiaoJi += Number(scenicPrice) * Number(currencyRate);
if (type == 2) { }
var busPrice=Number(item.BusCostPrice); //早餐
if (item.IsBusChange) { if (type == 4) {
busPrice += Number(item.BusChangeValue) ; var breakfastPrice = Number(item.BreakfastCostPrice);
} if (item.IsBreakfastChange) {
xiaoJi += Number(item.PassFee) * Number(currencyRate); breakfastPrice += Number(item.BreakfastChangeValue);
xiaoJi += Number(busPrice)* Number(currencyRate);
} }
//景点 xiaoJi += Number(breakfastPrice) * Number(currencyRate);
if (type == 3) { var lunchPrice = Number(item.LunchCostPrice);
var scenicPrice=Number(item.ScenicCostPrice); if (item.IsLunchChange) {
if (item.IsScenicChange) { lunchPrice += Number(item.LunchChangeValue);
scenicPrice += Number(item.ScenicChangeValue) ;
}
xiaoJi += Number(scenicPrice)* Number(currencyRate);
} }
//早餐 xiaoJi += Number(lunchPrice) * Number(currencyRate);
if (type == 4) { var dinnerPrice = Number(item.DinnerCostPrice);
var breakfastPrice=Number(item.BreakfastCostPrice); if (item.IsDinnerChange) {
if (item.IsBreakfastChange) { dinnerPrice += Number(item.DinnerChangeValue);
breakfastPrice += Number(item.BreakfastChangeValue) ;
}
xiaoJi += Number(breakfastPrice) * Number(currencyRate);
var lunchPrice=Number(item.LunchCostPrice) ;
if (item.IsLunchChange) {
lunchPrice += Number(item.LunchChangeValue) ;
}
xiaoJi += Number(lunchPrice) * Number(currencyRate);
var dinnerPrice=Number(item.DinnerCostPrice) ;
if (item.IsDinnerChange) {
dinnerPrice += Number(item.DinnerChangeValue) ;
}
xiaoJi += Number(dinnerPrice) * Number(currencyRate);
} }
if (type == 9) { xiaoJi += Number(dinnerPrice) * Number(currencyRate);
var otherPrice=Number(item.OtherPrice) ; }
if (item.IsOtherChange) { if (type == 9) {
otherPrice += Number(item.OtherChangeValue) ; var otherPrice = Number(item.OtherPrice);
} if (item.IsOtherChange) {
xiaoJi += Number(otherPrice) * Number(currencyRate) otherPrice += Number(item.OtherChangeValue);
} }
}); xiaoJi += Number(otherPrice) * Number(currencyRate)
}
});
} }
}); });
} }
return xiaoJi.toFixed(0); return xiaoJi.toFixed(0);
}, },
//其它成本价格 //其它成本价格
...@@ -1754,9 +1806,9 @@ ...@@ -1754,9 +1806,9 @@
getChangeCostTotalMoney() { getChangeCostTotalMoney() {
let totalMoney = 0.0; let totalMoney = 0.0;
//机票+中段机票+税金+领队导游分摊+联运+过夜+保险 //机票+中段机票+税金+领队导游分摊+联运+过夜+保险
if(this.OtherChangeList!=null&&this.OtherChangeList.length>0){ if (this.OtherChangeList != null && this.OtherChangeList.length > 0) {
this.OtherChangeList.forEach(item => { this.OtherChangeList.forEach(item => {
totalMoney+=Number(this.getConvertMoney(item.HotelChangeValue) ) totalMoney += Number(this.getConvertMoney(item.HotelChangeValue))
}); });
} }
return totalMoney.toFixed(2); return totalMoney.toFixed(2);
...@@ -1777,7 +1829,7 @@ ...@@ -1777,7 +1829,7 @@
12: '保险', 12: '保险',
13: 'KB人头费' 13: 'KB人头费'
}; };
return typeMap[type] || '未知类型'; return typeMap[type] || '未知类型';
}, },
//获取汇率 //获取汇率
getCurrencyMoney(currencyId) { getCurrencyMoney(currencyId) {
...@@ -1794,8 +1846,8 @@ ...@@ -1794,8 +1846,8 @@
let currency = 1; let currency = 1;
this.CostCurrencyList.forEach(x => { this.CostCurrencyList.forEach(x => {
if (x.CurrencyId == currencyId) { if (x.CurrencyId == currencyId) {
if(x.OtherChangeModel!=null&&x.OtherChangeModel.HotelChangeValue!=0) if (x.OtherChangeModel != null && x.OtherChangeModel.HotelChangeValue != 0)
currency = x.ExchangeRate+x.OtherChangeModel.HotelChangeValue; currency = x.ExchangeRate + x.OtherChangeModel.HotelChangeValue;
} }
}); });
return currency; return currency;
...@@ -1870,52 +1922,50 @@ ...@@ -1870,52 +1922,50 @@
var canPrice = Number(this.getDayChangeXiaoJi(4, 1)); //早餐 var canPrice = Number(this.getDayChangeXiaoJi(4, 1)); //早餐
var otherPrice = Number(this.getDayChangeXiaoJi(9, 1)) / PeopleNumber; //其它费用 var otherPrice = Number(this.getDayChangeXiaoJi(9, 1)) / PeopleNumber; //其它费用
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice; totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2); return totalMoney.toFixed(2);
}, },
//地接成本（日元） //地接成本（日元）
getPeopleNumJpyChangeTotalMoney(subItem) { getPeopleNumJpyChangeTotalMoney(subItem) {
let totalMoney = 0.0; let totalMoney = 0.0;
var peopleNumber=Number(subItem.PeopleNumber); var peopleNumber = Number(subItem.PeopleNumber);
if(subItem.OtherChangeModel!=null&&subItem.OtherChangeModel.HotelChangeValue!=0){ if (subItem.OtherChangeModel != null && subItem.OtherChangeModel.HotelChangeValue != 0) {
peopleNumber += Number(subItem.OtherChangeModel.HotelChangeValue);
peopleNumber+=Number(subItem.OtherChangeModel.HotelChangeValue); var busFee = Number(this.getDayXiaoJi(2, 1)) / peopleNumber;
var busFee = Number(this.getDayXiaoJi(2, 1)) / peopleNumber;
var otherPrice = Number(this.getDayXiaoJi(9, 1)) / peopleNumber; //其它费用 var otherPrice = Number(this.getDayXiaoJi(9, 1)) / peopleNumber; //其它费用
totalMoney = busFee + otherPrice;//hotelPrice + sencePrice + canPrice + totalMoney = busFee + otherPrice; //hotelPrice + sencePrice + canPrice +
if(subItem.OtherChangeModel.HotelChangeValue>0){ if (subItem.OtherChangeModel.HotelChangeValue > 0) {
totalMoney=Number(totalMoney)*Number(-1); totalMoney = Number(totalMoney) * Number(-1);
} }
} }
return totalMoney.toFixed(2); return totalMoney.toFixed(2);
}, },
getPeopleNumberChangeTotalMoney(subItem) { getPeopleNumberChangeTotalMoney(subItem) {
let totalMoney = 0.0; let totalMoney = 0.0;
//汇率的变更 //汇率的变更
var hotelPrice = Number(this.getRateChangeXiaoJi(1)); //酒店费用 var hotelPrice = Number(this.getRateChangeXiaoJi(1)); //酒店费用
var sencePrice = Number(this.getRateChangeXiaoJi(3)); //景点费用 var sencePrice = Number(this.getRateChangeXiaoJi(3)); //景点费用
var canPrice = Number(this.getRateChangeXiaoJi(4)); //餐 var canPrice = Number(this.getRateChangeXiaoJi(4)); //餐
var otherPrice = Number(this.getRateChangeXiaoJi(9)) / Number(subItem.PeopleNumber); //其它费用 var otherPrice = Number(this.getRateChangeXiaoJi(9)) / Number(subItem.PeopleNumber); //其它费用
var busFee = Number(this.getRateChangeXiaoJi(2)) /Number(subItem.PeopleNumber); //车费 var busFee = Number(this.getRateChangeXiaoJi(2)) / Number(subItem.PeopleNumber); //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice; totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
var peopleNumber=subItem.PeopleNumber; var peopleNumber = subItem.PeopleNumber;
if (subItem.PeopleNumber <= 0) { if (subItem.PeopleNumber <= 0) {
peopleNumber = 1; peopleNumber = 1;
} }
//人数的变更 //人数的变更
if(subItem.OtherChangeModel!=null&&subItem.OtherChangeModel.HotelChangeValue!=0){ if (subItem.OtherChangeModel != null && subItem.OtherChangeModel.HotelChangeValue != 0) {
peopleNumber+=Number(subItem.OtherChangeModel.HotelChangeValue); peopleNumber += Number(subItem.OtherChangeModel.HotelChangeValue);
console.log(peopleNumber,"otherPrice",this.getRateChangeXiaoJi(9)); // console.log(peopleNumber, "otherPrice", this.getRateChangeXiaoJi(9));
console.log(peopleNumber,"busFee",this.getRateChangeXiaoJi(2)); // console.log(peopleNumber, "busFee", this.getRateChangeXiaoJi(2));
if(subItem.OtherChangeModel.HotelChangeValue>0){ if (subItem.OtherChangeModel.HotelChangeValue > 0) {
totalMoney -= Number(this.getRateChangeXiaoJi(9)) / Number(peopleNumber); //其它费用 totalMoney -= Number(this.getRateChangeXiaoJi(9)) / Number(peopleNumber); //其它费用
totalMoney -= Number(this.getRateChangeXiaoJi(2)) /Number(peopleNumber); //车费 totalMoney -= Number(this.getRateChangeXiaoJi(2)) / Number(peopleNumber); //车费
} } else {
else{ totalMoney += Number(this.getRateChangeXiaoJi(9)) / Number(peopleNumber); //其它费用
totalMoney += Number(this.getRateChangeXiaoJi(9)) / Number(peopleNumber); //其它费用 totalMoney += Number(this.getRateChangeXiaoJi(2)) / Number(peopleNumber); //车费
totalMoney += Number(this.getRateChangeXiaoJi(2)) /Number(peopleNumber); //车费 }
}
} }
return totalMoney.toFixed(2); return totalMoney.toFixed(2);
}, },
getchange() { getchange() {
this.getLeaderShare(); this.getLeaderShare();
......
src/components/TravelManager/TravelNewQuotation/OfferChange.vue
View file @ 2644d87f
...@@ -15,11 +15,20 @@ ...@@ -15,11 +15,20 @@
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray" <CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray"
:IsEdit="IsEdit" @success="refreshPage"></CostNewPriceAudit> :IsEdit="IsEdit" @success="refreshPage"></CostNewPriceAudit>
</div> </div>
<div class="btnFixedDiv" v-if="haveData"> <div class="btnFixedDiv" v-if="haveData" style="margin:0 auto;">
<div class="toTop"> <el-button @click="SaveData(2)" :loading="saveLoading"
<i class="iconfont icon-huidaodingbu"></i> style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:10px;border:none;width:45px;height:45px;padding:0;">
</div> {{$t('fnc.tijiao')}}
<div class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="SaveData(2)">{{$t('fnc.tijiao')}}</div> </el-button>
<template v-if="IsEdit==3">
<br />
<el-tooltip class="item" effect="dark" content="根据地接数据更新报价单" placement="top">
<el-button :loading="saveLoading" @click="ReCalcOffer()"
style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:5px; border:none;width:45px;height:45px;padding:0;padding-top:10px;">
更新
</el-button>
</el-tooltip>
</template>
</div> </div>
</div> </div>
</template> </template>
...@@ -80,28 +89,52 @@ ...@@ -80,28 +89,52 @@
AssistantList: [], //助理OP AssistantList: [], //助理OP
PriceTeamType: 0, //团队类型, PriceTeamType: 0, //团队类型,
PriceTeamTypeName: "", //团队类型, PriceTeamTypeName: "", //团队类型,
OfferArray:[], OfferArray: [],
OfferId: 0,
}, },
pMsg: { pMsg: {
offerId: 0, offerId: 0,
// BatchNum: "",
}, },
isSubmit: true,
loading: false, loading: false,
IsEdit: 0, IsEdit: 0,
saveLoading: false,
}; };
}, },
methods: { methods: {
ReCalcOffer() {
this.saveLoading = true;
var newMsg = {
OfferId: this.pMsg.offerId,
}
this.apipost(
"travel_post_CalcChangeOffer", newMsg,
res => {
this.saveLoading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getPostData();
} else {
this.Error(res.data.message);
}
},
err => {
this.saveLoading = false;
}
);
},
//保存数据 //保存数据
SaveData(Type) { SaveData(Type) {
this.saveLoading = true;
var nObj = { var nObj = {
offerid:this.pMsg.offerId, offerid: this.pMsg.offerId,
}; };
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"travel_post_SetOfferChangeAudit", nObj, "travel_post_SetOfferChangeAudit", nObj,
res => { res => {
this.loading = false; this.loading = false;
this.saveLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.goUrl('newQuotation'); this.goUrl('newQuotation');
...@@ -134,9 +167,13 @@ ...@@ -134,9 +167,13 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
console.log("travel_get_PriceOfferInfo",tempData);
if (tempData.ID && tempData.ID > 0) { if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID; this.postData.ID = tempData.ID;
} }
if (tempData.OfferId && tempData.OfferId > 0) {
this.postData.OfferId = tempData.OfferId;
}
if (tempData.LineId && tempData.LineId > 0) { if (tempData.LineId && tempData.LineId > 0) {
this.postData.LineId = tempData.LineId; this.postData.LineId = tempData.LineId;
} }
......
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