Skip to content

S
SuperMan
Commit b66032e8 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 1f8b84db b1a0b5a5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1881 additions and 67 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ b66032e8
......@@ -99,6 +99,8 @@
EmployeeId: null,
OrderSource: null,
visaShowTab:false,
tradeWay:'',
platformAccount:'',
}
},
computed: {
......@@ -116,7 +118,7 @@
methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
if(this.active==1){
this.$router.push({ name: "addReceivablesDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
this.$router.push({ name: "addReceivablesDocuments",query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
}else if(this.active==2){
this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}else if(this.active==4){
......@@ -242,6 +244,9 @@
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.OrderSource = this.$route.query.OrderSource ? this.$route.query.OrderSource : null
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
this.tradeWay = this.$route.query.tradeWay?this.$route.query.tradeWay:0;
this.platformAccount = this.$route.query.platformAccount?this.$route.query.platformAccount:0;
if(this.$route.query.visaType){
this.visaShowTab=true;
}
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ b66032e8
......@@ -75,16 +75,23 @@
<!-- <p style="font-size:48px;" @click="senCashierDetaildMsg">{{Num}}</p> //测试传值代码 -->
<p class="rb_tit" style="font-size: 16px !important;">{{GetDetail.CompanyName}}（{{GetDetail.BranchName}}）</p>
<p class="rb_stit">
<p class="rb_stit" style="position:relative">
<span :class="isPrintPage?'_rb_stit_print':''">{{GetDetail.FinanceName}}</span>
<!-- <i v-if="name===1">（客户联）</i> -->
<i v-if="name===1">{{$t('fnc.yewulian')}}</i>
<i v-if="name===2">{{$t('fnc.kuaijilian')}}</i>
<a class="_yewudanju" style="right:0;top:0">
<span style="border:none;padding:0" v-if="GetDetail.OrderTradeWay==1">平台：</span>
<span style="border:none;padding:0" v-if="GetDetail.OrderTradeWay==3">外交平台：</span>
<span style="border:none;padding:0" class="_jump_page" @click="jumpPageNew">
{{GetDetail.PlatFormName}}</span>
</a>
</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>
......@@ -312,6 +319,18 @@ export default {
sendMsg(){
this.$emit('helloPP','1')
},
jumpPageNew(){
this.$router.push({
name: 'platOrderquery',
query: {
platName: this.GetDetail.PlatFormName,
TradeWay: this.GetDetail.OrderTradeWay,
PlatformAccount: this.GetDetail.PlatformAccountId,
blank: 'y',
tab: '平台订单查询'
}
})
},
jumpFreePage(path,id){
this.$router.push({
name: path,
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ b66032e8
......@@ -708,9 +708,9 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票折让{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===14" @click="goSAirRec('TicketManager',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===11">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9" @click="goHotelOrder('HotelOrderTotal',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10" @click="goHotelOrder('ScenTicketOrder',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===11" @click="goHotelOrder('FoodOrder',rowData)">{{rowData.TCNUM}}</span>
</div>`,
props: {
rowData: {
......@@ -724,6 +724,16 @@ Vue.component("TCNUMJump", {
}
},
methods: {
goHotelOrder(path,rowData){
let TCID=rowData.TCID;
if(rowData.DataType==9){
TCID=rowData.TCNUM
}
this.$router.push({
path: "/" + path,
query: {'teamTCID':TCID,blank: "y"}
});
},
goRec(path,rowData){
let BankID="";
let StartDate="";
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ b66032e8
......@@ -613,6 +613,8 @@ export default {
templateType: 1,
setCode:'',
shouxufei: 0,
tradeWay:'',
platformAccount:'',
}
},
methods:{
......@@ -1087,7 +1089,8 @@ export default {
this.msg.detailList.forEach(x=>{
delete x.rate;
});
this.msg.OrderTradeWay=this.tradeWay;
this.msg.PlatformAccountId=this.platformAccount;
this.loading = true;
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
......@@ -1518,6 +1521,8 @@ export default {
},
created(){
let that=this;
this.tradeWay = this.$route.query.tradeWay?this.$route.query.tradeWay:0;
this.platformAccount = this.$route.query.platformAccount?this.$route.query.platformAccount:0;
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
that.Description="旅客名单：";
......
src/components/FinancialModule/platOrderquery.vue 0 → 100644
View file @ b66032e8
This diff is collapsed.
src/components/Restaurant/FoodOrder.vue
View file @ b66032e8
......@@ -242,7 +242,11 @@ export default {
}
},
mounted() {
if(this.$route.query.teamTCID){
this.msg.searchKey=this.$route.query.teamTCID;
}
this.getList();
}
};
</script>
......
src/components/SalesModule/productQuery.vue
View file @ b66032e8
......@@ -452,7 +452,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-col :span="4" v-if='addMsg.TradeWay==1 || addMsg.TradeWay==3'>
<el-form-item :label="$t('fnc.fkuanzhanghu')">
<el-select filterable v-model='addMsg.PlatformAccount' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
......@@ -460,7 +460,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-col :span="4" v-if='addMsg.TradeWay==1 || addMsg.TradeWay==3'>
<el-form-item :label="$t('salesModule.PlatOrder')" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' maxlength='20'></el-input>
</el-form-item>
......@@ -1136,7 +1136,10 @@
showPrice:false,
showPay:false,
showZhan:false
}
},
PlatformAccountList1:[],
PlatformAccountList2:[],
}
},
components: {
......@@ -1570,7 +1573,16 @@
this.getTotalPrice();
this.getTicheng();
},
tradeWayMethods() {
tradeWayMethods(val) {
if(val==3){
this.addMsg.PlatformAccount=''
this.PlatformAccountList=this.PlatformAccountList2;
}
if(val==1){
this.addMsg.PlatformAccount=''
this.PlatformAccountList=this.PlatformAccountList1;
}
if (this.addMsg.TradeWay == 2) {
this.addMsg.PlatformOrder = ''
this.addMsg.PlatformAccount=''
......@@ -2008,6 +2020,13 @@
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
// 判断交易方式是外交平台和平台付款
if(this.addMsg.TradeWay==1 || this.addMsg.TradeWay==3){
if(this.addMsg.PlatformAccount==''){
this.Error('请选择收款账户！');
return;
}
}
this.addMsg.TCID = this.addObj.TCID
this.addMsg.GuestNum = Number(this.addMsg.ManNum) + ChirdNum + Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.AirticketNum)
......@@ -2038,6 +2057,7 @@
this.getMinPrice(obj.LineID);
this.getScenicRefund(obj.TCID);
this.getPlatformAccount(obj.PlatformAccountTypeId);
this.getPlatformAccountNew();
this.clearMsg()
// let str = ''
// if (obj.OtherPrice > 0 ) {
......@@ -2054,7 +2074,24 @@
TypeId: typeIdtwo,BranchId:platBranchId
}, res => {
if (res.data.resultCode == 1) {
this.PlatformAccountList = res.data.data
this.PlatformAccountList1 = res.data.data
}
}, err => {})
},
getPlatformAccountNew() {
this.apipost('Financial_get_GetDiplomacyPlatformList', {}, res => {
if (res.data.resultCode == 1) {
this.PlatformAccountList2= [];
let data=res.data.data;
data.forEach(item=>{
let obj={
Alias:item.Name,
ID:item.ID,
}
this.PlatformAccountList2.push(obj)
})
}
}, err => {})
},
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ b66032e8
......@@ -788,6 +788,9 @@ export default {
}
},
mounted() {
if(this.$route.query.teamTCID){
this.msg.HotelName=this.$route.query.teamTCID;
}
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团
this.getDepartmentMsg.RB_Branch_Id=userInfo.RB_Branch_id; //公司
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ b66032e8
......@@ -1946,18 +1946,31 @@
<p class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</p>
</div>
</td>
<td colspan="4" style="height: 40px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<span>{{$t('hotel.hotel_Order')}}：</span>
<td colspan="4" style="height: 40px;cursor: pointer;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span>收款单据：</span>
<span v-for="(item2,index2) in item.FinanceList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
<span v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.ColorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span>
<span v-if="item.FinanceList.length===0">{{$t('system.content_noData')}}</span>
</div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span>付款单据：</span>
<span v-for="(item2,index2) in item.RefundFinanceList" :key="index2">
<span v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">{{item2.FrID}}&nbsp;</span>
<span v-else-if="item2.ColorState===2"
class="groupTourOrder_tickets_green">{{item2.FrID}}&nbsp;</span>
<span v-else-if="item2.ColorState===3"
class="groupTourOrder_tickets_red">{{item2.FrID}}&nbsp;</span>
<span v-else-if="item2.ColorState===4"
class="groupTourOrder_tickets_black">{{item2.FrID}}&nbsp;</span>
</span>
<span v-if="item.RefundFinanceList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</td>
</tr>
</tbody>
......@@ -2317,7 +2330,7 @@
</td>
<td colspan="4" style="height: 40px;cursor: pointer;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)">
<span>{{$t('hotel.hotel_Order')}}：</span>
<span>收款单据：</span>
<span v-for="(item2,index2) in childItem.FinanceList" :key="index2">
<span v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">《{{item2.FrID}}》&nbsp;</span>
<span v-else-if="item2.ColorState===2"
......@@ -2329,6 +2342,19 @@
</span>
<span v-if="childItem.FinanceList.length===0">{{$t('system.content_noData')}}</span>
</div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)">
<span>付款单据：</span>
<span v-for="(item2,index2) in childItem.RefundFinanceList" :key="index2">
<span v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">《{{item2.FrID}}》&nbsp;</span>
<span v-else-if="item2.ColorState===2"
class="groupTourOrder_tickets_green">《{{item2.FrID}}》&nbsp;</span>
<span v-else-if="item2.ColorState===3"
class="groupTourOrder_tickets_red">《{{item2.FrID}}》&nbsp;</span>
<span v-else-if="item2.ColorState===4"
class="groupTourOrder_tickets_black">《{{item2.FrID}}》&nbsp;</span>
</span>
<span v-if="childItem.RefundFinanceList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
<div>
<span>{{$t('salesModule.Invoice')}}：</span>
<span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2">
......@@ -4981,6 +5007,7 @@
res => {
this.loading = false;
if (res.data.resultCode == 1) {
console.log(res,'resssssssss');
this.OrderDataList = res.data.data;
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
}
......
src/components/index.vue
View file @ b66032e8
......@@ -3789,13 +3789,11 @@ export default {
}
},
deletMsg(type) {
let LogStr = [],
ContentType = [];
let LogStr = [];
this.msgList.forEach(x=>{
LogStr.push(x.ID)
ContentType.push(x.ContentType)
})
this.apipost('SystemLog_post_SetReadStatusBatch',{LogStr:LogStr,ContentType:ContentType},r=>{
this.apipost('SystemLog_post_SetReadStatusBatch',{LogStr:LogStr},r=>{
if(r.data.resultCode==1){
this.msgList = [];
this.MsgCount = this.msgList.length;
......
src/components/scenicSpot/ScenTicketOrder.vue
View file @ b66032e8
......@@ -686,10 +686,14 @@ export default {
}
},
mounted() {
if(this.$route.query.teamTCID){
this.msg.searchKey=this.$route.query.teamTCID;
}
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.getDepartmentMsg.RB_Branch_Id = userInfo.RB_Branch_id; //公司
this.msg.CreateBy = userInfo.EmployeeId;
this.getCompanyList()
// this.getDepartment()
// this.getEmployee()
......
src/router/config.js
View file @ b66032e8
......@@ -2938,6 +2938,14 @@ export default {
title: '收入确认单'
},
},
{ // 财务往来单据 平台订单查询
path: '/platOrderquery',
name: 'platOrderquery',
component: resolve => require(['@/components/FinancialModule/platOrderquery'], resolve),
meta: {
title: '平台订单查询'
},
},
{ //财务 现金日报表
path: '/CashReport',
name: 'CashReport',
......
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