Skip to content

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

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

parents f8d1e97a 36fa7efc
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 120 deletions
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ e9a39e36
......@@ -109,15 +109,18 @@
<p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p>
<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==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>
<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==1">{{$t('fnc.gongzhang')}}</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==3">{{$t('fnc.wbxianjin')}}</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==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>
<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>
<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==1">{{$t('fnc.gongzhang')}}</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==3">{{$t('fnc.wbxianjin')}}</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==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 style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p>
</div>
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ e9a39e36
......@@ -528,7 +528,7 @@ tr._item_list td:last-child {
<el-option value="9" 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="13" label="机票折让"></el-option>
<el-option value="13" label="机票折让收入"></el-option>
</el-select>
</el-form-item>
</el-col>
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ e9a39e36
......@@ -193,9 +193,13 @@
</el-radio-group>
</div> -->
<div class="rb_top_row _r_mb5">
<div class="rb_top_row _r_mb5 ceshi">
<p >{{$t('fnc.fkduixiang')}}：
<el-select filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1">
<el-select v-if='msg.TemplateId===90||msg.TemplateId===91' filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1">
<el-option label="虚拟账户" :value='10' :key='10' v-if='msg.TemplateId===90||msg.TemplateId===91'></el-option>
</el-select>
<el-select v-else filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1">
<el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.sizhang')" :value='0' :key='0' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
......@@ -205,8 +209,7 @@
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option>
<el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67||msg.TemplateId===74'></el-option>
<el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67||msg.TemplateId===74'></el-option>
</el-select>
<el-select v-if="!showDisable" filterable v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
<el-option v-for='item in ClientTypeList'
......@@ -1537,6 +1540,9 @@ export default {
this.Financial_post_Get(this.$route.query.FrID,0);
}else{
this.msg.TemplateId = this.$route.query.id;
if(this.$route.query.id==90 || this.$route.query.id==91){
this.msg.IsPublic=10;
}
this.Financial_post_GetCostTypeList(this.$route.query.id);
this.BillName = userInfo.GroupName;
this.BillSonName = this.$route.query.Name;
......@@ -1546,6 +1552,7 @@ export default {
if(this.$route.query.Conditon){
this.returnCode = this.$route.query.Conditon;
}
// this.admin_get_DepartmentGetList();
},components: {
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ e9a39e36
......@@ -314,7 +314,12 @@
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="6">
{{GetCurrency(subItem.CurrencyId)}}
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{GetCurrency(subItem.CurrencyId)}}
</template>
</td>
<td v-if="childIndex==0" :rowspan="6">
<span v-if="subItem.DMCPayType === 1">现付</span>
......@@ -358,7 +363,14 @@
<td>总金额</td>
<td colspan="24">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
</span>
</td>
</tr>
......@@ -433,7 +445,12 @@
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{GetCurrency(subItem.CurrencyId)}}
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{GetCurrency(subItem.CurrencyId)}}
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.Remarks}}
......@@ -445,7 +462,14 @@
<td>总金额</td>
<td colspan="12">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
</span>
</td>
</tr>
......@@ -520,7 +544,14 @@
<td>总金额</td>
<td colspan="11">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
</span>
</td>
</tr>
......@@ -571,7 +602,14 @@
<td>{{item.TCNUMS}}</td>
<td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额：
<span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{moneyFormat(cur.money)}}
<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
<span v-if="cur.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{currencyTypeObj[cur.CurrencyId]}}
</template>
) </span>
</br></span>
</td>
<td style="padding: 5px 20px;">
......@@ -581,7 +619,14 @@
已领款：
<span style="color: red;">
{{moneyFormat(leadr.LeaderGetPrice)}}
<span v-if="cur.CurrencyId > 0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span>
<span v-if="cur.CurrencyId > 0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{currencyTypeObj[leadr.CurrencyId]}}
</template>
) </span>
</span>
</p>
<el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
......@@ -744,6 +789,8 @@
},
CurrencyListMoney: [],
currencyTypeObj: [],
//判断是否显示人民币
IsShowRMB:false,
}
},
components: {
......@@ -1238,6 +1285,9 @@
this.isUpdate = this.$route.query.isUpdate;
this.msg.TCIDs = this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
if(this.$route.query.OutBranchId==1216){
this.IsShowRMB=true;
}
this.getList();
this.getTotalNav();
this.getHangingAccountByTCIDList()
......
src/components/PersonalInfoSet.vue
View file @ e9a39e36
......@@ -7,8 +7,9 @@
}
.PerSon_LeftNav{
width:418px;
height:91%;
position: fixed;
height:96%;
position: absolute;
overflow-y: auto;
background-color: #fff;
display: inline-block;
}
......@@ -16,6 +17,7 @@
margin-left:440px;
width:100%;
height:100%;
overflow-y: auto;
background-color: #fff;
}
.PerSon_Edit{
......@@ -34,7 +36,7 @@
.Person_Header{
width:120px;
height:120px;
margin:39px auto;
margin:30px auto;
border:1px solid #F4F4F4;
padding:3px;
border-radius: 50%;
......@@ -51,7 +53,7 @@
text-align: center;
}
.Person_MenuList{
margin-top:60px;
margin-top:45px;
}
.Person_MenuList li{
list-style-type: none;
......@@ -838,7 +840,7 @@
</div>
</el-radio>
</div>
<button class="normalBtn" style="margin:30px 0 0 20px;" @click="SureType">确定</button>
<button class="normalBtn" style="margin:30px 0 20px 20px;" @click="SureType">确定</button>
</div>
</div>
......@@ -851,7 +853,7 @@
<button type="button" id="button" style="bottom:-50px;" @click="crop">确定</button>
</div>
</div>
<div style="padding:20px;">
<div style="padding:20px;display:none;">
<div class="show">
<div class="picture" :style="'backgroundImage:url('+headerImage+')'">
</div>
......
src/components/Ticketing/TicketManager.vue
View file @ e9a39e36
......@@ -2275,102 +2275,37 @@
<!-- 机票服务费 -->
<el-dialog width="1000px" title="保存" :visible.sync="moneyR" center>
<el-form :rules="TicketServerules" class="Rform" ref="form" :model="Ticketform" label-width="110px">
<el-row v-if="MsgRAirServiceList.length>0">
<el-col :span="1" style="padding-top:12px">团号</el-col>
<el-col :span="23">
<el-row v-if="!item.disabled" v-for="(item,index) in MsgRAirServiceList" :key="index">
<el-col :span="6" style="padding-top:12px">
<input type="checkbox" :value="item.TCID" v-model="customerList"/>{{item.TCNUM}}({{item.TCID}})
</el-col>
<el-col :span="6">
<el-form-item label="机位" label-width="70px">
<el-input v-model="item.TicketNum" @keyup.native="checkInteger(item,'TicketNum')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="服务费" label-width="70px">
<el-input v-model="item.Money" @keyup.native="checkPrice(item,'Money')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" label-width="70px">
<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-form :rules="TicketServerules" class="Rform" ref="form" :model="Ticketform" label-width="67px">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;margin-bottom:15px" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>团号</th>
<th>机位数</th>
<th>服务费</th>
<th>备注</th>
</tr>
<tr v-for="(item,index) in MsgRAirServiceList" :key="index">
<td><input style="position: relative;top: 2px;" type="checkbox" :value="item.TCID" v-model="customerList"/>{{item.TCNUM}}({{item.TCID}})</td>
<td><el-input size="small" style="width:150px" v-model="item.TicketNum" @keyup.native="checkInteger(item,'TicketNum')"></el-input></td>
<td><el-input size="mini" style="width:150px" v-model="item.Money" @keyup.native="checkPrice(item,'Money')"></el-input></td>
<td><el-input style="width:150px" v-model="item.Remark"></el-input></td>
</tr>
<tr v-if="MsgRAirServiceList.length==0">
<td colspan="5">暂无数据</td>
</tr>
</table>
<el-row style="margin-bottom:15px">
<el-col :span="8">
<el-form-item label="付款类型">
<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-input style="width:200px" v-model="fklxStr" :disabled="true"></el-input>
</el-col>
<el-col :span="8">
<el-form-item label="客户类型">
<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-input style="width:200px" v-model="jsbmStr" :disabled="true"></el-input>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="上传附件">
<el-form-item label="上传附件" >
<div class="picload">
<el-upload style="width: 138px;height: 92px;"
drag
......@@ -2425,6 +2360,8 @@
}
}
return {
fklxStr:'虚拟结算',
jsbmStr:'总部票务部',
currencyTypeList:[],
MsgRAirServiceList:[],
isCkedAll:false,
......@@ -2783,10 +2720,10 @@
}
this.Ticketform.vorcherInos = this.saveMsg;
if(this.Ticketform.PayDate==""){
this.Error("请选择时间！");
return;
}
// if(this.Ticketform.PayDate==""){
// this.Error("请选择时间！");
// return;
// }
this.Btnloading=true;
this.apipost('Financial_post_SetAirTicketServiceBetchImport',this.Ticketform,res=>{
this.Btnloading=false;
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ e9a39e36
......@@ -315,7 +315,7 @@
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,outItem,'用款计划')">
<div class="fz16 fbold linkspan" @click="goUrlYongKuan('leaderReimbursement',item,outItem,'用款计划')">
<span style="color: #4BCA81;" v-if="item.UseMoney==1">√</span>
<span class="colorE95252" v-else>{{item.UseMoney=='-1'?"x":"O"}}</span>
</div>
......@@ -911,6 +911,20 @@
}
})
},
//跳转用款计划
goUrlYongKuan(path, obj, outItem, title){
this.$router.push({
name: path,
query: {
"id": outItem.TCIDS,
NewCombinationNum: outItem.NewCombinationNum,
isUpdate: true,
OutBranchId:obj.OutBranchId,
blank: 'y',
tab: title
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......
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