Skip to content

S
SuperMan
Commit 9016e06f authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 0277f4a4 23a64bc9
Hide whitespace changes
Inline Side-by-side
Showing with 316 additions and 90 deletions
src/components/FinancialModule/FProcessManagement.vue
View file @ 9016e06f
......@@ -101,13 +101,34 @@
<!-- <li>
<span>注：财务基本流程包括（收款流程，付款流程，发票流程），如果需要其他的流程，比如退款流程等请在自定义流程下新增流程设置</span>
</li> -->
<li><input type="button" class="normalBtn" value="新增流程" @click="goUrl('addFinancialProcess',0,8)"/></li>
<li><input type="button" class="normalBtn" value="新增流程" @click="goUrl('addFinancialProcess',0,8)"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex();getTemplateList();"/>
</li>
</ul>
</div>
<ul class="_nav clearfix">
<li class="_active" @click="getTemplateList()">流程列表</li>
<!-- <li :class="active==1?'_active':''" @click="active=1,msg.TempLateWay=8,getTemplateList()">自定义流程</li> -->
</ul>
</ul>
<ul>
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item label="流程名称">
<el-input v-model="msg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</ul>
<ul class="_content" v-loading="loading">
<li v-for="(item,index) in CTemplateList" >
<div class="_left">
......@@ -253,6 +274,7 @@ export default {
//TemplateList:[],
CTemplateList:[],
FinanceInfoChangeLog:[],
GetCostTypeList:[],
total:0,
currentPage:1,
noData:true,
......@@ -261,6 +283,8 @@ export default {
pageIndex:1,
pageSize:6,
RB_BranchId:-1,
Name:'',
CostTypeID:0
}
}
},created(){
......@@ -314,6 +338,15 @@ export default {
});
});
},
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
UpdateStatus(id,type){ //启停用
this.apipost('FinancialFlowTemplate_post_UpdateStatus',{ID:id,TemplateType:type,RB_Branch_id:this.msg.RB_BranchId},res=>{
if(res.data.resultCode==1){
......@@ -372,11 +405,16 @@ export default {
}
},err=>{})
},
resetPageIndex() {
this.msg.pageIndex = 1
this.currentPage = 1
},
goUrl(path,id,isZ,Branch_Id) {
this.$router.push({ name: path,query:{"id":id,"isZ":isZ,"blank":'y',tab:"修改流程"} })
},
},mounted(){
this.getTemplateList()
this.getTemplateList();
this.financeinfo_post_GetCostTypeList();
}
}
</script>
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 9016e06f
......@@ -110,6 +110,26 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></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>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -126,10 +146,10 @@
<th rowspan="2"></th>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th>
<th rowspan="2">{{$t('fnc.a_hkrfkduixiang')}}</th>
<th rowspan="2" width="250px">{{$t('fnc.a_zhaiyao')}}</th>
<th rowspan="2" width="250px">{{$t('fnc.a_hkrfkduixiang')}}</th>
<th rowspan="2">{{$t('fnc.a_hkfkshijian')}}</th>
<th rowspan="2">{{$t('fnc.jylshuihao')}}</th>
<th rowspan="2" width="250px">{{$t('fnc.jylshuihao')}}</th>
<th colspan="3">{{$t('fnc.waibi')}}（{{TypeName}}）</th>
<th rowspan="2">{{$t('fnc.a_dhuanlv')}}</th>
<th colspan="3">{{$t('fnc.a_rminbi')}}</th>
......@@ -376,6 +396,8 @@ export default {
eTradeDate:'',
QStartDate:'',
QEndDate:'',
CostTypeID:0,
RB_Branch_Id:-1,
BankList:[],
Is_Cashier:-1,
},
......@@ -395,6 +417,8 @@ export default {
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
GetCostTypeList:[],
CompanyList:[],
RB_Branch_Id:null,
loading:false,
date:'',
......@@ -853,6 +877,22 @@ export default {
}
}, err => {})
},
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
getList(){ //获取列表
this.loading = true;
if( this.msg.ClientID === '' ){
......@@ -931,6 +971,8 @@ export default {
this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType();
this.financeinfo_post_GetClientAccountList();
this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
}
}
</script>
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 9016e06f
......@@ -112,6 +112,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></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>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -340,6 +352,7 @@ export default {
pageSize:5,
ClientID:'',
CostTypeID:0,
RB_Branch_Id:-1,
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
......@@ -359,6 +372,7 @@ export default {
productionDateByTC:[],
ClientAccountList:[],
GetCostTypeList:[],
CompanyList:[],
loading:false,
date:'',
accType:'',
......@@ -868,6 +882,13 @@ export default {
}
},err=>{})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
},mounted(){
let userInfo=this.getLocalStorage();
this.getAccountTypeList();
......@@ -875,6 +896,7 @@ export default {
this.BankAccount_post_GetAccountType();
this.financeinfo_post_GetClientAccountList();
this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 9016e06f
......@@ -101,6 +101,26 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></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>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -319,6 +339,8 @@ export default {
pageIndex:1,
pageSize:5,
ClientID:'',
CostTypeID:0,
RB_Branch_Id:-1,
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
......@@ -339,6 +361,8 @@ export default {
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
GetCostTypeList:[],
CompanyList:[],
loading:false,
RB_Branch_Id:null,
date:'',
......@@ -843,6 +867,22 @@ export default {
// this.listAllMoney = this.listAllMoney + x.allMoney
// })
},
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
},mounted(){
let userInfo=this.getLocalStorage();
this.RB_Branch_Id = userInfo.RB_Branch_id;
......@@ -850,6 +890,8 @@ export default {
this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType();
this.financeinfo_post_GetClientAccountList();
this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
}
}
</script>
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 9016e06f
......@@ -93,6 +93,26 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></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>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -106,7 +126,7 @@
<div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th rowspan="2"></th>
<!-- <th rowspan="2"></th> -->
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th>
......@@ -126,7 +146,7 @@
<th width="">{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="6">{{$t('fnc.a_qcyue')}}：</td>
<td :colspan="5">{{$t('fnc.a_qcyue')}}：</td>
<td></td>
<td></td>
<td> {{ moneyFormat(RStartMoney) }} </td>
......@@ -152,9 +172,9 @@
<span v-if=" item.Type == 1">{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 2">{{$t('fnc.a_fkshijian')}}：{{ item.TradeDate }}</span>
</td>
<td>
<!-- <td>
{{ item.AccountNumber }}
</td>
</td> -->
<td>
{{ item.Type == 1 ? moneyFormat(item.OriginalMoney) : '' }}
</td>
......@@ -178,7 +198,7 @@
</td>
</tr>
<tr>
<td :colspan="6">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td></td>
<td></td>
<td> {{ moneyFormat(endRStartMoney) }} </td>
......@@ -349,6 +369,8 @@ export default {
pageIndex:1,
pageSize:5,
ClientID:'',
CostTypeID:0,
RB_Branch_Id:-1,
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
......@@ -370,6 +392,8 @@ export default {
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
GetCostTypeList:[],
CompanyList:[],
RB_Branch_Id:null,
loading:false,
date:'',
......@@ -860,12 +884,30 @@ export default {
// this.listAllMoney = this.listAllMoney + x.allMoney
// })
},
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
},mounted(){
let userInfo=this.getLocalStorage();
this.getAccountTypeList();
this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType();
this.financeinfo_post_GetClientAccountList();
this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
}
}
</script>
......
src/components/LeaderManagement/leaderArrangement.vue
View file @ 9016e06f
......@@ -132,13 +132,13 @@
}
.leaderArrangement .Assied > div:first-child {
margin-left: 40px;
margin-left: 20px;
text-align: center;
}
.leaderArrangement .AssList {
float: left;
margin-right: 10px;
margin:5px 10px 0 0;
height: 80px;
line-height: 1;
text-align: center;
......@@ -445,7 +445,7 @@
<el-col :span="2">
<div class="forSaling">{{item.TCStateStr}}{{$t('hotel.hotel_Inthe')}}</div>
</el-col>
<el-col :span="3">
<el-col :span="5">
<div class="notAssigned" v-if="item.LeaderId===0&&item.GuideId===0">
{{$t('leader.leader_notAssigned')}}
</div>
......@@ -542,8 +542,12 @@
countryList: "",
pickerOptions1: {
disabledDate: time => {
let endTime = new Date(this.msg.QEndDateStr);
return endTime.getTime() < time.getTime();
if (this.msg.QEndDateStr == null) {
return false;
} else {
let endTime = new Date(this.msg.QEndDateStr)
return endTime.getTime() < time.getTime()
}
}
},
pickerOptions2: {
......@@ -577,7 +581,6 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
console.log(this.dataList,'dataListssssssssss');
} else {
this.Error(res.data.message);
}
......@@ -611,7 +614,6 @@
if (res.data.resultCode == 1) {
this.LeaderList = res.data.data.pageData;
this.noTaskLeaderMsg.PageCount = res.data.data.pageCount;
console.log(this.LeaderList,'leaderlist');
} else {
this.Error(res.data.message);
}
......@@ -806,6 +808,10 @@
mounted() {
this.msg.QTCID = this.$route.query.id;
if(this.msg.QTCID!=undefined){
this.msg.QStartDateStr='';
this.msg.QEndDateStr='';
}
this.getCountryList();
this.GetTeamSaleStateList();
this.getList();
......
src/components/LeaderManagement/leaderPay.vue
View file @ 9016e06f
......@@ -68,7 +68,7 @@
{{item.CostPrice*(Number(item.TransferNum)+1)+item.HighSpeedPrice}}
</td>
<td class="jdtd" valign="middle">
{{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
{{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.PayType ==5 ?'实物抵扣' :'')))):''}}
</td>
<td class="jdtd" valign="middle">
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 9016e06f
......@@ -65,9 +65,11 @@
<span v-if="item.PayType === 1">现付</span>
<span v-else-if="item.PayType === 2">公司结算</span>
<span v-else-if="item.PayType === 3">预付</span>
<span v-else-if="item.PayType ===6">合团公司支付</span>
<span v-else-if="item.PayType === 7">自由活动-无用车</span>
<span v-else-if="item.PayType === 6">合团公司支付</span>
<span v-else-if="item.PayType === 8">酒店接送~免車資</span>
<span v-else></span>
</br>
</br>
<span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td>
<td>
......@@ -77,7 +79,9 @@
<span v-if="item.HighSpeedPayType === 1">现付</span>
<span v-else-if="item.HighSpeedPayType === 2">公司结算</span>
<span v-else-if="item.HighSpeedPayType === 3">预付</span>
<span v-else-if="item.HighSpeedPayType ===6">合团公司支付</span>
<span v-else-if="item.HighSpeedPayType ===6">合团公司支付</span>
<span v-else-if="item.HighSpeedPayType === 7">自由活动-无用车</span>
<span v-else-if="item.HighSpeedPayType === 8">酒店接送~免車資</span>
<span v-else></span>
</br>
<span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
......@@ -187,8 +191,8 @@
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="5">
{{subItem.Remarks}}
......@@ -261,8 +265,8 @@
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
......@@ -337,8 +341,8 @@
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
......@@ -598,14 +602,15 @@
busTotalPrice(obj) {
let totalPrice = 0
obj.forEach(item => {
totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0) + Number(item.StopPrice)
totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(
item.HighSpeedPrice) : 0) + Number(item.StopPrice)
})
return this.moneyFormat(totalPrice)
},
hotelTotalPrice(obj) {
let totalPrice = 0
obj.forEach(x => {
if(x.PayStyle === 1){
if (x.PayStyle === 1) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1 - x.RebateRatio / 100)
} else {
totalPrice += 0
......@@ -618,7 +623,7 @@
obj.forEach(x => {
totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
})
if(sObj.PayStyle !== 1) {
if (sObj.PayStyle !== 1) {
totalPrice = 0
}
return this.moneyFormat(totalPrice)
......@@ -628,7 +633,7 @@
obj.forEach(x => {
totalPrice += x.PeoplePrice * (x.UsePeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
})
if(sObj.PayStyle !== 1) {
if (sObj.PayStyle !== 1) {
totalPrice = 0
}
return this.moneyFormat(totalPrice)
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 9016e06f
......@@ -70,7 +70,7 @@
<td v-if="childIndex==0" :rowspan="3">
<el-select class='w160 sel' v-model='subItem.NewDiningID' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getDingList(item)' @change='sendValue(subItem,item)'>
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.Name' :value='itemHotel.ID'
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
:key='itemHotel.ID'></el-option>
</el-select>
</td>
......@@ -116,12 +116,13 @@
</td>
<td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option>
<el-option label='现付' value='1'></el-option>
<el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='3'></el-option>
<el-option label='预付' value='4'></el-option>
<el-option label='公司合团支付' value='6'></el-option>
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</td>
</tr>
......@@ -138,8 +139,8 @@
</el-select>
</td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" >
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;">
付款团号:
</td>
<td style="text-align:left;">
......@@ -234,7 +235,6 @@
this.list.forEach(item => {
item.DinnerList = [];
item.DiningSummaryList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
x.DiningReserveType = x.DiningReserveType.toString();
this.calculationPrice(x);
item.DinnerList.push({
......@@ -318,6 +318,8 @@
if (subItem.NewDiningID == x.ID) {
subItem.Address = x.Address;
subItem.Tel = x.Tel;
subItem.PayStyle=x.PayStyle;
subItem.PayStyleExt=x.PayStyle;
}
})
},
......
src/components/Restaurant/restaurantInfoManage.vue
View file @ 9016e06f
......@@ -757,7 +757,7 @@
<el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch>
</el-form-item>
<el-form-item label="支付方式">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')" :disabled="IsHaveAuth==1?false:true">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -916,6 +916,8 @@
navbar:false,
title:false
},
//是否有权限操作支付方式
IsHaveAuth: 0,
images: [],
selectAddress: false,
addimg: false,
......@@ -1460,6 +1462,12 @@
},
mounted() {
let userInfo = this.getLocalStorage()
//有权限操作的部门
if (userInfo.RB_Department_Id == 240 || userInfo.RB_Department_Id == 1 || userInfo.RB_Department_Id == 3 ||
userInfo.RB_Branch_id == 49) {
this.IsHaveAuth = 1;
}
this.GetPayList();
this.GetDiningTypeList();
this.GetDiningPriceTypeList();
......
src/components/SalesModule/groupTourOrder.vue
View file @ 9016e06f
......@@ -1709,7 +1709,7 @@
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
@click='getHouse(item)'>修改房型
</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
<!-- <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div> -->
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')"
@click='setChargeLoss(item)'>
<span v-if="item.isChargeLossOrders==1">恢复收损单</span>
......@@ -2699,6 +2699,7 @@
if (res.data.resultCode == 1) {
this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder
console.log('res.data.data', res.data.data)
this.addObj = res.data.data.modelPrice
let x = res.data.data.model;
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 9016e06f
......@@ -1782,7 +1782,7 @@
</p>
<span v-if="item.remarksList.length === 0">暂无数据</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-button v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder" slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;" class="groupTourOrder_remarks_btn"></el-button>
</el-popover>
</div>
</div>
......
src/components/SalesModule/productQuery.vue
View file @ 9016e06f
......@@ -709,7 +709,7 @@
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th>
</tr>
<template v-for="subItem in item.HotelOrderListReports">
<tr v-for="(childItem,childIndex) in subItem.SubList">
......@@ -732,12 +732,6 @@
</template>
】
</a>
<a v-if="(childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0))&& childItem.UseCount>0 " style="color:green">
【使用: {{childItem.UseCount}} 间 {{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}} 】
</a>
</td>
<td>
<template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)"> {{childItem.CreateDateStr}}</template>
</td>
</tr>
</template>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 9016e06f
......@@ -1213,7 +1213,7 @@
}
this.queryCommonData.loading = true;
this.apipost(
'travel_get_GetTravelPrciePageList',
'travel_get_GetTravelPrciePageList_V2',
msg,
res => {
this.queryCommonData.loading = false;
......@@ -1238,7 +1238,6 @@
err => {}
)
},
//验证大小
checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum)
......
src/components/TravelManager/TravelList/TravelpassengerList.vue
View file @ 9016e06f
......@@ -170,7 +170,14 @@ export default {
str = "标准双人间";
} else if (item.HouseType == 3) {
str = "大床房";
} else {
}
else if (item.HouseType == 4) {
str = "三人间";
}
else if (item.HouseType== 5) {
str = "拼凑双人间";
}
else {
str = "未分配";
}
return str;
......
src/components/busManagement/BusInfo.vue
View file @ 9016e06f
......@@ -129,6 +129,7 @@
background: #EAEAEA !important;
text-align: center;
}
.disClick {
background-color: #d1d1d1;
color: #fff;
......@@ -265,20 +266,24 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="付款方式" min-width="150" >
<el-table-column label="付款方式" min-width="150">
<template slot-scope="scope">
<el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')">
<el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')"
@change="PayTypeChange(scope.row)">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
<el-option label='合团公司支付' :value='6'></el-option>
<el-option label='自由活动-无用车' :value='7'></el-option>
<el-option label="酒店接送~免車資" :value='8'></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="合团支付团号" min-width="150" >
<el-table-column label="合团支付团号" min-width="150">
<template slot-scope="scope">
<el-input class='w120' type="text" v-model='scope.row.PayTypeTCNUM' v-show="scope.row.PayType==6"></el-input>
<el-input class='w120' type="text" v-model='scope.row.PayTypeTCNUM' v-show="scope.row.PayType==6">
</el-input>
</template>
</el-table-column>
<el-table-column label="定团号" min-width="230">
......@@ -319,12 +324,14 @@
<el-table-column label="高速费用付款方式" min-width="150">
<template slot-scope="scope">
<div>
<el-select class='sel' v-model='scope.row.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')">
<el-select class='sel' v-model='scope.row.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')" @change="PayTypeChange(scope.row)">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
<el-option label='合团公司支付' :value='6'></el-option>
<el-option label='自由活动-无用车' :value='7'></el-option>
<el-option label="酒店接送~免車資" :value='8'></el-option>
</el-select>
</div>
</template>
......@@ -357,8 +364,10 @@
</el-table-column>
</el-table>
<div class="upBtnList">
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)" :disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)" :disabled="disButton" value="保存" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)"
:disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)"
:disabled="disButton" value="保存" />
</div>
</el-form>
</div>
......@@ -511,12 +520,20 @@
};
},
methods: {
PayTypeChange(obj) {
if (obj.PayType == 7) {
obj.CostPrice = 0;
}
if (obj.HighSpeedPayType == 7) {
obj.HighSpeedPrice = 0;
}
},
/*获取车辆成本价格*/
getBusPrice(obj) {
let tempCostFee = 0;
var tempHighSpeedFee = 0;
if (obj.BusType) {
obj.PayType=2;
obj.PayType = 2;
obj.HighSpeedPayType = 1;
let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
if (busTypeObj) {
......@@ -534,17 +551,15 @@
tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee);
}
});
if(obj.HighSpeedPrice==0)
{
obj.HighSpeedPrice = tempHighSpeedFee;
if (obj.HighSpeedPrice == 0) {
obj.HighSpeedPrice = tempHighSpeedFee;
}
if(obj.CostPrice==0)
{
obj.CostPrice = tempCostFee;
if (obj.CostPrice == 0) {
obj.CostPrice = tempCostFee;
}
}
}else{
obj.PayType=null;
} else {
obj.PayType = null;
}
},
AddSubItem(item) {
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 9016e06f
......@@ -105,17 +105,18 @@
</td>
<td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option>
<el-option label='现付' value='1'></el-option>
<el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='5'></el-option>
<el-option label='预付' value='4'></el-option>
<el-option label='公司合团支付' value='6'></el-option>
<el-option label='请选择' :value='0' ></el-option>
<el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" >
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;">
付款团号：
</td>
<td style="text-align:left;">
......@@ -130,7 +131,6 @@
<el-input class='w135' v-model='subItem.CombinationNum' type="text"></el-input>
</td>
</tr>
</table>
</td>
<td v-if="childIndex==0" :rowspan="3">
......@@ -192,7 +192,6 @@
this.DataList = res.data.data;
this.DataList.forEach(item => {
item.ScenicStatisticsList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
this.calculationPrice(x);
if (x.CombinationNum == '' || x.CombinationNum == null) {
x.CombinationNum = this.$route.query.NewCombinationNum;
......@@ -213,9 +212,8 @@
if (!subItem.Discount) {
subItem.Discount = 0;
}
if(!subItem.UsePeopleNum)
{
subItem.UsePeopleNum=0;
if (!subItem.UsePeopleNum) {
subItem.UsePeopleNum = 0;
}
});
})
......@@ -229,9 +227,8 @@
if (!subItem.Discount) {
subItem.Discount = 0;
}
if(!subItem.UsePeopleNum)
{
subItem.UsePeopleNum=0;
if (!subItem.UsePeopleNum) {
subItem.UsePeopleNum = 0;
}
});
})
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 9016e06f
......@@ -658,7 +658,7 @@
<el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch>
</el-form-item>
<el-form-item label="支付方式">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')" :disabled="IsHaveAuth==1?false:true">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -804,11 +804,11 @@
navbar:false,
title:false
},
//是否有权限操作支付方式
IsHaveAuth: 0,
images: [],
selectAddress: false,
addimg: false,
// imgArray: [],
// PicPathArray: [],
imgKeyword: "",
imglistArry: [],
openplatform: "",
......@@ -1322,6 +1322,12 @@
},
},
mounted() {
let userInfo = this.getLocalStorage()
//有权限操作的部门
if (userInfo.RB_Department_Id == 240 || userInfo.RB_Department_Id == 1 || userInfo.RB_Department_Id == 3 ||
userInfo.RB_Branch_id == 49) {
this.IsHaveAuth = 1;
}
this.GetPayList();
this.ID = this.$route.query.id;
var jsArray = document.getElementsByTagName("script");
......
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