Skip to content

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

添加虚拟结算，修改机票票务管理

parent e9dc8d15
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 102 deletions
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ be0681fc
...@@ -109,15 +109,18 @@ ...@@ -109,15 +109,18 @@
<p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p> <p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p>
<div class="rb_top_row _r_mb5"> <div class="rb_top_row _r_mb5">
<p v-if="GetDetail.Type==1 || GetDetail.Type==5">{{$t('fnc.hnrdanwei')}}：<span class="_r_name">{{GetDetail.RemitterName}}</span></p> <p v-if="GetDetail.Type==1 || GetDetail.Type==5">{{$t('fnc.hnrdanwei')}}：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
<p v-if="GetDetail.Type==2 || GetDetail.Type==6">{{$t('fnc.fkduixiang')}}：<span class="_r_name" style="margin-right:8px">{{GetDetail.ClientTypeName}}</span><span class="_r_name">{{GetDetail.AccountHolder}}</span> <p v-if="GetDetail.Type==2 || GetDetail.Type==6">{{$t('fnc.fkduixiang')}}：
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==0">{{$t('fnc.sizhang')}}</span> <span class="_r_name" style="margin-right:8px">{{GetDetail.ClientTypeName}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==1">{{$t('fnc.gongzhang')}}</span> <span class="_r_name">{{GetDetail.AccountHolder}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==2">{{$t('fnc.rmbxianjin')}}</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==0">{{$t('fnc.sizhang')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==3">{{$t('fnc.wbxianjin')}}</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==1">{{$t('fnc.gongzhang')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==4">{{$t('fnc.zjinchi')}}</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==2">{{$t('fnc.rmbxianjin')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==5">{{$t('fnc.ptxnzhanghu')}}</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==3">{{$t('fnc.wbxianjin')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==6">{{$t('fnc.djxnzhanghu')}}</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==4">{{$t('fnc.zjinchi')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==7">收支相抵</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==5">{{$t('fnc.ptxnzhanghu')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==6">{{$t('fnc.djxnzhanghu')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==7">收支相抵</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==10">虚拟结算</span>
</p> </p>
<p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p> <p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p>
</div> </div>
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ be0681fc
...@@ -528,7 +528,7 @@ tr._item_list td:last-child { ...@@ -528,7 +528,7 @@ tr._item_list td:last-child {
<el-option value="9" v-if="isShowType" label="酒店住宿"></el-option> <el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
<el-option value="10" v-if="isShowType" label="景点门票"></el-option> <el-option value="10" v-if="isShowType" label="景点门票"></el-option>
<el-option value="11" v-if="isShowType" label="餐厅美食"></el-option> <el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
<el-option value="13" label="机票折让"></el-option> <el-option value="13" label="机票折让收入"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
src/components/Ticketing/TicketManager.vue
View file @ be0681fc
...@@ -2275,102 +2275,37 @@ ...@@ -2275,102 +2275,37 @@
<!-- 机票服务费 --> <!-- 机票服务费 -->
<el-dialog width="1000px" title="保存" :visible.sync="moneyR" center> <el-dialog width="1000px" title="保存" :visible.sync="moneyR" center>
<el-form :rules="TicketServerules" class="Rform" ref="form" :model="Ticketform" label-width="110px"> <el-form :rules="TicketServerules" class="Rform" ref="form" :model="Ticketform" label-width="67px">
<el-row v-if="MsgRAirServiceList.length>0"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;margin-bottom:15px" cellspacing="0" cellpadding="0" v-loading="loading">
<el-col :span="1" style="padding-top:12px">团号</el-col> <tr>
<el-col :span="23"> <th>团号</th>
<el-row v-if="!item.disabled" v-for="(item,index) in MsgRAirServiceList" :key="index"> <th>机位数</th>
<el-col :span="6" style="padding-top:12px"> <th>服务费</th>
<input type="checkbox" :value="item.TCID" v-model="customerList"/>{{item.TCNUM}}({{item.TCID}}) <th>备注</th>
</el-col>
<el-col :span="6"> </tr>
<el-form-item label="机位" label-width="70px"> <tr v-for="(item,index) in MsgRAirServiceList" :key="index">
<el-input v-model="item.TicketNum" @keyup.native="checkInteger(item,'TicketNum')"></el-input> <td><input style="position: relative;top: 2px;" type="checkbox" :value="item.TCID" v-model="customerList"/>{{item.TCNUM}}({{item.TCID}})</td>
</el-form-item> <td><el-input size="small" style="width:150px" v-model="item.TicketNum" @keyup.native="checkInteger(item,'TicketNum')"></el-input></td>
</el-col> <td><el-input size="mini" style="width:150px" v-model="item.Money" @keyup.native="checkPrice(item,'Money')"></el-input></td>
<el-col :span="6"> <td><el-input style="width:150px" v-model="item.Remark"></el-input></td>
<el-form-item label="服务费" label-width="70px"> </tr>
<el-input v-model="item.Money" @keyup.native="checkPrice(item,'Money')"></el-input> <tr v-if="MsgRAirServiceList.length==0">
</el-form-item> <td colspan="5">暂无数据</td>
</el-col> </tr>
<el-col :span="6"> </table>
<el-form-item label="备注" label-width="70px"> <el-row style="margin-bottom:15px">
<el-input v-model="item.Remark"></el-input>
</el-form-item>
</el-col>
</el-row>
<div>
</div>
</el-col>
</el-row>
<el-row style="margin-bottom: 15px;text-align:center" v-if="MsgRAirServiceList.length==0">暂无</el-row>
<div style="border-bottom:1px solid #eeeeee;margin-bottom: 15px;"></div>
<el-row>
<el-col :span="8">
<el-form-item label="预计付款日期">
<el-date-picker
v-model="Ticketform.PayDate"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="币种">
<el-select filterable v-model='Ticketform.CurrencyId'>
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="付款类型"> 付款类型 ：<el-input style="width:200px" v-model="fklxStr" :disabled="true"></el-input>
<el-select filterable prop="IsPublic" v-model='Ticketform.IsPublic' >
<el-option :label="$t('fnc.gongzhang')" :value='1' :key='1'></el-option>
<el-option :label="$t('fnc.sizhang')" :value='0' :key='0'></el-option>
<el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2'></el-option>
<el-option :label="$t('fnc.wbxianjin')" :value='3' :key='3'></el-option>
<el-option :label="$t('fnc.zjinchi')" :value='4' :key='4'></el-option>
<el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5'></el-option>
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7'></el-option>
<el-option label="原路退款" :value='8' :key='8'></el-option>
<el-option label="地接预支款" :value='9' :key='9'></el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="客户类型"> 结算部门 ：<el-input style="width:200px" v-model="jsbmStr" :disabled="true"></el-input>
<el-select v-if="!showDisable" filterable v-model='Ticketform.ClientType' @change="financeinfo_post_GetClientAccountList(Ticketform.ClientType)">
<el-option v-for='item in ClientTypeList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称">
<el-select filterable v-model='Ticketform.ClientID'>
<el-option v-for='item in ClientAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="上传附件"> <el-form-item label="上传附件" >
<div class="picload"> <div class="picload">
<el-upload style="width: 138px;height: 92px;" <el-upload style="width: 138px;height: 92px;"
drag drag
...@@ -2425,6 +2360,8 @@ ...@@ -2425,6 +2360,8 @@
} }
} }
return { return {
fklxStr:'虚拟结算',
jsbmStr:'总部票务部',
currencyTypeList:[], currencyTypeList:[],
MsgRAirServiceList:[], MsgRAirServiceList:[],
isCkedAll:false, isCkedAll:false,
...@@ -2783,10 +2720,10 @@ ...@@ -2783,10 +2720,10 @@
} }
this.Ticketform.vorcherInos = this.saveMsg; this.Ticketform.vorcherInos = this.saveMsg;
if(this.Ticketform.PayDate==""){ // if(this.Ticketform.PayDate==""){
this.Error("请选择时间！"); // this.Error("请选择时间！");
return; // return;
} // }
this.Btnloading=true; this.Btnloading=true;
this.apipost('Financial_post_SetAirTicketServiceBetchImport',this.Ticketform,res=>{ this.apipost('Financial_post_SetAirTicketServiceBetchImport',this.Ticketform,res=>{
this.Btnloading=false; this.Btnloading=false;
......
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