Skip to content

S
SuperMan
Commit 1962c45b authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

解决冲突

parents 74450e19 713aca53
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 15 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 1962c45b
......@@ -336,7 +336,11 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
|| GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58
|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<!-- <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td> -->
<td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
<td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td>
</tr>
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ 1962c45b
......@@ -82,6 +82,9 @@
<i v-if="name===2">{{$t('fnc.kuaijilian')}}</i>
</p>
<p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>
<p class="_yewudanju" v-if="GetDetail.OrderSource==15&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('freeTravelOrderStatiDetails',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>
<p class="_yewudanju" v-if="GetDetail.OrderSource==1&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('OpHotelOrderDetail',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>
<p class="_yewudanju" v-if="GetDetail.OrderSource==3&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('scenOrderDetails',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>
<p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p>
<div class="rb_top_row _r_mb5">
<p v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail[0]">{{$t('fnc.fkuanzhanghu')}}：<span class="_r_name _no_border">{{GetDetail.CashierDetail[0].Alias}}</span></p>
......@@ -310,6 +313,12 @@ export default {
console.log(111)
this.$emit('helloPP','1')
},
jumpFreePage(path,id){
this.$router.push({
name: path,
query: { ID: id, blank: 'y', tab: '订单详情'}
})
},
jumpPage(path,id,type){
if(type==1){
// let routeData = this.$router.resolve({
......@@ -348,19 +357,19 @@ export default {
let rate = 0;
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100);
x.Money = Math.round(x.Money * 100) / 100
x.Money = Math.round(x.Money * 100) / 100;
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100;
this.currentMoney += parseFloat(x.OriginalMoney);
this.benMoney += parseFloat(x.Money);
})
this.currentMoney = Math.round(this.currentMoney * 100) / 100;
this.benMoney = Math.round(this.benMoney * 100) / 100;
let m = data.PayMoney?data.PayMoney:data.Money;
let m = data.PayMoney?data.PayMoney:data.Money;
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money);
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
data.PayMoney = this.$commonUtils.addCommas(Math.round(data.PayMoney * 100) / 100)
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100);
data.AuditSteps.reverse();
data.AuditSteps.reverse();
this.GetDetail = data;
this.loading=false
this.$set(this.$data,"GetDetail",data);
......
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ 1962c45b
......@@ -129,7 +129,7 @@
<li><span>待审金额：</span><span :class="{color_red:(allMoneyP-shiMoneyP)!==allMoneyP}">{{moneyFormat(allMoneyP-shiMoneyP)}}</span></li>
</ul>
</div>
<p class="sfd_tit clearfix">收款单 <input type="button" value="增加财务单据" class="normalBtn" @click="OpenOrder(1)"></p>
<p class="sfd_tit clearfix">收款单 <input type="button" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(1)"> <input v-show="false" type="button" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(1)"></p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
......@@ -229,7 +229,7 @@
</td>
</tr>
</table>
<p class="sfd_tit clearfix">付款单 <input type="button" value="增加财务单据" class="normalBtn" @click="OpenOrder(2)"></p>
<p class="sfd_tit clearfix">付款单 <input type="button" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(2)"><input v-show="false" type="button" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(2)"></p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
......@@ -436,7 +436,6 @@ export default {
this.checkd = false
},
checkAll(){ //全选
console.log("this.checkListAll",this.checkListAll)
if(this.checkList.length==this.checkListAll.length){
this.checkList=[]
return
......@@ -498,10 +497,31 @@ export default {
}
}, null)
},
OpenOrder2(num){
this.checkd=false;
this.checkList=[];
this.checkAllList=[];
this.type=num;
this.dialogVisible=true;
if(num==1){
this.OrderTitle='收款单';
}else{
this.OrderTitle='付款单';
}
this.apipost('dmc_get_GetNeedSafeGuestGuestList',{tcid:this.tcid}, res=>{
if (res.data.resultCode == 1) {
let data = res.data.data;
this.checknameList=data;
data.forEach(item=>{
this.checkListAll.push(item.Id);
})
}
})
},
OpenOrder(num){
this.checkd=false;
this.checkList=[];
this.checkListAll=[];
this.checkAllList=[];
this.type=num;
this.dialogVisible=true;
if(num==1){
......@@ -520,13 +540,13 @@ export default {
})
},
addFinancialOrder () { // 新增单据方法
let userInfo =[];
this.checknameList.forEach(item=>{
this.checkList.forEach(check=>{
if(item.Id==check){
userInfo.push(item);
}
let userInfo =[];
this.checkList.forEach(check=>{
this.checknameList.forEach(item=>{
if(item.Id==check){
userInfo.push(item);
}
})
})
if(userInfo.length==0){
......
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