Skip to content

S
SuperMan
Commit 09e2abe5 authored by 吴春's avatar 吴春
Browse files
Options

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

parents de919381 303dfc7e
Show whitespace changes
Inline Side-by-side
Showing with 475 additions and 455 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 09e2abe5
......@@ -431,6 +431,7 @@
top: -0;
width: 440px;
}
._wenjian {
padding: 15px;
width: 91px;
......@@ -836,8 +837,7 @@
<div class="_explain">
<div class="illustrate-text">
<p class="illustrate-left">{{$t('fnc.fjshuoming')}}：
<span class="fr"
v-if="GetDetail.TemplateId==27&&GetDetail.Course_Name&&GetDetail.PayReceipt_No">
<span class="fr" v-if="GetDetail.TemplateId==27&&GetDetail.Course_Name&&GetDetail.PayReceipt_No">
{{$t('objFill.sklx')}}：{{GetDetail.Course_Name}}/{{GetDetail.PayReceipt_No}}
</span>
<span class="fr" v-if="GetDetail.ComplainID > 0"
......@@ -846,9 +846,11 @@
class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==15"
@click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> {{$t('objFill.dscgd')}} :{{GetDetail.ReFinanceId}}</span>
@click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> {{$t('objFill.dscgd')}}
:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==16"
@click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> {{$t('objFill.dsckd')}}:{{GetDetail.ReFinanceId}}</span>
@click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)">
{{$t('objFill.dsckd')}}:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17"
@click="lookbreakage(GetDetail.ReFinanceId)"> {{$t('objFill.bsbyd')}}:{{GetDetail.ReFinanceId}}</span>
......@@ -874,15 +876,13 @@
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=74&& GetDetail.OtherType!=75)||
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) -->
<span
v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48
<span v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48
|| GetDetail.OtherType==63 || GetDetail.OtherType==64 || GetDetail.OtherType==69
|| GetDetail.OtherType==70 || GetDetail.OtherType==72 || GetDetail.OtherType==76
|| GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==78))
|| ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64&&GetDetail.OtherType!=55&&GetDetail.OtherType!=56
&&GetDetail.OtherType!=57)"
@click="GoRoyaltyUrl(GetDetail)"
&&GetDetail.OtherType!=57)" @click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
{{$t('objFill.tcxq')}}
</span>
......@@ -898,18 +898,21 @@
<span style="text-decoration: underline;"
@click="goHand(2,GetDetail)">{{$t('objFill.xgdj')}}：{{GetDetail.ReFinanceId}}</span>
</span>
<span v-if="GetDetail.OtherType==71 && GetDetail.DetailList[0].Remark.indexOf('未体现的返佣')==-1" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span v-if="GetDetail.OtherType==71 && GetDetail.DetailList[0].Remark.indexOf('未体现的返佣')==-1"
style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="goHand(3,GetDetail)">{{$t('objFill.ckspxq')}}</span>
</span>
<span v-if="GetDetail.NewFinanceId>0 " style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="openDetails(GetDetail.NewFinanceId)">{{$t('objFill.ckwljsxq')}}</span>
<span style="text-decoration: underline;"
@click="openDetails(GetDetail.NewFinanceId)">{{$t('objFill.ckwljsxq')}}</span>
</span>
<!-- <span v-if="GetDetail.OtherType==75" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="goHand(4,GetDetail)">{{$t('objFill.ckyjxq')}}</span>
</span> -->
<span v-if="GetDetail.OtherType==18&&GetDetail.ReFinanceId>0"
style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span @click="goOrderDetails(GetDetail.ReFinanceId)">{{$t('objFill.zd')}}：{{GetDetail.ReFinanceId}}</span>
<span
@click="goOrderDetails(GetDetail.ReFinanceId)">{{$t('objFill.zd')}}：{{GetDetail.ReFinanceId}}</span>
</span>
</p>
<div class="illustrate-right" v-if="GetDetail.OtherType=='55'" @click="clickAirTicketOrder">
......@@ -950,7 +953,8 @@
<span>{{o.GuestTotalNum?o.GuestTotalNum:0}}</span>{{$t('salesModule.Fen')}}
</span>
<a v-if="o.PriceTeamTypeName && o.PriceTeamTypeName =='单团'"
style="cursor: pointer;text-decoration: underline;" target="_blank" :href="o.PriceOfferUrl">{{$t('objFill.bjdfj')}}</a>
style="cursor: pointer;text-decoration: underline;" target="_blank"
:href="o.PriceOfferUrl">{{$t('objFill.bjdfj')}}</a>
<span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowGuestUrl===1 && GetDetail.ClientType===7"
@click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">
{{$t('objFill.lddywl')}}
......@@ -964,7 +968,8 @@
<a v-if="o.PriceOfferUrl&&o.PriceOfferUrl!=''" :href="o.PriceOfferUrl">{{$t('objFill.fj')}}</a>
</td>
<td @click="gotoTravelList(o)"> <span class="_jump_page _font_bold">{{$t('objFill.cktd')}}</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">{{$t('salesModule.LookBM')}}</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span
class="_jump_page _font_bold">{{$t('salesModule.LookBM')}}</span> </td>
<td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi"
@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>
......@@ -986,13 +991,16 @@
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58
|| GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
|| GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)"
@click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">{{$t('objFill.ykjh')}}</span>
@click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span
class="_jump_page _font_bold">{{$t('objFill.ykjh')}}</span>
</td>
<td v-if="GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)"
@click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">{{$t('objFill.ldbz')}}</span> </td>
@click="jumpPlanPage('leaderPay2',o.TCID)"> <span
class="_jump_page _font_bold">{{$t('objFill.ldbz')}}</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">{{$t('objFill.czft')}}</span>
@click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span
class="_jump_page _font_bold">{{$t('objFill.czft')}}</span>
</td>
</tr>
</table>
......@@ -1011,7 +1019,8 @@
width="100%" v-else-if="OrderSource==9">
<tr class="_fujiashuoming_tr">
<td>{{$t('tips.qishu')}}：{{GetDetail.Term}}</td>
<td @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">{{$t('fnc.gnpiaowu')}}</span></td>
<td @click="jumpPage('FinancialOrder',GetDetail,2)"> <span
class="_jump_page _font_bold">{{$t('fnc.gnpiaowu')}}</span></td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%"
......@@ -1021,11 +1030,13 @@
<td
v-if="(GetDetail.TCIDAndTCNUMList && GetDetail.TCIDAndTCNUMList.length===0) || !GetDetail.TCIDAndTCNUMList">
{{$t('advmanager.v_line')}}：{{GetDetail.LineName?GetDetail.LineName:$t('tips.jpswxzxianlu')}}</td>
<td @click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">{{$t('fnc.jpshouzhi')}}</span></td>
<td @click="jumpPage('FinancialOrder',GetDetail,4)"> <span
class="_jump_page _font_bold">{{$t('fnc.jpshouzhi')}}</span></td>
</tr>
</table>
<div>
<p v-if="GetDetail.Type!==7">{{$t('fnc.fygsbumen')}}：<span class="_font_bold">{{GetDetail.DepartName}}</span></p>
<p v-if="GetDetail.Type!==7">{{$t('fnc.fygsbumen')}}：<span
class="_font_bold">{{GetDetail.DepartName}}</span></p>
<div>
<el-popover popper-class="detailsIT_Journal" width="250" trigger="click">
<div class="InfoChangeLog">
......@@ -1066,8 +1077,9 @@
</dmcTravelBill>
<!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"/> -->
<!--<my-C-Bill v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-C-Bill>-->
<div class="_fujian_box" v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) ||(GetDetail.InvoiceVoucherInfo&&GetDetail.InvoiceVoucherInfo.length>0) || saveMsg.length>0">
<div >
<div class="_fujian_box"
v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) ||(GetDetail.InvoiceVoucherInfo&&GetDetail.InvoiceVoucherInfo.length>0) || saveMsg.length>0">
<div>
<div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
<span>{{$t('objFill.fj')}}</span>
<span>></span>
......@@ -1077,7 +1089,8 @@
<i class="iconfont icon-bangdingzhagnhuxinxi"></i>
<span>{{$t('objFill.fj')}}</span>
</span>
<span class="cursorpointer" @click="fujianShow = false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo"></i></span>
<span class="cursorpointer" @click="fujianShow = false">{{$t('fnc.shouqi')}} <i
class="iconfont icon-gengduo"></i></span>
</p>
<div class="_addUpload_box clearfix" v-if="fujianShow">
<div style="width:100%;height:300px" v-if="FuImgList.length>0">
......@@ -1125,7 +1138,8 @@
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
<div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">{{$t('fnc.scfujian')}}</button></div>
<div class="shangchuanfujian"><button class="hollowFixedBtn"
@click="upLoadFuJian">{{$t('fnc.scfujian')}}</button></div>
</div>
</div>
<!-- <div style="margin-top: 40px;" v-if="GetDetail.VorcherInos
......@@ -1143,46 +1157,38 @@
</div>
<!-- 是否需要发票 -->
<div style="border-top: 1px solid #dedede;margin-top: 10px;
padding: 0 0 10px 0;"
v-if="(GetDetail.CreateBy==userInfo.EmployeeId
padding: 0 0 10px 0;" v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)">
<p
style="margin-top: 40px;">
<p style="margin-top: 40px;">
<span style="color: red;">{{$t('objFill.fppz')}}</span>
<span style="color: #33B3FF;margin-left: 10px;">
<template v-if="GetDetail.InvoiceState==2">{{GetDetail.InvoiceExamineByName}}{{$t('fnc.a_yshenhe')}}</template>
<template
v-if="GetDetail.InvoiceState==2">{{GetDetail.InvoiceExamineByName}}{{$t('fnc.a_yshenhe')}}</template>
<template v-if="GetDetail.InvoiceState==1">{{$t('objFill.dsh')}}</template>
</span>
</p>
<div class="_addUpload_box _addUpload_box_btm clearfix" v-if="InvoiceVoucherList.length>0">
<template
v-for="(file,fIndex) in InvoiceVoucherList">
<template v-for="(file,fIndex) in InvoiceVoucherList">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<el-image
style="width: 100%; height: 100%"
:src="file.Url?file.Url:file.Content"
<el-image style="width: 100%; height: 100%" :src="file.Url?file.Url:file.Content"
:preview-src-list="InvoiceVoucherListImg">
</el-image>
<!-- <img :src="file.Url?file.Url:file.Content" @click="showImg(file.Url?file.Url:file.Content)"> -->
</div>
<span class="iconfont icon-guanbi1"
@click="deleteUploadFile(fIndex,1)"></span>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex,1)"></span>
</div>
<div v-if="file.Type==1">
<div class="iconfont _wenjian_P"
style="line-height: 80px;"
<div class="iconfont _wenjian_P" style="line-height: 80px;"
: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,1)"></span>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex,1)"></span>
</div>
</template>
</div>
<div style="margin-top: 10px;"
v-if="(GetDetail.CreateBy==userInfo.EmployeeId
<div style="margin-top: 10px;" v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)&&GetDetail.InvoiceState!=2">
<div class="_pic_upload">
......@@ -1192,7 +1198,8 @@
<div class="el-upload__text">{{$t('objFill.djtzscfp')}}</div>
</el-upload>
</div>
<div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian(1)">{{$t('objFill.scfp')}}</button></div>
<div class="shangchuanfujian"><button class="hollowFixedBtn"
@click="upLoadFuJian(1)">{{$t('objFill.scfp')}}</button></div>
</div>
</div>
</div>
......@@ -1213,7 +1220,8 @@
<CostmonthDetails v-if="GetDetail.OtherType==75||getTemplate(GetDetail)" :GetDetail="GetDetail">
</CostmonthDetails>
<!-- 相同对象付款单据 -->
<SamePayment v-if="GetDetail.Type==2&&GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0" :GetDetail="GetDetail">
<SamePayment v-if="GetDetail.Type==2&&GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0"
:GetDetail="GetDetail">
</SamePayment>
<!-- 团成员已制单名单 -->
<template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
......@@ -1236,7 +1244,8 @@
<span class="_text">{{$t('active.cl_team')}}</span>
<span class="_btn" v-if="tableShowTeam" @click="tableShowTeam=false">{{$t('fnc.shouqi')}} <i
class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShowTeam=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
<span class="_btn" v-else @click="tableShowTeam=true">{{$t('fnc.zhankai')}} <i
class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShowTeam">
<div>
......@@ -1252,7 +1261,8 @@
<span class="_text">{{$t('objFill.spfgldj')}}</span>
<span class="_btn" v-if="tableShowHandFee" @click="tableShowHandFee=false">{{$t('fnc.shouqi')}} <i
class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShowHandFee=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
<span class="_btn" v-else @click="tableShowHandFee=true">{{$t('fnc.zhankai')}} <i
class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShowHandFee">
<div>
......@@ -1271,15 +1281,18 @@
:id='ID' />
<TicketingModule v-if="OrderSource==9&&FrID&&ID" :FrID='FrID' :id='ID' />
<ChongDiPage v-if="GetDetail.Type === 7 || isChongDi" :dataList="ChongDiList" :type="danjuType" />
<orderFinancialPage v-if="GetDetail.OrderSource==8 &&GetDetail.OrderID>0" :dataOrderList="DataOrderList" :dataOrderPreferPrice="DataOrderPreferPrice" />
<orderFinancialPage v-if="GetDetail.OrderSource==8 &&GetDetail.OrderID>0" :dataOrderList="DataOrderList"
:dataOrderPreferPrice="DataOrderPreferPrice" />
</div>
<div class="_tit _tit2 w890px">
<p>
<span class="_text">{{$t('fnc.shliucheng')}}</span>
<span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo _rotate"></i>
<span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i
class="iconfont icon-gengduo _rotate"></i>
</span>
<span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i>
</span>
<span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShow">
<div class="w600px">
......@@ -1294,7 +1307,8 @@
<span class="_text">{{$t('objFill.originalrefund')}}</span>
<span class="_btn" v-if="tableShowTuikuan" @click="tableShowTuikuan=false">{{$t('fnc.shouqi')}} <i
class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShowTuikuan=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
<span class="_btn" v-else @click="tableShowTuikuan=true">{{$t('fnc.zhankai')}} <i
class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShowTuikuan">
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
......@@ -1359,7 +1373,8 @@
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i
class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p class="_pp_info">{{$t('fnc.zjbeizhu')}}：{{z.Remarks?z.Remarks:$t('fnc.no')}}</p>
</div>
</template>
......@@ -1395,7 +1410,8 @@
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i
class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p class="_pp_info">{{$t('fnc.zjbeizhu')}}：{{z.Remarks?z.Remarks:$t('fnc.no')}}</p>
</div>
</template>
......@@ -1424,7 +1440,8 @@
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i
class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p class="_pp_info">{{$t('fnc.zjbeizhu')}}：{{z.Remarks?z.Remarks:$t('fnc.no')}}</p>
</div>
</template>
......@@ -1453,7 +1470,8 @@
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i
class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p class="_pp_info">{{$t('fnc.zjbeizhu')}}：{{z.Remarks?z.Remarks:$t('fnc.no')}}</p>
</div>
</template>
......@@ -1543,17 +1561,14 @@
</el-dialog>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
<!-- 跟团订单、当地游订单，获取订单客户签约信息 -->
<OrderReceivablesAccount v-if="isReceivablesAccount"
:clientData="clientData" @ClosePopup="isReceivablesAccount=false"></OrderReceivablesAccount>
<OrderReceivablesAccount v-if="isReceivablesAccount" :clientData="clientData"
@ClosePopup="isReceivablesAccount=false"></OrderReceivablesAccount>
<!--代收/代付公司-->
<HelpBranch v-if="GetDetail.HelpBranchId>-1"
:helpBranchData="helpBranchData" ></HelpBranch>
<HelpBranch v-if="GetDetail.HelpBranchId>-1" :helpBranchData="helpBranchData"></HelpBranch>
<!--供应商信息-->
<ClientBankAccount v-if="isClientBankAccount"
:clientBankAccountData="clientBankAccountData"
:ClientBankAccountTop="ClientBankAccountTop"
@ClosePopup="isClientBankAccount=false"></ClientBankAccount>
<ClientBankAccount v-if="isClientBankAccount" :clientBankAccountData="clientBankAccountData"
:ClientBankAccountTop="ClientBankAccountTop" @ClosePopup="isClientBankAccount=false"></ClientBankAccount>
</div>
</template>
......@@ -1589,8 +1604,8 @@
export default {
data() {
return {
InvoiceVoucherListImg:[],
InvoiceVoucherList:[],//发票附件
InvoiceVoucherListImg: [],
InvoiceVoucherList: [], //发票附件
isCostTypeId: false, //地接费（领取）用款计划
isOrderOP: false, //是否跳转op订单页面
tableShowHandFee: true,
......@@ -1625,8 +1640,8 @@
AuditListData: {
AuditList: []
},
DataOrderList:[],
DataOrderPreferPrice:0,
DataOrderList: [],
DataOrderPreferPrice: 0,
imageUrl: '',
uploadImgList: [],
FuImgList: [],
......@@ -1671,14 +1686,14 @@
CostTypeState: false,
huijiShow: false,
clientData: {},
clientBankAccountData:{},
helpBranchData:{},
clientBankAccountData: {},
helpBranchData: {},
isReceivablesAccount: false,
isClientBankAccount:false,
ClientBankAccountTop:0,
isClientBankAccount: false,
ClientBankAccountTop: 0,
ActionMenuCode: '',
typeSystem: 0,
isSeeOrderLog:0,
isSeeOrderLog: 0,
}
},
components: {
......@@ -1698,7 +1713,7 @@
'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill,
"orderFinancialPage":orderFinancialPage,
"orderFinancialPage": orderFinancialPage,
"czBillModule": czBillModule,
"dmcTravelBill": dmcTravelBill,
CostmonthDetails,
......@@ -1729,8 +1744,8 @@
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 || ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
this.isOrderOP = true
}
if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
this.isSeeOrderLog=1
if (ActionMenuCode.indexOf('SeeOrderLog') != -1) {
this.isSeeOrderLog = 1
}
},
methods: {
......@@ -1749,16 +1764,16 @@
},
// 获取订单客户收款账号
getReceivablesAccount(OrderID){
getReceivablesAccount(OrderID) {
this.apipost('Financial_post_GetCanActivityContractInfo', {
OrderId: OrderID
}, res => {
if (res.data.resultCode == 1) {
this.clientData = res.data.data
if(res.data.data.State==1){
if (res.data.data.State == 1) {
this.isReceivablesAccount = true
}
}else{
} else {
this.Error(res.data.message)
}
}, err => {})
......@@ -1846,15 +1861,16 @@
67) {
this.GetCarList(path)
} else {
if(this.GetDetail.OtherType == 80){
if(this.typeSystem==1){
if (this.GetDetail.OtherType == 80) {
if (this.typeSystem == 1) {
let href = this.domainManager().CarUrl
window.parent.postMessage({
event_id: 'CarDealerOrder',
data: {
OrderId: this.GetDetail.ReFinanceId,
}}, `${href}`)
}else{
}
}, `${href}`)
} else {
this.$router.push({
path: path,
query: {
......@@ -1863,11 +1879,12 @@
}
});
}
}else{
} else {
this.$router.push({
path: path,
query: {
OrderType: this.GetDetail.RelevanceFrId == null || !this.GetDetail.RelevanceFrId ? 4 : this.GetDetail
OrderType: this.GetDetail.RelevanceFrId == null || !this.GetDetail.RelevanceFrId ? 4 : this
.GetDetail
.RelevanceFrId, //1接机 2送机 3包车
OrderId: this.GetDetail.ReFinanceId,
blank: 'y'
......@@ -1885,7 +1902,7 @@
query: {
PeriodsId: this.GetDetail.ReFinanceId,
EmpIds: this.GetDetail.RelevanceFrId,
EmpBranchId : this.GetDetail.RB_Branch_Id,
EmpBranchId: this.GetDetail.RB_Branch_Id,
blank: 'y',
tab: this.$t('objFill.qsxq')
}
......@@ -2055,7 +2072,7 @@
obj.tab = this.$t('objFill.gnoptcxq')
path = 'OPsalesCommissiondetails'
} else if (GetDetail.OtherType == 63 || GetDetail.OtherType == 64) { //单项提成详情
obj.tab = GetDetail.OtherType == 63 ? this.$t('objFill.dxtcxq'):this.$t('objFill.dxoptcxq')
obj.tab = GetDetail.OtherType == 63 ? this.$t('objFill.dxtcxq') : this.$t('objFill.dxoptcxq')
path = 'ServiceCommissiondetails'
obj.Type = GetDetail.OtherType == 63 ? 1 : 2
} else if (GetDetail.OtherType == 69) { //跳转台湾提成的三级详情 老版本
......@@ -2106,8 +2123,6 @@
query: obj
});
}
},
// 获取冲抵列表
getChongDiList(data) {
......@@ -2125,18 +2140,15 @@
}
}, err => {})
},
// 获取订单的明细列表
getOrderFinancialList(data) {
this.apipost("Financial_post_GetOrderFinanceAllList", {
OrderId: data.OrderID
}, res => {
if (res.data.resultCode == 1) {
console.log("this.DataOrderList",this.DataOrderList);
let data = res.data.data;
this.DataOrderList = data.FinanceList;
this.DataOrderPreferPrice=data.PreferPrice
this.DataOrderPreferPrice = data.PreferPrice
}
}, err => {})
},
......@@ -2216,10 +2228,10 @@
},
upLoadFuJian(type) {
// 保存发票
if(type==1){
if (type == 1) {
let that = this
if (this.InvoiceVoucherList.length === 0) return this.$message.error(this.$t('objFill.qscfpwj')+'！');
if(this.GetDetail.Is_Merge===1 && this.ZhiDanRen!==this.bossID){
if (this.InvoiceVoucherList.length === 0) return this.$message.error(this.$t('objFill.qscfpwj') + '！');
if (this.GetDetail.Is_Merge === 1 && this.ZhiDanRen !== this.bossID) {
this.$confirm(this.$t('objFill.hbdjgyfppzwj'), this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
......@@ -2231,11 +2243,11 @@
.catch(() => {
});
}else{
} else {
that.setUpdateInvoiceVoucher()
}
}else{
if (this.saveMsg.length === 0) return this.$message.error(this.$t('objFill.qscfjwj')+'！');
} else {
if (this.saveMsg.length === 0) return this.$message.error(this.$t('objFill.qscfjwj') + '！');
let msg = {
FrID: this.ID,
vorcherInos: this.saveMsg
......@@ -2250,7 +2262,7 @@
}
},
// 保存发票接口
setUpdateInvoiceVoucher(){
setUpdateInvoiceVoucher() {
let msg = {
Id: this.ID,
InvoiceVoucherList: this.InvoiceVoucherList
......@@ -2402,7 +2414,7 @@
name: path,
query: {
id: res.data.data.TCIDs,
lineId:res.data.data.LineId,
lineId: res.data.data.LineId,
isUpdate: false,
blank: 'y'
}
......@@ -2512,7 +2524,7 @@
})
} else if (type == 7) {
if (this.isSeeOrderLog==1){
if (this.isSeeOrderLog == 1) {
this.$router.push({
name: path,
query: {
......@@ -2520,8 +2532,7 @@
blank: 'y'
}
})
}
else{
} else {
this.$router.push({
name: path,
query: {
......@@ -2647,9 +2658,9 @@
this.$message.success(this.$t('tips.scchenggong'));
});
},
deleteUploadFile(i,type) { // 删除上传文件
deleteUploadFile(i, type) { // 删除上传文件
if(type==1){
if (type == 1) {
this.$confirm(this.$t('objFill.ydscbkhf'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
......@@ -2658,14 +2669,14 @@
.then(() => {
this.InvoiceVoucherList.splice(i, 1);
this.InvoiceVoucherListImg = []
this.InvoiceVoucherList.forEach(x=>{
if(x.Type==3){
this.InvoiceVoucherList.forEach(x => {
if (x.Type == 3) {
this.InvoiceVoucherListImg.push(x.Url)
}
})
})
.catch(() => {});
}else{
} else {
this.saveMsg.splice(i, 1);
}
},
......@@ -2688,7 +2699,8 @@
}, res => {
if (res.data.resultCode == 1) {
res.data.data.forEach(y => {
y.contentTips = y.AuditDescription + (y.AuditWay == '2' ? this.$t('fnc.huiqian1') : this.$t('fnc.huoqian1'))
y.contentTips = y.AuditDescription + (y.AuditWay == '2' ? this.$t('fnc.huiqian1') : this.$t(
'fnc.huoqian1'))
})
this.AuditListData.AuditList = res.data.data;
} else {}
......@@ -2735,19 +2747,19 @@
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
if (data.Type==2 || data.FTravelID){
this.isClientBankAccount=true;
}
if(data.Type==2&&data.HelpBranchId>-1){
this.ClientBankAccountTop=1;
}
this.clientBankAccountData={
AccountHolder:data.AccountHolder,
AccountNumber:data.AccountNumber,
SupplierName:data.SupplierName,
DutyNo:data.DutyNo,
AccountTypeStr:data.AccountTypeStr,
AccountCreateTime:data.AccountCreateTime,
if (data.Type == 2 || data.FTravelID) {
this.isClientBankAccount = true;
}
if (data.Type == 2 && data.HelpBranchId > -1) {
this.ClientBankAccountTop = 1;
}
this.clientBankAccountData = {
AccountHolder: data.AccountHolder,
AccountNumber: data.AccountNumber,
SupplierName: data.SupplierName,
DutyNo: data.DutyNo,
AccountTypeStr: data.AccountTypeStr,
AccountCreateTime: data.AccountCreateTime,
JapanFeeMoney: data.JapanFeeMoney,
JapanFeeRemarks: data.JapanFeeRemarks,
JapanFeeCurrencyName: data.JapanFeeCurrencyName,
......@@ -2755,17 +2767,17 @@
JapanFinanceId: data.JapanFinanceId,
FTravelID: data.FTravelID,
FTracelRemark: data.FTracelRemark,
JapanPayMark : data.JapanPayMark
JapanPayMark: data.JapanPayMark
}
this.helpBranchData={
Type:data.Type,
HelpBranchName:data.HelpBranchName,
this.helpBranchData = {
Type: data.Type,
HelpBranchName: data.HelpBranchName,
}
//2023-11-23 add by:W
if(data.InvoiceVoucherInfo){
this.InvoiceVoucherList=data.InvoiceVoucherInfo;
this.InvoiceVoucherList.forEach(x=>{
if(x.Type==3){
if (data.InvoiceVoucherInfo) {
this.InvoiceVoucherList = data.InvoiceVoucherInfo;
this.InvoiceVoucherList.forEach(x => {
if (x.Type == 3) {
this.InvoiceVoucherListImg.push(x.Content)
}
})
......@@ -2796,13 +2808,14 @@
})
}
if(data.OrderSource==8 &&data.OrderID>0){
if (data.OrderSource == 8 && data.OrderID > 0) {
this.getOrderFinancialList(data);
}
this.chongJudge(data)
this.GetDetail = data;
if(data.TemplateId==27&&data.Course_Name&&data.OrderID>0&&data.TCIDList&&data.TCIDList.length>0) {
if (data.TemplateId == 27 && data.Course_Name && data.OrderID > 0 && data.TCIDList && data.TCIDList
.length > 0) {
this.getReceivablesAccount(this.GetDetail.OrderID)
}
if (this.GetDetail.DetailList) {
......@@ -2904,7 +2917,7 @@
}
},
mounted() {
if(localStorage.typeSystem&&localStorage.typeSystem==1) this.typeSystem = localStorage.typeSystem
if (localStorage.typeSystem && localStorage.typeSystem == 1) this.typeSystem = localStorage.typeSystem
// document.onkeydown = this.KeyDown
// document.onkeyup = this.KeyUp
......
src/components/FinancialModule/ReportForm/AirTicketLoss.vue
View file @ 09e2abe5
......@@ -30,7 +30,8 @@
</div>
</div>
<div v-if="LossIncomeList&&LossIncomeList.length>0" style="font-size: 14px;color: red;margin-bottom: 3px;text-align: right;">
注: 韩国线与日本自由行是统计团队亏损，其他线路为机票损失
<!-- 注: 韩国线与日本自由行是统计团队亏损，其他线路为机票损失 -->
注: 以下为团队航班目的地统计
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
......@@ -120,6 +121,20 @@ export default {
goToDetail(item){
if(item.Value!='损失占比'){
if(item.IsTravel==1){
if(item.LossType==-1){
this.$router.push({
name: 'TeamRevenueReport',
query: {
StartTime:item.StartTime,
EndTime:item.EndTime,
LineId:item.LineId,
IsSelectTravelLoss:2,
AirLossId:item.AirLossId,
blank: "y",
}
});
}
else{
this.$router.push({
name: 'TeamRevenueReport',
query: {
......@@ -132,6 +147,7 @@ export default {
}
});
}
}
else{
this.$router.push({
name: 'AirTicketLossDetail',
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 09e2abe5
......@@ -67,13 +67,14 @@
<button class="normalBtn page_EasyReport_search" style="left: 900px;" @click="getData(2)">{{$t('pub.searchBtn')}}</button>
</el-col>
</el-row>
<el-row >
<!-- <el-row >
<el-col :span="6" v-for="(month, index) in monthList" :key="index">
<el-form-item :label="`${month.name}：`">
<el-input v-model="month.value" @change="MonthIndex = month.id" type="number"></el-input>
</el-form-item>
</el-col>
</el-row>
-->
</el-form>
<div class="page_EasyReport_export">
<button class="normalBtn " @click="exportExcel">导出EXCEL</button>
......@@ -1067,7 +1068,7 @@ export default {
endDate=that.year+"-"+column.end
}
if(rowIndex<18){
if(rowIndex<19){
// if(BranchId == 1245){
// that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
// }
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 09e2abe5
......@@ -515,6 +515,7 @@ tr._item_list td:last-child {
<el-option value="21" label="日本手配费收入"></el-option>
<el-option value="22" label="车行收入"></el-option>
<el-option value="23" label="欧洲单团分润收入"></el-option>
<el-option value="24" label="欧洲损失分摊"></el-option>
</el-select>
<el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150" v-if="isShowGrounding==false">
<el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
......@@ -764,6 +765,7 @@ Vue.component("TCIDJump", {
<span style="cursor: pointer" v-if="rowData.DataType===16">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===23" @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===24" @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
</div>
`,
......@@ -912,6 +914,7 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===21" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===23" @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===24" @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
</div>`,
props: {
rowData: {
......@@ -1887,6 +1890,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "LossApportionment",
formatter: this.moneyFormat,
title: "损失分摊",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ShiJiLiRun",
formatter: this.moneyFormat,
......@@ -2249,9 +2262,6 @@ export default {
if(this.$route.query.LtIdStr){
this.msg.LtIdStr=this.$route.query.LtIdStr
}
if(this.$route.query.IsSelectTravelLoss){
this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss
}
if(this.msg.endDate!=""){
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
......@@ -2260,6 +2270,13 @@ export default {
if(this.msg.LineId>0){
this.msg.DataType="1";
}
if(this.$route.query.IsSelectTravelLoss){
this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss;
this.msg.LossId = this.$route.query.AirLossId;
if(this.msg.IsSelectTravelLoss==2){
this.msg.DataType="-1";
}
}
if(this.msg.LineId==-1){
// 其余都是不限
this.msg.DataType="-1";
......@@ -2331,6 +2348,9 @@ export default {
if(this.msg.LineId==-20){
this.msg.DataType="23";
}
if(this.msg.LineId==-24){
this.msg.DataType="24";
}
let userInfo = this.getLocalStorage();
if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
this.isShowType = false;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 09e2abe5
......@@ -1054,15 +1054,16 @@
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送订房
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate" placement="top">
<el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate"
placement="top">
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">重新推送
style="background:#00C6FF; border-color:#00C6FF;">推送订房
</el-button>
</el-tooltip>
</template>
......@@ -1072,12 +1073,13 @@
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
<!-- content="点击取消推送" -->
<el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate" placement="top">
<el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate"
placement="top">
<div slot="content">
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary" style="background:red !important;">
已推送
已推送订车
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.CarIsPush==2" class="item" effect="dark" placement="top">
......@@ -1085,7 +1087,7 @@
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">重新推送
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
</el-tooltip>
</template>
......@@ -1696,34 +1698,23 @@
}
});
},
TipsContent(item,type){
let resultStr='';
let dateStr='';
if(type==2){
if(item.CarIsPush==1){
resultStr+= '点击取消推送'+"<br/>"+''
dateStr ='推送时间：';
}
else if(item.CarIsPush==2){
resultStr+= '点击重新推送'+"<br/>"
dateStr ='取消时间：';
}
if(item.CarPushDate){
resultStr+= dateStr+ item.CarPushDate+"<br/>"
}
} else if(type==1){
if(item.IsPush==1){
dateStr ='推送时间：';
resultStr+= '点击取消推送'+"<br/>"
//提示信息(type=1酒店推送,type=2订车推送)
TipsContent(item, type) {
let resultStr = '';
//订车推送
if (type == 2) {
if (item.CarIsPush == 1) {
resultStr += '已推送订车，推送时间:' + item.CarPushDate + '<br/>点击可取消用车';
} else if (item.CarIsPush == 2) {
resultStr += '已取消订车，取消时间:' + item.CarPushDate + '<br/>点击可重新推送用车';
}
else if(item.IsPush==2){
dateStr ='取消时间：';
resultStr+= '点击重新推送'+"<br/>"
}
if(item.HotelPushDate){
resultStr+= dateStr+ item.HotelPushDate+"<br/>"
//订房推送
else if (type == 1) {
if (item.IsPush == 1) {
resultStr = '已推送订房，推送时间：' + item.HotelPushDate + '<br/> 点击可取消订房';
} else if (item.IsPush == 2) {
resultStr = '已取消订房推送，取消时间：' + item.HotelPushDate + '<br/>点击可重新推送订房';
}
}
return resultStr;
......@@ -1738,7 +1729,8 @@
if (item.IsPush == 1) {
cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
tipMessage = "【取消】推送";
} let that = this;
}
let that = this;
that.$confirm('是否确认操作酒店推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
......@@ -1759,11 +1751,9 @@
},
//订车推送
PushBusMessage(item) {
var pMsg = {
TCID: item.TCID
};
var tipMessage = "订车推送消息";
var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息
if (item.CarIsPush == 1) {
......@@ -1785,10 +1775,7 @@
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {
});
}).catch(() => {});
},
showDialog(ConfigId, OfferId) {
this.dialog = {
......
src/components/index.vue
View file @ 09e2abe5
......@@ -2075,7 +2075,7 @@
let day = changedate.getDate()
let days = day > 9 ? day : '0' + Month
let DepartETime = Year + '-' + Months + '-' + days
console.log("ddddddd", DepartETime);
console.log("Index_GetChangeThePrice", DepartETime);
let msg = {
pageIndex: 1,
pagesize: 5,
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ 09e2abe5
......@@ -1098,7 +1098,6 @@
},
// 单据详情
openDetails(FrID) {
console.log(FrID);
let query = {
id: FrID,
blank: "y",
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 09e2abe5
......@@ -16,8 +16,7 @@
<template v-for="item in TypeArray">
<div class="TFslide"
:class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode"
>
@click="clickFeature(item)" :key="item.subCode">
<!--v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)"-->
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
......@@ -411,8 +410,8 @@
this.dialogPptistVisible = false
},
handleMessage(event, targetOrigin) {
console.log("event", event);
console.log("event.data", event.data);
console.log("handleMessage_event", event);
console.log("handleMessage_event.data", event.data);
if (this.isPostMessage) return
if (event.data && event.data.data && !event.data.data) return
if (event && event.data) {
......@@ -464,7 +463,6 @@
}
},
getHtml: function (postData, SaveType, TeamType) {
console.log("postData", postData);
var FeatureData = {
B2BRemark: postData.B2BRemark,
ConfigId: postData.ConfigId,
......@@ -521,7 +519,6 @@
}
FeatureData.FeatureHtml = newHtml;
} catch (err) {}
console.log("Api_FeatureData", FeatureData);
this.apipost("travel_post_SetFeature", FeatureData, res => {
try {
this.$refs.newFeature.setReadOnly(false)
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 09e2abe5
......@@ -85,7 +85,7 @@
</div>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<div id="fiveAnchor">
<!--常规团-->
<TravelPrice v-show="PostConfig.TeamType==0" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
......
src/components/newTravelmanager/TravelGroupControl/TravelNotice.vue
View file @ 09e2abe5
......@@ -186,9 +186,6 @@
</div>
</template>
<script>
import {
quillEditor
} from "vue-quill-editor";
import * as Quill from "quill"; //引入编辑器
import MyEdit from "../../EditTemplate.vue";
//quill编辑器的字体
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 09e2abe5
......@@ -654,7 +654,8 @@
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" :disabled="CurrentUserInfo.RB_Group_id==2">
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"
:disabled="CurrentUserInfo.RB_Group_id==2">
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option>
......@@ -1236,9 +1237,7 @@
message: res.data.message
});
}
},
err => {}
);
});
},
//销售公司改变方法
ChangeSaleBranch(item) {
......@@ -1406,7 +1405,6 @@
});
this.returnPriceList = array;
},
initCalendar: function (cur) {
var newDays = this.$calendarUtils.createCalendar(cur);
this.currentDay = newDays.CurrentDay;
......@@ -1526,8 +1524,7 @@
message: res.data.message
});
}
},
err => {}
}
);
},
validateForm() {
......@@ -1729,9 +1726,7 @@
this.companyList = res.data.data;
this.getstandardCurrencyName()
}
},
err => {}
);
});
},
//选中航班选择框
getSelect(item) {
......@@ -1912,10 +1907,12 @@
},
//关闭弹窗方法
closeHotelDialog() {
console.log("xxxx")
this.outerVisible = false;
},
//保存完成初始化
initStatus() {
console.log("yyyy")
this.isSaved = true;
this.btnText = '保存';
this.btnTongBu = "同步酒店";
......@@ -1934,9 +1931,7 @@
if (res.data.resultCode == 1) {
item.HotelList = res.data.data;
}
},
err => {}
);
});
}
},
//获取少价信息
......@@ -1952,9 +1947,7 @@
} else {
this.Error(res.data.message);
}
},
err => {}
);
});
},
//删除占用的酒店库存信息
DeleteStock(item) {
......@@ -1972,9 +1965,7 @@
} else {
that.Error(res.data.message);
}
},
err => {}
);
});
});
},
//根据日期返回星期几
......@@ -1991,13 +1982,10 @@
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
});
},
uploadFileBtn(file) { //上传
let newArr = [];
......@@ -2020,9 +2008,7 @@
} else {
this.Error(res.data.message);
}
},
err => {}
);
});
}
},
mounted() {
......
src/components/newTravelmanager/travelLineTrip/trifficTripThree.vue
View file @ 09e2abe5
......@@ -9,9 +9,7 @@
<div class="TDLeftPlan">
<span v-for="(subTraffic,subTrafficIndex) in trafficObj.SubTraffic">
<span v-if="subTrafficIndex==0">
<el-form-item
class="StartCity"
:rules="trifficTripRules.StartCityId">
<el-form-item class="StartCity" :rules="trifficTripRules.StartCityId">
<el-select :disabled="isOpenGroup" class="w120" placeholder="出发城市" filterable remote
v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1"
@change="changeGetDepartList(subTraffic.StartCityId)">
......@@ -52,7 +50,8 @@
<span style="line-height: 38px;">
<span v-if="!isOpenGroup" class="addTrafficPlan" @click="addTrafficPlan(trafficObj)">+</span>
<!--减少交通计划-->
<span v-if="trafficObj!=null && trafficObj.SubTraffic!=null && trafficObj.SubTraffic.length>1&&!isOpenGroup"
<span
v-if="trafficObj!=null && trafficObj.SubTraffic!=null && trafficObj.SubTraffic.length>1&&!isOpenGroup"
class="addTrafficPlan" @click="minusTrafficPlan(trafficObj)">-</span>
</span>
</div>
......@@ -122,7 +121,6 @@
"QueryData",
"isOpenGroup",
"subTotalIndex",
"AllCityList", //所有的城市数据
"TimeTypeList",
"UseTypeArray",
"AirPickUp",
......@@ -255,7 +253,7 @@
if (val != 0) {
//获取当前选中的对象
let obj = {};
obj = that.AllCityList.find(item => {
obj = that.ArriveList1.find(item => {
return item.ID === val; //筛选出匹配数据
});
if (obj != undefined) {
......@@ -279,7 +277,7 @@
if (val != 0) {
//获取当前选中的对象
let obj = {};
obj = that.AllCityList.find(item => {
obj = that.DepartList1.find(item => {
return item.ID === val; //筛选出匹配数据
});
if (obj != undefined) {
......@@ -291,7 +289,6 @@
}
}
},
//接机送机点击切换
changeAirportType(t) {
if (t == this.trafficObj.AirportPickUp) {
......@@ -425,17 +422,21 @@
</script>
<style>
.addTrafficPlan{
.addTrafficPlan {
line-height: 20px;
}
.useTypeDiv .el-input .el-input__inner{
.useTypeDiv .el-input .el-input__inner {
height: 27px !important;
border-radius: 3px;
}
.StartCity .el-form-item__content{
.StartCity .el-form-item__content {
line-height: 35px;
}
.TCtraffic.flex .TDplanList.TDplanListTwo{
.TCtraffic.flex .TDplanList.TDplanListTwo {
padding-top: 0;
}
</style>
src/components/orderCommon/order-form2.vue
View file @ 09e2abe5
......@@ -1037,8 +1037,6 @@
if (res.data.resultCode == 1) {
this.couponList = res.data.data
}
}, (err) => {
console.log(err)
})
}
},
......
src/components/temp/operation.vue
View file @ 09e2abe5
......@@ -378,10 +378,12 @@
</template>
<div class="border-bottom" v-if="isVisa">
<p style="font-size: 16px;font-weight: bold;color: black;padding: 10px 0 0 0;"
v-if="item.BranchList[0].GradeRuleList.length>0">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
v-if="item.BranchList&&item.BranchList.length>0&&item.BranchList[0].GradeRuleList&& item.BranchList[0].GradeRuleList && item.BranchList[0].GradeRuleList.length>0">
小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
<div class="ladder-form" style="margin-top: 3px;">
<div class="ladder-form-box">
<template v-if="item.BranchList[0].GradeRuleList.length>0">
<template
v-if="item.BranchList&&item.BranchList.length>0&&item.BranchList[0].GradeRuleList&&item.BranchList[0].GradeRuleList.length>0">
<div class="ladder-list" v-for="(s,indexs) in item.BranchList">
<div class="ladder-title">{{s.BranchName}}</div>
<div class="CommissionInfor">
......@@ -720,8 +722,10 @@
if (item.Id == 1) {
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
} else {
if(this.LastMonthTime==12) this.msg.Month = this.Year2 + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
else this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
if (this.LastMonthTime == 12) this.msg.Month = this.Year2 + '-' + (this.LastMonthTime >= 10 ? this
.LastMonthTime : '0' + this.LastMonthTime)
else this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this
.LastMonthTime)
}
this.getList()
},
......@@ -729,7 +733,7 @@
getList() {
this.loading = true
this.apipost("opcommission_GetOPExpectCommission", this.msg, res => {
this.loading=false;
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderNum = 0
this.groupNum = 0
......@@ -894,9 +898,9 @@
}
let nowdays = new Date()
this.Year = new Date().getFullYear()
this.Year2 = new Date().getFullYear()-1
this.Year2 = new Date().getFullYear() - 1
this.LastMonthTime = new Date().getMonth()
this.LastMonthTime = this.LastMonthTime==0?12:this.LastMonthTime
this.LastMonthTime = this.LastMonthTime == 0 ? 12 : this.LastMonthTime
this.MonthTime = new Date().getMonth() + 1
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
this.MonthList[0].Name = this.MonthList[0].Name + '(' + this.LastMonthTime + '月)'
......@@ -904,7 +908,8 @@
this.commissionMsg.DepartSTime = this.getBeforeDate(93, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
var MonthDayNum = new Date(this.Year, this.MonthTime, 0).getDate(); //计算当月的天数
this.commissionMsg.DepartETime = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime) +
this.commissionMsg.DepartETime = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this
.MonthTime) +
'-' + (MonthDayNum > 10 ? MonthDayNum : '0' + MonthDayNum) //出发结束
this.iWorkbench()
this.GetOrderPageList()
......
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