Skip to content

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

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

parents 7176a993 808444e4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 848 additions and 782 deletions
src/components/FinancialModule/RecPayQuery.vue
View file @ 47a5763e
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="团队编号："> <el-form-item label="团队编号：">
<el-input v-model="msg.TCID" class=""></el-input> <el-input v-model="msg.TCNUM" class=""></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -729,8 +729,8 @@ export default { ...@@ -729,8 +729,8 @@ export default {
CurrencyId:'0', CurrencyId:'0',
CostTypeID:'', CostTypeID:'',
Conditon:'', Conditon:'',
TCID:'', TCNUM:'',
TradeWay:'0', TradeWay:'',
Type:'-1', Type:'-1',
AccountType:'', AccountType:'',
QEndDate:'', QEndDate:'',
...@@ -948,7 +948,7 @@ export default { ...@@ -948,7 +948,7 @@ export default {
this.loading= false; this.loading= false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
this.msg.TCID= this.msg.TCID=0?this.msg.TCID:''; // this.msg.TCID= this.msg.TCID==0?this.msg.TCID:'';
this.queryInfoInit(); this.queryInfoInit();
this.currentPage = parseInt(this.msg.pageIndex); this.currentPage = parseInt(this.msg.pageIndex);
},err=>{}) },err=>{})
...@@ -1048,7 +1048,8 @@ export default { ...@@ -1048,7 +1048,8 @@ export default {
}, err => {}) }, err => {})
}, },
getAccountList(i,t){ //收款账户 getAccountList(i,t){ //收款账户
let accountList = [] let accountList = [];
this.msg.BankID="";
if(t==1){ // 银行 if(t==1){ // 银行
this.apipost('bankaccount_post_GetList',{TypeId:i}, res => { this.apipost('bankaccount_post_GetList',{TypeId:i}, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
...@@ -1075,8 +1076,8 @@ export default { ...@@ -1075,8 +1076,8 @@ export default {
this.apipost('BankAccount_post_GetPlatformList',msg, res => { this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
// console.log(data) console.log(data)
data.forEach(x=>{RangeIds data.forEach(x=>{
let obj = { let obj = {
ID:x.ID, ID:x.ID,
Name:x.Alias, Name:x.Alias,
...@@ -1084,7 +1085,7 @@ export default { ...@@ -1084,7 +1085,7 @@ export default {
} }
accountList.push(obj) accountList.push(obj)
}) })
this.accountList = accountList this.accountList = accountList;
} }
}, err => {}) }, err => {})
} }
...@@ -1132,7 +1133,7 @@ export default { ...@@ -1132,7 +1133,7 @@ export default {
} }
}, err => {}) }, err => {})
} }
}, },
Financial_post_GetBranchAccountList(){ //获取交易方式列表 Financial_post_GetBranchAccountList(){ //获取交易方式列表
this.apipost('Financial_post_GetBranchAccountList',{}, res => { this.apipost('Financial_post_GetBranchAccountList',{}, res => {
...@@ -1256,8 +1257,8 @@ export default { ...@@ -1256,8 +1257,8 @@ export default {
CurrencyId:this.msg.CurrencyId, CurrencyId:this.msg.CurrencyId,
CostTypeID:this.msg.CostTypeID, CostTypeID:this.msg.CostTypeID,
Conditon:this.msg.Conditon, Conditon:this.msg.Conditon,
TCID:this.msg.TCID, TCNUM:this.msg.TCNUM==0?"":this.msg.TCNUM,
TradeWay:this.msg.TradeWay, TradeWay:this.msg.TradeWay==0?"":this.msg.TradeWay,
Type:this.msg.Type, Type:this.msg.Type,
AccountType:this.msg.AccountType==0?'':this.msg.AccountType, AccountType:this.msg.AccountType==0?'':this.msg.AccountType,
QEndDate:this.msg.QEndDate, QEndDate:this.msg.QEndDate,
......
src/components/Hotel/ChangeHotel.vue
View file @ 47a5763e
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="changeHotelDetailsTalbe" v-loading="Loading"> <table border="0" cellspacing="1" cellpadding="0" class="changeHotelDetailsTalbe" v-loading="Loading">
<tr> <tr>
<th colspan="14">酒店信息</th> <th colspan="13">酒店信息</th>
</tr> </tr>
<tr> <tr>
<th> <th>
公司团号 公司团号
</th> </th>
<th colspan="12" class="tdLeft"> <th colspan="11" class="tdLeft">
<a class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</a> <a class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</a>
</th> </th>
<th> <th>
...@@ -18,9 +18,7 @@ ...@@ -18,9 +18,7 @@
</tr> </tr>
<tr> <tr>
<th width="120">入住时间</th> <th width="120">入住时间</th>
<th width="80">
<el-checkbox v-model='isCheck' @change="UpdateCheck()"></el-checkbox>
</th>
<th width="200">选择酒店</th> <th width="200">选择酒店</th>
<th width="120">机位数(Y/E/F)</th> <th width="120">机位数(Y/E/F)</th>
<th width="120">占床/不占床</th> <th width="120">占床/不占床</th>
...@@ -40,9 +38,9 @@ ...@@ -40,9 +38,9 @@
<td v-if="childIndex==0&&subIndex==0" :rowspan="5*item.HotelOrderList.length" class="tdCenter"> <td v-if="childIndex==0&&subIndex==0" :rowspan="5*item.HotelOrderList.length" class="tdCenter">
{{item.UseTimeStr}} {{item.UseTimeStr}}
</td> </td>
<td v-if="childIndex==0" :rowspan="5" class="tdCenter"> <!-- <td v-if="childIndex==0" :rowspan="5" class="tdCenter">
<el-checkbox v-model='subItem.IsChecked'></el-checkbox> <el-checkbox v-model='subItem.IsChecked'></el-checkbox>
</td> </td> -->
<td v-if="childIndex==0" :rowspan="5" class="tdLeft"> <td v-if="childIndex==0" :rowspan="5" class="tdLeft">
<p class="link" style="word-break: normal;" @click="goUrlR('HotelManagement',HotelId.HotelId,'酒店管理')"> <p class="link" style="word-break: normal;" @click="goUrlR('HotelManagement',HotelId.HotelId,'酒店管理')">
{{subItem.HotelName}}</p> {{subItem.HotelName}}</p>
......
src/components/Hotel/HotelInfo.vue
View file @ 47a5763e
This diff is collapsed.
src/components/Hotel/roomReservationsDetails.vue
View file @ 47a5763e
...@@ -133,16 +133,16 @@ ...@@ -133,16 +133,16 @@
</el-upload> </el-upload>
</div> </div>
</td> </td>
<!-- 房间预定数 --> <!-- 房间数 -->
<td> <td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')" <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount'></el-input> v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
</td> </td>
<!-- 预定人数 --> <!-- 预定人数 -->
<td> <td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')" <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum'></el-input> @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false">
</el-input>
</td> </td>
<!-- 尚差房间数 --> <!-- 尚差房间数 -->
<td> <td>
...@@ -200,10 +200,11 @@ ...@@ -200,10 +200,11 @@
<td> <td>
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option> <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' :value='2'></el-option> <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' :value='5'></el-option> <el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' :value='4'></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-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
...@@ -240,6 +241,9 @@ ...@@ -240,6 +241,9 @@
<!-- 操作 --> <!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<!--v-if="subItem.OPState!=1"--> <!--v-if="subItem.OPState!=1"-->
<template v-if="subItem.OPState!=1">
<span class="Hotel_red">OP选房确认</span>
</template>
<template> <template>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start"> <el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button> <el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
...@@ -253,7 +257,7 @@ ...@@ -253,7 +257,7 @@
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template> </template>
<!-- <template v-else> <!--<template v-else>
<span class="Hotel_red">OP选房确认</span> <span class="Hotel_red">OP选房确认</span>
</template> --> </template> -->
</td> </td>
...@@ -466,6 +470,8 @@ ...@@ -466,6 +470,8 @@
obj.Address = ckedObj.Address; obj.Address = ckedObj.Address;
obj.Tel = ckedObj.Tel; obj.Tel = ckedObj.Tel;
obj.NewHotelName = ckedObj.Name; obj.NewHotelName = ckedObj.Name;
obj.PayStyle = ckedObj.PayStyle;
obj.PayStyleExt=ckedObj.PayStyle;
} else { } else {
obj.Address = ''; obj.Address = '';
obj.Tel = ''; obj.Tel = '';
...@@ -509,11 +515,11 @@ ...@@ -509,11 +515,11 @@
}) })
this.loading = true; this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => { this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getList(); this.getList();
this.Success(res.data.message); this.Success(res.data.message);
} else { } else {
this.loading = false
this.Error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) }, err => {})
...@@ -579,7 +585,7 @@ ...@@ -579,7 +585,7 @@
let width = window.innerWidth - 50; let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 55; let height = window.innerHeight - 65 - 55;
this.boxHeight = height; this.boxHeight = height;
this.offsetwidth = width this.offsetwidth = width;
this.getList(); this.getList();
} }
} }
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 47a5763e
...@@ -116,12 +116,13 @@ ...@@ -116,12 +116,13 @@
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='现付' value='1'></el-option> <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' value='2'></el-option> <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' value='3'></el-option> <el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' value='4'></el-option> <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='公司合团支付' value='6'></el-option> <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -138,8 +139,8 @@ ...@@ -138,8 +139,8 @@
</el-select> </el-select>
</td> </td>
</tr> </tr>
<tr v-show="subItem.PayStyle==6"> <tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" > <td width="60" style="text-align:right;">
付款团号: 付款团号:
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
...@@ -234,7 +235,6 @@ ...@@ -234,7 +235,6 @@
this.list.forEach(item => { this.list.forEach(item => {
item.DinnerList = []; item.DinnerList = [];
item.DiningSummaryList.forEach(x => { item.DiningSummaryList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
x.DiningReserveType = x.DiningReserveType.toString(); x.DiningReserveType = x.DiningReserveType.toString();
this.calculationPrice(x); this.calculationPrice(x);
item.DinnerList.push({ item.DinnerList.push({
...@@ -318,6 +318,8 @@ ...@@ -318,6 +318,8 @@
if (subItem.NewDiningID == x.ID) { if (subItem.NewDiningID == x.ID) {
subItem.Address = x.Address; subItem.Address = x.Address;
subItem.Tel = x.Tel; subItem.Tel = x.Tel;
subItem.PayStyle=x.PayStyle;
subItem.PayStyleExt=x.PayStyle;
} }
}) })
}, },
......
src/components/Restaurant/restaurantInfoManage.vue
View file @ 47a5763e
...@@ -757,7 +757,7 @@ ...@@ -757,7 +757,7 @@
<el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch> <el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <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 :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 v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
...@@ -916,6 +916,8 @@ ...@@ -916,6 +916,8 @@
navbar:false, navbar:false,
title:false title:false
}, },
//是否有权限操作支付方式
IsHaveAuth: 0,
images: [], images: [],
selectAddress: false, selectAddress: false,
addimg: false, addimg: false,
...@@ -1460,6 +1462,12 @@ ...@@ -1460,6 +1462,12 @@
}, },
mounted() { 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.GetPayList();
this.GetDiningTypeList(); this.GetDiningTypeList();
this.GetDiningPriceTypeList(); this.GetDiningPriceTypeList();
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 47a5763e
...@@ -1477,8 +1477,8 @@ ...@@ -1477,8 +1477,8 @@
<div>领队导游</div> <div>领队导游</div>
</div> </div>
</div> </div>
<!-- v-if="tuanInfo.config.IsOrder!=1" --> <!-- -->
<div style="float:right"> <div v-if="tuanInfo.config.IsOrder!=1" style="float:right">
<span style="color:#f78989"> 订单操作已关闭，如需修改请联系OP.</span> <span style="color:#f78989"> 订单操作已关闭，如需修改请联系OP.</span>
</div> </div>
......
src/components/SalesModule/productQuery.vue
View file @ 47a5763e
...@@ -702,6 +702,49 @@ ...@@ -702,6 +702,49 @@
<p><span>出发城市</span>{{item.StartCityName}}</p> <p><span>出发城市</span>{{item.StartCityName}}</p>
<p><span>返回城市</span>{{item.ReturnArriveCityName}}</p> <p><span>返回城市</span>{{item.ReturnArriveCityName}}</p>
<p><span>出团公司</span>{{item.OutBranchName}}</p> <p><span>出团公司</span>{{item.OutBranchName}}</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<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">
<td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</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>
</table>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover>
</p>
</div> </div>
<div class="d4"> <div class="d4">
<p><i class="iconfont icon-jiage"></i>价格信息</p> <p><i class="iconfont icon-jiage"></i>价格信息</p>
...@@ -782,51 +825,6 @@ ...@@ -782,51 +825,6 @@
<span slot="reference" class="price">查看价格明细</span> <span slot="reference" class="price">查看价格明细</span>
</el-popover> </el-popover>
</p> </p>
<!-- <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th>
<th width="100" style="border-right:1px solid #E5E5E5">占房时间</th>
</tr>
<tr v-for="subItem in item.HotelOrderListReports">
<td width="100">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding:3px 10px;">
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}}
<a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
【<a
style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
<template v-else v-for="childItem in subItem.SubList">
<div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div>
</template>
</template>
</td>
<td>
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].CreateDateStr}}
</div>
<template v-else v-for="childItem in subItem.SubList">
<div></div>
</template>
</template>
</td>
</tr>
</table>
</div>
<span slot="reference" class="price">酒店信息</span>
</el-popover>
</p> -->
</div> </div>
<div class="d5"> <div class="d5">
<p><i class="iconfont icon-tuanwei"></i>团位信息</p> <p><i class="iconfont icon-tuanwei"></i>团位信息</p>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 47a5763e
...@@ -2367,13 +2367,31 @@ ...@@ -2367,13 +2367,31 @@
</div> </div>
<table class="RS_visaTable"> <table class="RS_visaTable">
<tr> <tr>
<th>签发地</th> <th colspan="3">请假信息</th>
<th>类型</th>
<th width=100>到期日</th>
</tr> </tr>
<tr> <tr>
<td colspan="3">无签证信息</td> <th>姓名</th>
<th>类型</th>
<th width=100>时间</th>
</tr> </tr>
<template v-if="LeaderHolidyList&&LeaderHolidyList.length>0">
<tr v-for="(leaderItem,leaderIndex) in LeaderHolidyList">
<td>
{{LeaderInfoList.LeaderGuide.Surname}}{{LeaderInfoList.LeaderGuide.Name}}
</td>
<td>
请假
</td>
<td>
{{leaderItem.StartDateStr2}}到{{leaderItem.EndDateStr2}}
</td>
</tr>
</template>
<template v-else>
<tr>
<td colspan="3">暂无请假信息</td>
</tr>
</template>
</table> </table>
</div> </div>
<div> <div>
...@@ -2966,6 +2984,8 @@ ...@@ -2966,6 +2984,8 @@
ScheduleArray: [], ScheduleArray: [],
ckedIndex: -1, ckedIndex: -1,
LeaderInfoList: [], LeaderInfoList: [],
//领队请假信息
LeaderHolidyList: [],
beforeInfo: { beforeInfo: {
DuringHoliday: '', DuringHoliday: '',
date: '', date: '',
...@@ -3136,7 +3156,8 @@ ...@@ -3136,7 +3156,8 @@
this.isShowLayer = false; this.isShowLayer = false;
this.isShowLayer2 = true; this.isShowLayer2 = true;
} }
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) ) let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this
.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum))
this.Unit_PriceList = []; this.Unit_PriceList = [];
this.apipost('sellorder_post_GetLessPrice', { this.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.TCID, "TCID": obj.TCID,
...@@ -4426,6 +4447,8 @@ ...@@ -4426,6 +4447,8 @@
}, },
//点击选中名单 //点击选中名单
getLeaderInfo(index, LeaderId) { getLeaderInfo(index, LeaderId) {
this.LeaderInfoList = {};
this.LeaderHolidyList = [];
this.ckedIndex = index; this.ckedIndex = index;
let msg = { let msg = {
ID: LeaderId, ID: LeaderId,
...@@ -4435,6 +4458,7 @@ ...@@ -4435,6 +4458,7 @@
"leader_Get_GetPriceLeaderInfo", msg, "leader_Get_GetPriceLeaderInfo", msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LeaderHolidyList=res.data.data.holidyList;
this.LeaderInfoList = res.data.data; this.LeaderInfoList = res.data.data;
this.beforeInfo.DuringHoliday = ""; this.beforeInfo.DuringHoliday = "";
this.beforeInfo.date = ""; this.beforeInfo.date = "";
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 47a5763e
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
{{item.StartCityName}}</td> {{item.StartCityName}}</td>
<td>{{item.LtName}}</td> <td>{{item.LtName}}</td>
<td>{{item.StartDateStr}} {{item.AlCode}}</td> <td>{{item.StartDateStr}} {{item.AlCode}}</td>
<td><span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrl('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td> <td><span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrlTCList('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td>
<td>{{item.InOut}}</td> <td>{{item.InOut}}</td>
<td>{{item.InOutTime}}</td> <td>{{item.InOutTime}}</td>
<td>{{item.B2CMemberPrice}}</td> <td>{{item.B2CMemberPrice}}</td>
...@@ -251,6 +251,16 @@ ...@@ -251,6 +251,16 @@
}; };
}, },
methods: { methods: {
goUrlTCList(path, TCNUMS, title) {
this.$router.push({
name: path,
query: {
tcmun: TCNUMS,
blank: 'y',
tab: title
}
})
},
//初始化公司 //初始化公司
getCompanyList() { getCompanyList() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 47a5763e
...@@ -481,13 +481,56 @@ ...@@ -481,13 +481,56 @@
{{item.OutBranchName}} {{item.OutBranchName}}
</p> </p>
<p class="travelnowrap" v-if="item.WordPath!=''"> <p class="travelnowrap" v-if="item.WordPath!=''">
<a style="corsor:pointer;" <a style="cursor:pointer;"
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a> :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p> </p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0"> <p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span> <span>已设定清位</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span> <span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p> </p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<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">
<td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</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>
</table>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover>
</p>
</div> </div>
</div> </div>
<div class="el-col" style="width:190px;"> <div class="el-col" style="width:190px;">
...@@ -557,49 +600,7 @@ ...@@ -557,49 +600,7 @@
<span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span> <span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span>
</el-popover> </el-popover>
</p> </p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<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">
<td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</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>
</table>
<span slot="reference" class="price">酒店信息</span>
</el-popover>
</p>
</div> </div>
</div> </div>
<div class="el-col" style="width:150px;"> <div class="el-col" style="width:150px;">
......
src/components/TravelManager/TravelList/TravelpassengerList.vue
View file @ 47a5763e
...@@ -170,7 +170,14 @@ export default { ...@@ -170,7 +170,14 @@ export default {
str = "标准双人间"; str = "标准双人间";
} else if (item.HouseType == 3) { } else if (item.HouseType == 3) {
str = "大床房"; str = "大床房";
} else { }
else if (item.HouseType == 4) {
str = "三人间";
}
else if (item.HouseType== 5) {
str = "拼凑双人间";
}
else {
str = "未分配"; str = "未分配";
} }
return str; return str;
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 47a5763e
...@@ -105,17 +105,18 @@ ...@@ -105,17 +105,18 @@
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option> <el-option label='请选择' :value='0' ></el-option>
<el-option label='现付' value='1'></el-option> <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' value='2'></el-option> <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' value='5'></el-option> <el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' value='4'></el-option> <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='公司合团支付' value='6'></el-option> <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
<tr v-show="subItem.PayStyle==6"> <tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" > <td width="60" style="text-align:right;">
付款团号： 付款团号：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
...@@ -130,7 +131,6 @@ ...@@ -130,7 +131,6 @@
<el-input class='w135' v-model='subItem.CombinationNum' type="text"></el-input> <el-input class='w135' v-model='subItem.CombinationNum' type="text"></el-input>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
...@@ -192,7 +192,6 @@ ...@@ -192,7 +192,6 @@
this.DataList = res.data.data; this.DataList = res.data.data;
this.DataList.forEach(item => { this.DataList.forEach(item => {
item.ScenicStatisticsList.forEach(x => { item.ScenicStatisticsList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
this.calculationPrice(x); this.calculationPrice(x);
if (x.CombinationNum == '' || x.CombinationNum == null) { if (x.CombinationNum == '' || x.CombinationNum == null) {
x.CombinationNum = this.$route.query.NewCombinationNum; x.CombinationNum = this.$route.query.NewCombinationNum;
...@@ -213,9 +212,8 @@ ...@@ -213,9 +212,8 @@
if (!subItem.Discount) { if (!subItem.Discount) {
subItem.Discount = 0; subItem.Discount = 0;
} }
if(!subItem.UsePeopleNum) if (!subItem.UsePeopleNum) {
{ subItem.UsePeopleNum = 0;
subItem.UsePeopleNum=0;
} }
}); });
}) })
...@@ -229,9 +227,8 @@ ...@@ -229,9 +227,8 @@
if (!subItem.Discount) { if (!subItem.Discount) {
subItem.Discount = 0; subItem.Discount = 0;
} }
if(!subItem.UsePeopleNum) if (!subItem.UsePeopleNum) {
{ subItem.UsePeopleNum = 0;
subItem.UsePeopleNum=0;
} }
}); });
}) })
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 47a5763e
...@@ -658,7 +658,7 @@ ...@@ -658,7 +658,7 @@
<el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch> <el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <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 :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 v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
...@@ -804,11 +804,11 @@ ...@@ -804,11 +804,11 @@
navbar:false, navbar:false,
title:false title:false
}, },
//是否有权限操作支付方式
IsHaveAuth: 0,
images: [], images: [],
selectAddress: false, selectAddress: false,
addimg: false, addimg: false,
// imgArray: [],
// PicPathArray: [],
imgKeyword: "", imgKeyword: "",
imglistArry: [], imglistArry: [],
openplatform: "", openplatform: "",
...@@ -1322,6 +1322,12 @@ ...@@ -1322,6 +1322,12 @@
}, },
}, },
mounted() { 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.GetPayList();
this.ID = this.$route.query.id; this.ID = this.$route.query.id;
var jsArray = document.getElementsByTagName("script"); 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