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
Show 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
<template>
<div class="flexOne groupts">
<div class="enrollTotalSearch">
<ul>
<!-- <li><span><em>{{$t('advmanager.v_line')}}</em>
<el-select class='w200' v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li> -->
<li><span><em>{{$t('system.table_company')}}</em>
<el-select class='w200' v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change='linkageDepartment()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li v-show="!isOwn">
<span><em>{{$t('fnc.ryxuanze')}}</em></span>
<el-select class='w200' v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList' :label='item.name' :value='item.empId' :key='item.empId'>
</el-option>
</el-select>
</li>
<!-- <li v-show="!isOwn">
<span><em class="fl" style="margin-top: 10px!important;">{{$t('fnc.bmxuanze')}}</em>
<treeselect class='w200 fl' :options="departmentList" v-model="msg.RB_Department_Id" :label="$t('pub.unlimitedSel')"
:normalizer="normalizer" @select='linkageEmployeeMsg' />
</span>
</li> -->
<li><span><em>{{$t('fnc.ctleixing')}}</em>
<el-select class='w200' v-model="msg.GroupType" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for="item in ctlxList" :key='item.Id' :label='item.Name' :value='item.Id'></el-option>
</el-select>
</span>
</li>
<li>
<span><em>{{$t('visa.v_tuanhao')}}</em></span>
<el-input class='w200' v-model='msg.TCNUM'></el-input>
</li>
<li>
<span><em>{{$t('hotel.order_Number')}}</em></span>
<el-input class='w200' v-model='msg.tempOrderId'></el-input>
</li>
<!-- <li>
<span><em>{{$t('hotel.hotel_OrderStates')}}</em></span>
<el-select v-model='msg.OrderState' filterable :placeholder="$t('pub.pleaseSel')" style="width:180px">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for="item in ddztList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</li>-->
<li>
<span><em>{{$t('hotel.hotel_OrderStates')}}</em></span>
<el-select v-model='msg.OrderState' filterable :placeholder="$t('pub.pleaseSel')" style="width:180px">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for="item in ddztList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</li>
<!-- <li>
<span><em>{{$t('active.cl_orderType')}}</em></span>
<el-select v-model='msg.IsOneDay' filterable :placeholder="$t('pub.pleaseSel')" style="width:180px">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option :label="$t('salesModule.TourOrder')" :value='0'></el-option>
<el-option :label="$t('salesModule.OneDayOrder')" :value='1'></el-option>
</el-select>
</li> -->
<li>
<span><em>{{$t('salesModule.PaymentStatus')}}</em></span>
<el-select v-model='msg.IsCollectMoney' filterable :placeholder="$t('pub.pleaseSel')" style="width:180px">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option :label="$t('salesModule.Collect')" :value='1'></el-option>
<el-option :label="$t('salesModule.NoCollect')" :value='2'></el-option>
</el-select>
</li>
<li><span><em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker v-model='msg.QStartDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker v-model='msg.QEndDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li><span><em>{{$t('fnc.bmriqi')}}</em>
<el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<span><em>交易方式</em></span>
<el-select v-model='msg.TradeWay' filterable :placeholder="$t('pub.pleaseSel')" @change='tradeWayMethods'>
<el-option v-for="item in jyfsList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</li>
<li v-if='msg.TradeWay==1 || msg.TradeWay==3'>
<span><em>收款账户</em></span>
<el-select filterable v-model='msg.PlatformAccount' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
</li>
</ul>
</div>
<!-- 统计版块 -->
<div class="groupTourOrder_count">
<el-row :gutter="20">
<el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-qian groupTourOrder_count_green"></i>
<span>{{$t('Operation.Op_salesTotal')}}</span>
</div>
<p>
<span>{{$t('salesModule.Ypay')}}：{{countData.PreferPrice}};</span>
<span>{{$t('Operation.Op_yiShou')}}：{{countData.Income}};</span>
<span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">{{$t('Operation.Op_weiShou')}}：{{countData.DueinMoney}};</span>
<span>{{$t('fnc.ztjine')}}：{{countData.ZaiTu}};</span>
</p>
</div>
</el-col>
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i>
<span>{{$t('fnc.zcbmrenshu')}}</span>
<span>{{countData.NormalGuestNum}}</span>
</div>
<p>
<span>{{$t('Airticket.Air_EconomyClass')}}：{{countData.NormalYSeatNum}};</span>
<span>{{$t('Airticket.Air_businessClass')}}：{{countData.NormalESeatNum}};</span>
<span>{{$t('Airticket.Air_firstClass')}}：{{countData.NormalFSeatNum}};</span>
</p>
</div>
</el-col>
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_yellow">
<i class="iconfont icon-baomingrenshu"></i>
<span>{{$t('fnc.qxrenshu')}}</span>
<span>{{countData.CancelGuestNum}}</span>
</div>
<p>
<span>{{$t('Airticket.Air_EconomyClass')}}：{{countData.CancelYSeatNum}};</span>
<span>{{$t('Airticket.Air_businessClass')}}：{{countData.CancelESeatNum}};</span>
<span>{{$t('Airticket.Air_firstClass')}}：{{countData.CancelFSeatNum}};</span>
</p>
</div>
</el-col>
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>{{$t('fnc.qtxtongji')}}</span>
</div>
<p>
<span>{{$t('fnc.nbbaoming')}}：{{countData.InteriorNum}};</span>
<span>{{$t('fnc.B2BWAP')}}：{{countData.B2BNum}};</span>
</p>
</div>
</el-col>
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>{{$t('fnc.cwdjshuoming')}}</span>
</div>
<p>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#0000ff"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#00FF00"></i><span>{{$t('fnc.ptcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#FF0000"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#000000"></i><span>{{$t('fnc.ytongguo')}}</span></span>
</p>
</div>
</el-col>
<el-col :span="3" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>{{$t('salesModule.LJTC')}}</span>
</div>
<p>
<span>{{$t('salesModule.TCmoney')}}：{{countData.SumCommissionMoney}};</span>
</p>
</div>
</el-col>
</el-row>
</div>
<!-- 表格 -->
<div style="clear: both; width: 100%;height: 20px;"></div>
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="160">{{$t('fnc.danhao')}}&{{$t('visa.v_tuanhao')}}</th>
<th width="60">{{$t('fnc.khxinxi')}}</th>
<th width="70">{{$t('salesModule.Type')}}</th>
<th width="180">{{$t('advmanager.v_xilie')}}&{{$t('advmanager.v_line')}}</th>
<th width="100">{{$t('Airticket.Air_Number')}}/{{$t('salesModule.AirNum')}}{{$t('salesModule.AirNum')}}</th>
<th width="80">{{$t('fnc.danjia')}}</th>
<th width="80">{{$t('fnc.cjdanjia')}}</th>
<th width="80">{{$t('fnc.yszonge')}}</th>
<th width="80">{{$t('fnc.shishou')}}</th>
<th width="70">{{$t('fnc.youhui')}}</th>
<th width="70">{{$t('salesModule.HappinessPassbook')}}</th>
<th width="70">{{$t('fnc.xiaofei')}}</th>
<th width="70">{{$t('fnc.tuikuan')}}</th>
<th width="70">{{$t('fnc.ptshuijin')}}</th>
<th width="80">{{$t('Operation.Op_platZaitu')}}</th>
<th width="80">{{$t('Operation.Op_daishou')}}</th>
<th width="60">{{$t('admin.admin_status')}}</th>
<th v-if="isEditOrderCreate==1 || userId==1" width="140">{{$t('admin.admin_operate')}}</th>
</tr>
<tr>
<td v-show="list.length==0" colspan="15" align="center">{{$t('system.content_noData')}}</td>
</tr>
<tbody v-for="(item,index) in list" :key="index">
<tr>
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">
<span>{{item.orderId}}</span>
<span style="font-weight: 100;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>({{$t('salesModule.ScoreNUM')}}{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.isFormB2B ==1"> <i class="iconfont icon-tiaozheng"
style="font-size:22px;color:#297BEF;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p>
<div>
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>
<p v-if="item.extraDeductMoney>0">{{$t('salesModule.EWKCJE')}}：{{item.extraDeductMoney}}</p>
</div>
<div style="color:red" v-else>
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>
<p v-if="item.extraDeductMoney>0">{{$t('salesModule.EWKCJE')}}：{{item.extraDeductMoney}}</p>
</div>
<div style="color:red">
<p v-if="item.unionExtraMoney!=0">{{$t('salesModule.LYEWFY')}}：{{item.unionExtraMoney}}</p>
</div>
</div>
</td>
<td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
<p>{{item.contactMobile}}</p>
<p v-if="item.industryCategory!==''" style="color:green">{{$t('salesModule.HYLB')}}：{{item.industryCategory}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
</td>
<td class="fz12">
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.lineName">
<span>{{item.lineName}}</span>
</p>
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
</td>
<td>
{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
<br/>
<span v-if="item.refuseVisaNum>0" style="color:red">
({{$t('salesModule.RefuseQ')}}{{item.refuseVisaNum}}{{$t('salesModule.PeoPle')}})
</span>
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td>
<td>
<p style="color:#FF9C00">￥{{item.preferPrice}}</p>
</td>
<td>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
</td>
<!-- 优惠 -->
<td>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>{{$t('active.cl_couponName')}}</th>
<th>{{$t('active.cl_couponType')}}</th>
<th>{{$t('active.cl_dkjezk')}}</th>
<th>{{$t('active.cl_sytiaojian')}}</th>
<th>{{$t('active.cl_huoqufangshi')}}</th>
<th>{{$t('active.cl_hqriqi')}}</th>
</tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td>
<td>
<span v-if="item2.couponsType==1">{{$t('active.cl_dyquan')}}</span>
<span v-if="item2.couponsType==2">{{$t('active.cl_zkquan')}}</span>
</td>
<td>{{item2.denomination}}</td>
<td>{{$t('active.cl_man')}}{{item2.useCondition}}{{$t('active.cl_keyong')}}</td>
<td>
<span v-if="item2.accessType==1">{{$t('active.cl_choujiang')}}</span>
<span v-else></span>
</td>
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">{{$t('system.content_noData')}}</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;text-decoration: underline;" slot="reference">{{moneyFormat(item.discountMoney)}}</span>
</el-popover>
</td>
<td>
<el-popover v-if="item.customerId || item.customerId==0" style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>{{$t('fnc.jine')}}</th>
<th>{{$t('admin.admin_type')}}</th>
<th>{{$t('system.label_info')}}</th>
<th>{{$t('salesModule.Time')}}（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">{{$t('salesModule.LookMore')}}</span>）</th>
</tr>
<tr v-for="(item2,index2) in redBagList"
:key="index2">
<td>{{item2.Money}}</td>
<td>
{{item2.Type==1?"收入":"折扣"}}
</td>
<td>{{item2.Description}}</td>
<td>{{item2.UpdateTime}}</td>
</tr>
<tr v-if='redBagList.length==0'>
<td colspan="4" align="center">{{$t('system.content_noData')}}</td>
</tr>
<tr>
<!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> -->
</tr>
</table>
</div>
<span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;text-decoration: underline;" slot="reference">{{item.redEnvelopeMoney}}</span>
</el-popover>
<span v-else style="color: #e95252;text-decoration: underline;">{{item.redEnvelopeMoney}}</span>
</td>
<td v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="isEditOrderCreate==1||userId==1">
<button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">{{$t('salesModule.UpdateYWY')}}</button>
</td>
</tr>
<tr style="height:20px">
<td :colspan="isEditOrderCreate==1||userId==1 ?17:16" class="RL_Order" style="height:20px">
<span style="font-size: 14px;color: #333333">{{$t('salesModule.MD')}}:</span>
<span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
<span class="" >{{$t('salesModule.CancelOrder')}}:</span>
<span class="RL-redType RL-remarkCon">
<span style="color: red;" v-for="(childItem) in item.cancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<span style="display: block;font-size: 14px;color: #333333">{{$t('salesModule.RoomInfo')}}<span v-if="item.oneSex>0" style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
</td>
</tr>
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>{{$t('pub.pubRemark')}}：</span>
<span v-if="item.tsIdList.length>0">{{$t('salesModule.ComplaintNum')}}：
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
</span>
<p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}{{$t('fnc.dingdan')}} {{item.platformOrder}};</span>{{item.remarks}}</p>
</div>
<div>
<span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span>
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>{{$t('fnc.lsbeizhu')}}</div>
<p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2">
<span>{{item2.remarks}}</span>
<span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span>
</p>
<span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"></el-button>
</el-popover>
</div>
</div>
</td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div>
<span>{{$t('Operation.Op_remark')}}:</span>
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p>
</div>
</div>
</td>
<td colspan="9" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>{{$t('fnc.skdanju')}}：</div>
<div>
<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>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>{{$t('fnc.fkdanju')}}：</div>
<div>
<span v-for="(item2,index2) in item.refundFinanceList" :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>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div>
<div>{{$t('salesModule.Invoice')}}：</div>
<div>
<span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
</span>
<span v-if="item.invoiceApplyList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total></el-pagination>
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
</div>
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: {
Treeselect,
updateSalesMan
},
data() {
return {
normalizer(node) {
var obj = {
id: node.DepartmentId,
label: node.DepartmentName,
};
if (node.ChildList != null && node.ChildList.length > 0) {
obj.children = node.ChildList;
}
return obj;
},
jyfsList:[],
redBagList:[],
happy:false,
defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
currentPage: 1,
total: 0,
loading: false,
msg: {
LineId: "-1",
RB_Department_Id: null,
CreateBy: "-1",
OrderState: "-1",
CStartDate: "",
CEndDate: "",
QStartDate: "",
QEndDate: "",
pageIndex: 1,
pageSize: 10,
tempOrderId: "",
SellFormEmp: 0,
GroupType: '-1',
TCNUM: '',
BranchId:'-1',
IsOneDay: '-1',
IsCollectMoney:0,
TradeWay:'',
PlatformAccount:'',
},
employeeMsg: {
RB_Group_id: "0",
RB_Branch_id: "-1",
departmentId: "0",
IsLeave: "-1"
},
getCompanyMsg: {
RB_Group_Id: '0',
Status: '0',
},
getDepartmentMsg: {
RB_Group_Id: '0',
RB_Branch_Id: '-1',
Status: '0',
},
isOwn: false,
list: [],
LineList: [],
LineTeamList: [],
departmentList: [],
employeeList: [],
companyList: [],
ddztList: [],
countData: {
// 总报名人数
TotalGuestNum: 0,
TotalYSeatNum: 0,
TotalESeatNum: 0,
TotalFSeatNum: 0,
// 正常报名人数
NormalGuestNum: 0,
NormalYSeatNum: 0,
NormalESeatNum: 0,
NormalFSeatNum: 0,
// 取消人数
CancelGuestNum: 0,
CancelYSeatNum: 0,
CancelESeatNum: 0,
CancelFSeatNum: 0,
// 其他统计项
Income: 0,
Commission: 0,
DueinMoney: 0,
PreferPrice: 0,
InteriorNum: 0,
B2BNum: 0
},
ctlxList: [],
showChangeSales:false,
//订单编号及业务员信息
subInfo:{
CreateBy:'',
OrderId:0
},
userId:0,
//修改订单业务员1-有权限
isEditOrderCreate:0,
PlatformAccountList:[],
PlatformAccountList1:[],
PlatformAccountList2:[],
};
},
methods: {
tradeWayMethods(val) {
this.msg.PlatformAccount=''
if(val==3){
this.PlatformAccountList=this.PlatformAccountList2;
}
if(val==1){
this.PlatformAccountList=this.PlatformAccountList1;
}
},
getJyfs() {
this.apipost('sellorder_get_GetSellTradeWayEnumList', {}, res => {
if (res.data.resultCode == 1) {
this.jyfsList = res.data.data
}
}, err => {})
},
getPlatformAccount() {
let platBranchId=this.getLocalStorage().RB_Branch_id;
this.apipost('FinancialInstitutions_post_GetALLAccountList', {
TypeId: 12,BranchId:platBranchId
}, res => {
if (res.data.resultCode == 1) {
this.PlatformAccountList1 = res.data.data
if (this.msg.TradeWay==3){
this.PlatformAccountList=this.PlatformAccountList2;
}
if(this.msg.TradeWay==1){
this.PlatformAccountList=this.PlatformAccountList1;
}
}
}, 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)
})
if (this.msg.TradeWay==3){
this.PlatformAccountList=this.PlatformAccountList2;
}
if(this.msg.TradeWay==1){
this.PlatformAccountList=this.PlatformAccountList1;
}
}
}, err => {})
},
goUrlHappy(item){
this.happy=false;
this.$router.push({
name: "HappyPassbook",
query: {
CustomerId: item.customerId,
blank: "y",
}
});
},
getRedBag(item){
let msg={
CustomerId:item.customerId,
pageIndex: 1,
pageSize: 4,
};
if(item.customerId){
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => {
if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData;
} else {
}
}, err => {
})
}else{
this.redBagList =[];
}
},
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
goUrlSFD: function (path, name, item) {
let obj = JSON.parse(JSON.stringify(item))
obj.oP_Remarks = ''
obj.remarksList = []
obj.refundFinanceList = []
obj.remarks = []
obj.ltName = []
obj.lineName = []
obj.financeList = []
obj.guestList = []
obj.description = []
this.$router.push({
name: path,
query: { blank: 'y', tab: name, item: JSON.stringify(obj)}
});
},
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.CStartDate > this.msg.CEndDate && this.msg.CEndDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.CEndDate = "";
}
},
dataDuiQ() {
if (this.msg.QStartDate > this.msg.QEndDate && this.msg.QEndDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.QEndDate = "";
}
},
// 跳转调查列表
goInvetig: function (path, tcid, orderId) {
this.$router.push({
name: path,
query: {
OrderId: orderId,
TCID: tcid,
blank: "y",
}
});
},
goUrl(name, path, id, tcmun) {
this.$router.push({
name: path,
query: {
id: id,
tcmun: tcmun,
blank: 'y',
tab: name
}
});
},
// 获取统计数据
getCount: function () {
this.apipost("sellorder_post_GetOrderListStatistics", this.msg, res => {
if (res.data.resultCode == 1) {
this.countData = res.data.data;
} else {
this.$message.error("数据获取失败！");
}
}, err => {})
},
goUrlX(name, path, id, tcmun) {
this.$router.push({
name: path,
query: {
id: id,
tcmun: tcmun,
blank: 'y',
tab: name
}
});
},
linkageEmployeeMsg(node, instanceId) {
this.employeeMsg.departmentId = node.DepartmentId;
this.msg.CreateBy = "-1";
this.getEmployee();
},
getDdztList() {
this.apipost(
"sellorder_post_GetSellOrderStatusEnumList", {},
res => {
if (res.data.resultCode == 1) {
this.ddztList = res.data.data;
}
},
err => {}
);
},
getEmployee() {
this.apipost(
"app_get_company_employee",
this.employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
},
err => {}
);
},
// getLineList() {
// this.apipost("line_post_GetAllList", {}, res => {
// if (res.data.resultCode == 1) {
// this.LineList = res.data.data;
// } else {
// this.$message.error(res.data.message);
// }
// });
// },
//获取公司
getCompany() {
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
} else {}
}, err => {})
},
linkageDepartment() { //联动部门
this.msg.RB_Department_Id = null;
if(this.msg.BranchId!=0){
this.getDepartmentMsg.RB_Branch_Id = this.msg.BranchId;
}
// this.getDepartment();
},
// getDepartment() {
// this.apipost(
// "admin_Get_GetDepartmentTreeForReceiveQuery",
// this.getDepartmentMsg,
// res => {
// if (res.data.resultCode == 1) {
// this.departmentList = res.data.data;
// } else {
// this.Error(res.data.message);
// }
// },
// err => {}
// );
// },
getList() {
this.loading = true;
this.apipost(
"sellorder_post_GetOrderList",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.loading = false;
this.total = res.data.data.count;
this.list = res.data.data.pageData;
} else {
this.loading = false;
this.$message.error(res.data.message);
}
},
err => {}
);
this.getCount();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
// 获取参团类型
getCtlxList() {
this.apipost('sellorder_get_GetOrderJoinEnumList', {}, res => {
if (res.data.resultCode == 1) {
this.ctlxList = res.data.data
}
}, err => {})
},
//点击修改业务员
getSalerInfo(item){
this.subInfo.CreateBy = item.createBy;
this.subInfo.OrderId = item.orderId;
this.showChangeSales = true;
},
//关闭修改业务员
closeSalseDiv(){
this.showChangeSales=false;
},
goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({
name: 'invoicesManagerDetail',
query: { id: id,noDetail: 1,blank: "y",}
});
},
// 获取修改业务员权限
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
}
}, err => {})
},
},
created(){
this.getJyfs();
this.getPlatformAccount();
this.getPlatformAccountNew();
},
mounted() {
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
this.GetEditOrderCreateByAuth();
this.getCompanyMsg.RB_Group_Id = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.getCompany();
this.getCtlxList()
this.getEmployee();
// this.getLineList();
// this.getDepartment();
this.getDdztList();
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
}
if (this.$route.query.isOwn) {
this.isOwn = true;
this.msg.SellFormEmp = 1;
}
this.msg.CreateBy = this.$route.query.EmployeeId === undefined ? "-1" : this.$route.query.EmployeeId;
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
if (this.$route.query.orderId) {
this.msg.tempOrderId = this.$route.query.orderId;
this.msg.QStartDate = "";
this.msg.QEndDate = "";
}
this.msg.TradeWay = this.$route.query.TradeWay?this.$route.query.TradeWay:'';
this.msg.PlatformAccount = this.$route.query.PlatformAccount?Number(this.$route.query.PlatformAccount):'';
this.getList();
}
};
</script>
<style>
/* .personNolayer table td{
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
*/
.personNolayer p {
height: 28px;
line-height: 28px;
padding-left: 15px;
}
.personNolayer p>span {
font-size: 12px;
color: #333;
margin-right: 15px;
}
.personNolayer table {
padding: 10px 0 0 20px;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.personNolayer table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.personNolayer table ._color_666 {
color: #666666;
}
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
.personNolayer table th{
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.personNolayer table ._color_666 {
color: #666666;
}
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
.groupts .underline{
text-decoration: underline;
margin: 5px;
text-align: center;
}
.color_red_order{
color: #e95252 !important;
}
.enrollTotalSearch {
width: 100%;
min-height: auto;
padding: 0 0 20px 0;
}
.enrollTotalSearch::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
.enrollTotalSearch li {
float: left;
font-size: 12px;
height: 40px;
color: #666;
margin: 20px 10px 10px 0;
}
.enrollTotalSearch li>span {
display: inline-block;
}
.enrollTotalSearch li span>em {
display: inline-block;
min-width: 60px;
text-align: right;
font-style: normal;
margin: 0 12px 0 0;
}
.enrollTotalSearch li:last-child {
float: right;
position: fixed;
top: 36px;
right: 20px;
text-align: right;
z-index: 50;
}
.enrollTotalSearchTable {
width: 100%;
font-size: 14px;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
border-collapse: collapse;
}
.enrollTotalSearchTable tr {
/* border-bottom: 2px solid #333; */
}
.enrollTotalSearchTable tr th {
background: #bdbdbd;
height: 30px;
font-size: 12px;
text-align: center;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.enrollTotalSearchTable tr {
background: #fff;
text-align: left;
}
.enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
.enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333;
}
.enrollTotalSearchTable tr td {
height: 80px;
padding: 10px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.enrollTotalSearchTable tr td>img {
width: 32px;
height: 32px;
border-radius: 16px;
vertical-align: middle;
margin-right: 5px;
}
.enrollTotalSearchTable tr td p {
line-height: 20px;
}
.groupTourOrder_count_green {
color: #1BC594;
}
.groupTourOrder_count_blue {
color: #4D7AFD;
}
.groupTourOrder_count_yellow {
color: #FF9C00;
}
.groupTourOrder_count_gray {
color: #999999;
}
.groupTourOrder_count {
margin: 0 0 20px 0;
width: 100%;
height: auto;
}
.groupTourOrder_count_col {
height: 80px;
}
.groupTourOrder_count_item {
font-weight: 400;
padding: 10px;
height: 100%;
border: 1px solid #E6E6E6;
background-color: #FFFFFF;
color: #333333;
}
.groupTourOrder_count_item>div>i {
font-size: 12px;
vertical-align: bottom;
}
.groupTourOrder_count_item>div>span:nth-child(2) {
font-size: 14px;
vertical-align: bottom;
}
.groupTourOrder_count_item>div>span:nth-child(3) {
font-weight: bold;
font-size: 16px;
vertical-align: bottom;
}
.groupTourOrder_count_item>p {
font-size: 12px;
line-height: 18px;
}
.groupTourOrder_count_item>p>span {
margin: 0 5px 0 0;
white-space: nowrap;
}
.groupTourOrder_more {
margin: 0 -12px;
}
.groupTourOrder_more>div {
width: 100%;
height: 30px;
line-height: 30px;
text-align: center;
font-size: 12px;
color: #333333;
background-color: #FFFFFF;
cursor: pointer;
}
.groupTourOrder_more>div:hover {
color: #297BEF;
background-color: #DCEBFF;
}
.groupTourOrder_remarks {
font-size: 0px;
}
.groupTourOrder_remarks>div {}
.groupTourOrder_remarks>div>div:nth-child(1) {
float: left;
display: flex;
align-items: flex-start;
}
.groupTourOrder_remarks>div>div:nth-child(1)>span {
line-height: 20px;
font-size: 12px;
color: #e95252;
white-space: nowrap;
}
.groupTourOrder_remarks>div>div:nth-child(1)>p {
line-height: 20px;
font-size: 12px;
color: #e95252;
}
.groupTourOrder_remarks>div>div:nth-child(2) {
float: right;
text-align: right;
font-size: 12px;
color: #e95252;
}
.groupTourOrder_remarks>div>div:nth-child(2)>i {
font-size: 10px;
cursor: pointer;
}
.groupTourOrder_remarks>div::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
.groupTourOrder_remarks_btn {
padding: 0px;
width: 12px;
height: 12px;
border: none;
background-color: transparent;
}
.groupTourOrder_remarks_btn>i {
color: #e95252;
font-size: 12px;
}
.groupTourOrder_remarks_popover>div {
display: inline-block;
font-size: 14px;
color: #000000;
}
.groupTourOrder_remarks_popover>div::before {
content: '';
display: inline-block;
margin: 0 5px 0 0;
width: 2px;
height: 12px;
background-color: #e95252;
}
.groupTourOrder_remarks_popover>span {
display: block;
margin: 0 0 0 0;
width: 100%;
text-align: center;
font-size: 12px;
color: #000000;
}
.groupTourOrder_remarks_popover>p {
margin: 5px 0 0 0;
padding: 3px;
width: 100%;
max-height: 300px;
overflow-y: auto;
font-size: 12px;
color: #000000;
}
.groupTourOrder_remarks_popover>p:nth-child(even) {
background-color: #E6E6E6;
}
.groupTourOrder_remarks_popover>p>span:nth-child(1) {
float: left;
}
.groupTourOrder_remarks_popover>p>span:nth-child(2) {
margin: 0 10px 0 0;
float: right;
}
.groupTourOrder_remarks_popover>p::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
/* .groupTourOrder_tickets>div>span{
margin: 0 5px 0 0;
cursor: pointer;
} */
.groupTourOrder_tickets>div>div>span {
display: inline-block;
margin: 0 10px 0 0;
}
.groupTourOrder_tickets_red {
color: #FF0000;
text-decoration: underline;
}
.groupTourOrder_tickets_blue {
color: #0000FF;
text-decoration: underline;
}
.groupTourOrder_tickets_green {
color: #008000;
text-decoration: underline;
}
.groupTourOrder_tickets_black {
color: #000000;
text-decoration: underline;
}
.groupTourOrderByTuan_ico {
margin: 0 10px 0 0;
}
.groupTourOrderByTuan_ico>i {
display: inline-block;
margin: 0 2px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
.groupTourOrderByTuan_ico>span {
vertical-align: middle;
}
.groupTourOrder_tickets>div>div {
display: table-cell;
cursor: pointer;
}
.groupTourOrder_tickets>div>div:nth-child(1) {
width: 80px;
}
.groupTourOrder_tickets>div>div>span {
display: inline-block;
margin: 0 10px 0 0;
}
</style>
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/administrative/Diplomaticplat.vue
View file @ b66032e8
<style>
.w590{width:590px!important;}
.Diplomaticplat ._addUpload_box{
display: block;
margin-top:10px;
width:590px;
}
.Diplomaticplat ._addUpload_box>div{
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210,210,210,1);
border-radius: 2px;
cursor: pointer;
padding: 5px;
margin:0 10px 10px 0;
position: relative;
}
.Diplomaticplat .el-upload-dragger {
width: 126px!important;
height: 80px!important;
}
.Diplomaticplat ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.Diplomaticplat ._addUpload_box .icon-guanbi1:hover {
font-size: 12px;
color: #c94052;
}
.Diplomaticplat ._addUpload_box img{
width:100%;
}
.DelDialog .el-form-item__label{
line-height: 43px;
}
.DelDialog .el-form-item{
margin-bottom:5px;
}
</style>
<template>
<div class="Diplomaticplat">
......@@ -38,14 +89,13 @@
value="查询"
@click="getList()"
>
</li>
<!-- <input
<input
type="button"
class="hollowFixedBtn"
value="新增"
@click="addRule"
>
-->
</li>
</ul>
</div>
......@@ -57,10 +107,11 @@
<th>是否有合同</th>
<th>合同说明</th>
<th>所属公司</th>
<th>备注</th>
<th>图片</th>
<th width="500">备注</th>
<!-- <th>图片</th> -->
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.Name}}</td>
......@@ -74,17 +125,17 @@
<td>{{item.BranchName}}</td>
<td>{{item.Remark}}</td>
<td>
<!-- <td>
<span v-for="(img,index2) in item.ImageList" :key="index2">
<img :src="img">
</span>
</td>
</td> -->
<td>{{item.CreateBy}}</td>
<td>{{item.CreateDate}}</td>
<!-- <td>
<td>
<el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
</td> -->
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="9" align="center">暂无数据</td>
......@@ -93,6 +144,117 @@
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="obj.pageSize" :total='total'>
</el-pagination>
<el-dialog
custom-class="w800 DelDialog"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<table class="layerTable" style="width:100%">
<tr>
<td>
<el-form-item :label="$t('system.table_company')" prop="BranchId">
<el-select
filterable
class="w217"
v-model="addMsg.BranchId"
:placeholder="$t('system.ph_choice')"
>
<el-option :label="$t('system.ph_buxian')" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item label="平台名称" prop="Name">
<el-input class="w217" type="text" v-model="addMsg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="联系人" prop="Contact">
<el-input class="w217" type="text" v-model="addMsg.Contact" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
<td>
<el-form-item label="联系电话" prop="ContactMobile">
<el-input class="w217" type="text" v-model="addMsg.ContactMobile" @keyup.native="checkInteger(addMsg,'ContactMobile')" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="是否有合同">
<el-select class="w217" v-model="addMsg.HaveContract">
<el-option label="是" :value="1" :key="1"></el-option>
<el-option label="否" :value="2" :key="2"></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item label="合同说明" prop="ContraceDateRange">
<el-input class="w217" type="text" v-model="addMsg.ContraceDateRange" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item :label="$t('hotel.hotel_remark')">
<el-input v-model="addMsg.Remark" type="textarea" class="w590" :placeholder="$t('pub.pleaseImport')"/>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="合同图片">
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in addMsg.ImageList">
<div>
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file" @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>
</td>
</tr>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="InitMsgList()">{{$t('pub.cancelBtn')}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
<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;z-index:9999">
<el-carousel :initial-index=initialIndex height="600px" :interval="5000" trigger="click">
<el-carousel-item style="height: 600px;overflow:auto;" v-for="(item,index) in picObj" :key="index">
<img :src="item" style=""/>
</el-carousel-item>
</el-carousel>
</div>
</div>
</div>
</template>
......@@ -107,6 +269,25 @@ export default {
},
data () {
let validateCompany = (rule, value, callback) => {
if (this.addMsg.BranchId == -1) {
return callback(new Error('请选择公司'));
} else {
callback();
}
}
let validatePhone = (rule, value, callback) => {
var pattern = /(^1[3|4|5|6|7|8|9]\d{9}$)|(^09\d{8}$)/;
if (this.addMsg.ContactMobile =='') {
return callback(new Error('请填写手机号码'));
}
else if(!pattern.test(this.addMsg.ContactMobile)){
return callback(new Error('请输入正确的号码'));
}
else {
callback();
}
}
return {
companyList:[],
loading:false,
......@@ -119,10 +300,34 @@ export default {
Name:'',
Contact:'',
ContactMobile:'',
},
addMsg:{
ID:0,
BranchId:-1,
Name:'',
Contact:'',
ContactMobile:'',
HaveContract:1, //是否有合同
ContraceDateRange:'',
ImageList:[],
Remark:''
},
companyListObj:{},
dialogTitle:'',
outerVisible:false,
CompanyList: [],
//上传数组
saveMsg:[],
picIsShow:false,
picObj:[],
imgList:[],
initialIndex: 0,
rules: {
BranchId: [{ required: true, validator: validateCompany, trigger: "change" }],
Name: [{ required: true, message: '请输入平台名称', trigger: "blur" }],
Contact: [{ required: true, message: '请输入联系人', trigger: "blur" }],
ContactMobile: [{ required: true, validator:validatePhone, trigger: "blur" }],
},
}
},
mounted() {
......@@ -141,12 +346,12 @@ export default {
this.obj,
res => {
this.loading=false;
console.log("sadfsf",res);
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
err => {}
......@@ -168,6 +373,144 @@ export default {
err => {}
);
},
//新增
addRule(){
this.outerVisible=true;
this.dialogTitle='新增平台';
this.addMsg.ID=0;
this.getCompany();
},
getCompany() {
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {
}
},
err => {}
);
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.InitMsgList();
},
// showUpLoadFile(i){ // 预览上传文件
// if(i.Type==3){
// this.picObj.push(i.Url);
// this.imgList.push(i.Url);
// this.picIsShow= true;
// }
// },
deleteUploadFile(i){ // 删除上传文件
this.saveMsg.splice(i,1);
this.addMsg.ImageList.splice(i,1);
},
uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.Error('文件大小不能超过10M！')
return
}
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3}
]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
fileTypeNumber=x.type
typeOk = true;
}
})
if (!typeOk) return this.Error('请上传图片！');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
// Content: x.data.FilePath,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.addMsg.ImageList.push(this.domainManager().ViittoFileUrl + x.data.FilePath);
this.Success('上传成功');
});
},
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addPlatform();
} else {
return false;
}
});
},
//点击新增平台
addPlatform(){
this.apipost("Financial_get_SetDiplomacyPlatformInfo",this.addMsg,res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.outerVisible=false;
this.InitMsgList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//初始化
InitMsgList(){
this.outerVisible=false;
this.addMsg.BranchId=-1;
this.addMsg.Name='';
this.addMsg.Contact='';
this.addMsg.ContactMobile='';
this.addMsg.HaveContract=1;
this.addMsg.ContraceDateRange='';
this.addMsg.ImageList=[];
this.addMsg.Remark='';
},
//修改
SetRules(item){
this.dialogTitle='修改平台';
this.outerVisible=true;
this.addMsg=Object.assign({},item);
delete this.addMsg.CreateBy;
},
//删除
Delete(item){
this.$confirm('是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
var msg = {
PlatformId: item.ID
}
this.apipost('Financial_get_DelDiplomacyPlatformInfo',msg,res=>{
if(res.data.resultCode==1){
this.Success(res.data.message)
this.getList()
}else{
this.Error(res.data.message)
}
},err=>{})
}).catch(() => {
});
}
},
}
......
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