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
Show 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 @@
</el-col>
<el-col :span="4">
<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-col>
<el-col :span="4">
......@@ -729,8 +729,8 @@ export default {
CurrencyId:'0',
CostTypeID:'',
Conditon:'',
TCID:'',
TradeWay:'0',
TCNUM:'',
TradeWay:'',
Type:'-1',
AccountType:'',
QEndDate:'',
......@@ -948,7 +948,7 @@ export default {
this.loading= false;
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.currentPage = parseInt(this.msg.pageIndex);
},err=>{})
......@@ -1048,7 +1048,8 @@ export default {
}, err => {})
},
getAccountList(i,t){ //收款账户
let accountList = []
let accountList = [];
this.msg.BankID="";
if(t==1){ // 银行
this.apipost('bankaccount_post_GetList',{TypeId:i}, res => {
if(res.data.resultCode == 1) {
......@@ -1075,8 +1076,8 @@ export default {
this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
// console.log(data)
data.forEach(x=>{RangeIds
console.log(data)
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.Alias,
......@@ -1084,7 +1085,7 @@ export default {
}
accountList.push(obj)
})
this.accountList = accountList
this.accountList = accountList;
}
}, err => {})
}
......@@ -1256,8 +1257,8 @@ export default {
CurrencyId:this.msg.CurrencyId,
CostTypeID:this.msg.CostTypeID,
Conditon:this.msg.Conditon,
TCID:this.msg.TCID,
TradeWay:this.msg.TradeWay,
TCNUM:this.msg.TCNUM==0?"":this.msg.TCNUM,
TradeWay:this.msg.TradeWay==0?"":this.msg.TradeWay,
Type:this.msg.Type,
AccountType:this.msg.AccountType==0?'':this.msg.AccountType,
QEndDate:this.msg.QEndDate,
......
src/components/Hotel/ChangeHotel.vue
View file @ 47a5763e
......@@ -3,13 +3,13 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="changeHotelDetailsTalbe" v-loading="Loading">
<tr>
<th colspan="14">酒店信息</th>
<th colspan="13">酒店信息</th>
</tr>
<tr>
<th>
公司团号
</th>
<th colspan="12" class="tdLeft">
<th colspan="11" class="tdLeft">
<a class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</a>
</th>
<th>
......@@ -18,9 +18,7 @@
</tr>
<tr>
<th width="120">入住时间</th>
<th width="80">
<el-checkbox v-model='isCheck' @change="UpdateCheck()"></el-checkbox>
</th>
<th width="200">选择酒店</th>
<th width="120">机位数(Y/E/F)</th>
<th width="120">占床/不占床</th>
......@@ -40,9 +38,9 @@
<td v-if="childIndex==0&&subIndex==0" :rowspan="5*item.HotelOrderList.length" class="tdCenter">
{{item.UseTimeStr}}
</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>
</td>
</td> -->
<td v-if="childIndex==0" :rowspan="5" class="tdLeft">
<p class="link" style="word-break: normal;" @click="goUrlR('HotelManagement',HotelId.HotelId,'酒店管理')">
{{subItem.HotelName}}</p>
......
src/components/Hotel/HotelInfo.vue
View file @ 47a5763e
<style>
@import "../../assets/css/DMC.css";
@import "../../assets/css/DMC.css";
</style>
<template>
<div class="flexOne changInfo">
......@@ -37,10 +38,11 @@
</el-input>
</el-form-item>
<el-form-item label="是否预约">
<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 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>
......@@ -70,13 +72,14 @@
</el-select>
</span>
</div>
<span class="resource-lititle sheshi">酒店优惠 <el-button icon="el-icon-plus" circle @click="addAir"></el-button></span>
<span class="resource-lititle sheshi">酒店优惠 <el-button icon="el-icon-plus" circle @click="addAir"></el-button>
</span>
<div class="jiudianyouhuiDiv">
<el-row v-for="(list,index) in addMsg.DiscountList" :key="index">
<el-col :span="6" :gutter="35">
<el-form-item label="开始数量">
<el-input class='w80' type="text" v-model="list.StartNum" ></el-input>
<el-input class='w80' type="text" v-model="list.StartNum"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
......@@ -86,13 +89,13 @@
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item label="返还数量">
<el-input class='w80' type="text" v-model="list.DisCountNum" ></el-input>
<el-input class='w80' type="text" v-model="list.DisCountNum"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35" v-if="index==0">
</el-col>
<el-col :span="6" :gutter="35" >
<el-col :span="6" :gutter="35">
<el-button icon="el-icon-minus" circle @click="deleteAir(index)"> </el-button>
</el-col>
</el-row>
......@@ -134,38 +137,44 @@
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
<div class="leftPnum">{{$t('admin.admin_personNumber')}}></div>
<input type="text" class="toolInput inpuOne" v-model="addMsg.RebateCount" onkeyup="value=value.replace(/[^\d]/g,'')"
maxlength="20">
<input type="text" class="toolInput inpuOne" v-model="addMsg.RebateCount"
onkeyup="value=value.replace(/[^\d]/g,'')" maxlength="20">
</div>
<div class="RebateCount reTwo">
<div class="fanNum">{{$t('restaurant.res_return')}}</div>
<input type="text" class="toolInput inpuTwo" v-model="addMsg.RebateRatio" onkeyup="value=value.replace(/[^\d]/g,'')"
maxlength="20">
<input type="text" class="toolInput inpuTwo" v-model="addMsg.RebateRatio"
onkeyup="value=value.replace(/[^\d]/g,'')" maxlength="20">
<div class="percentCon">%</div>
</div>
</div>
</div>
<el-form-item :label="$t('hotel.hotel_landline')">
<el-input type="text" v-model="addMsg.Tel" maxlength="20" :placeholder="$t('hotel.hotel_landline')" class="w300"></el-input>
<el-input type="text" v-model="addMsg.Tel" maxlength="20" :placeholder="$t('hotel.hotel_landline')"
class="w300"></el-input>
</el-form-item>
<el-form-item label="国家">
<el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w300' @change="GetSubAreaList(addMsg.Country,1)">
<el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w300'
@change="GetSubAreaList(addMsg.Country,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
<el-option v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="省">
<el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="addMsg.Province" @change="GetSubAreaList(addMsg.Province,2)">
<el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
<el-option v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="市">
<el-select placeholder="请选择市" filterable class='multiple_input w300' v-model="addMsg.City">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
<el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
......@@ -196,12 +205,13 @@
active-text="用餐" inactive-text="不用餐"></el-switch>
</el-form-item>
<el-form-item label="用餐类型" v-show="isDinner">
<el-select v-model="UseDinnerString" class='multiple_input w300' multiple :placeholder="$t('pub.pleaseSel')">
<el-select v-model="UseDinnerString" class='multiple_input w300' multiple
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in dinerList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="停车场" >
<el-form-item label="停车场">
<el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
</div>
......@@ -211,7 +221,7 @@
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<div class="imgzhe">
<div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
......@@ -228,8 +238,8 @@
<i class="iconfont icon-img_haha"></i>
<div class="ad-one">
<div class="re-upload">
<el-upload class="upload-demo" :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload class="upload-demo" :http-request="UploadImage" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<i class="iconfont icon-img_bdsc"></i>
</el-upload>
</div>
......@@ -242,7 +252,8 @@
</el-form>
</div>
<el-dialog custom-class="resourceImgAdd" title="选择图片" center :visible.sync="addimg">
<DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:imgType="1"></DMCchooseImg>
<DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:imgType="1">
</DMCchooseImg>
</el-dialog>
<el-dialog custom-class="mapList" title="地图选址" center :visible.sync="selectAddress">
<googleMap @refList="googleMap" v-bind:address="addMsg.Address" @headCallBack="headCall"></googleMap>
......@@ -258,15 +269,17 @@
</div>
</template>
<script>
import DMCchooseImg from "../commonPage/DMCchooseImg.vue";
import googleMap from "../commonPage/googleMap.vue";
export default {
import DMCchooseImg from "../commonPage/DMCchooseImg.vue";
import googleMap from "../commonPage/googleMap.vue";
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
imageOptions: {
navbar: false,
title: false
},
//是否有权限操作支付方式
IsHaveAuth: 0,
images: [],
//是否显示添加图片
addimg: false,
......@@ -312,16 +325,16 @@ export default {
//酒店类型
HotelTypeList: [],
//酒店价格
HotelPirceTypeList:[],
HotelPirceTypeList: [],
addMsg: {
ID: 0,
Name: "",
HotelRealName:"",
HotelRealName: "",
Descriptions: "",
Tel: "",
Remark: "",
//温馨提示
WarmTip:"",
WarmTip: "",
Star: "",
URL: "",
Fax: "",
......@@ -337,7 +350,7 @@ export default {
DieLine: "",
HotelImageList: [], //现在的图片
DeleteImageList: [], //要删除的图片
DiscountList:[ ],
DiscountList: [],
RoomNumber: "",
ChainBrand: "",
FacilityServices: "",
......@@ -356,44 +369,36 @@ export default {
//支付方式
PayStyle: 0,
//是否有停车场
IsHavearking:0,
IsHavearking: 0,
},
DiscountList:{
ID:0,
StartNum:'',
EndNum:'',
DisCountNum:''
DiscountList: {
ID: 0,
StartNum: '',
EndNum: '',
DisCountNum: ''
},
qMsg: {},
rules: {
//表单必填验证
Name: [
{
Name: [{
required: true,
message: "请填写名称",
trigger: "change"
}
],
Address: [
{
}],
Address: [{
required: true,
message: "请选择地址",
trigger: "change"
}
],
Descriptions: [
{
}],
Descriptions: [{
required: true,
message: "请输入文字描述",
trigger: "change"
}
],
DieLine: [
{
}],
DieLine: [{
pattern: this.$commonUtils.Regex.el_isInteger,
message: "请输入正确的数字"
}
]
}]
}
};
},
......@@ -402,10 +407,10 @@ export default {
DMCchooseImg: DMCchooseImg
},
methods: {
deleteAir(i){
this.addMsg.DiscountList.splice(i,1);
deleteAir(i) {
this.addMsg.DiscountList.splice(i, 1);
},
addAir(){
addAir() {
this.addMsg.DiscountList.push(JSON.parse(JSON.stringify(this.DiscountList)));
},
//上传酒店图片
......@@ -452,18 +457,18 @@ export default {
this.HotelImageArray.splice(index, 1);
//this.updatePic();
},
inited (viewer){
inited(viewer) {
this.$viewer = viewer
},
showImg: function (src) {
let srcArr = src.split('?')
src = srcArr[0]
let isExsit=false
this.images.forEach(x=>{
if(x===src)
isExsit=true
let isExsit = false
this.images.forEach(x => {
if (x === src)
isExsit = true
})
if(!isExsit) {
if (!isExsit) {
this.images.push(src)
} else {
this.$viewer.view(this.images.indexOf(src))
......@@ -757,8 +762,7 @@ export default {
//获取国家
GetCounrty() {
this.apipost(
"dict_post_Destination_GetCountry",
{},
"dict_post_Destination_GetCountry", {},
res => {
this.CountryList = res.data.data;
},
......@@ -798,8 +802,7 @@ export default {
//获取支付方式列表
GetPayList() {
this.apipost(
"dmc_post_Get_GetPayStyleList",
{},
"dmc_post_Get_GetPayStyleList", {},
res => {
if (res.data.resultCode == 1) {
this.PayList = res.data.data;
......@@ -811,8 +814,7 @@ export default {
//获取酒店类型列表
GetHotelTypeList() {
this.apipost(
"dmc_post_Get_GetHotelType",
{},
"dmc_post_Get_GetHotelType", {},
res => {
if (res.data.resultCode == 1) {
this.HotelTypeList = res.data.data;
......@@ -823,8 +825,7 @@ export default {
},
GetHotelPirceTypeList() {
this.apipost(
"dmc_post_Get_GetHotelPriceType",
{},
"dmc_post_Get_GetHotelPriceType", {},
res => {
if (res.data.resultCode == 1) {
this.HotelPirceTypeList = res.data.data;
......@@ -852,6 +853,12 @@ export default {
},
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.GetHotelTypeList();
this.GetHotelPirceTypeList();
......@@ -882,5 +889,6 @@ export default {
this.initHotelData();
}
}
};
};
</script>
src/components/Hotel/roomReservationsDetails.vue
View file @ 47a5763e
......@@ -133,16 +133,16 @@
</el-upload>
</div>
</td>
<!-- 房间预定数 -->
<!-- 房间数 -->
<td>
<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>
<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>
......@@ -200,10 +200,11 @@
<td>
<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='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>
......@@ -240,6 +241,9 @@
<!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5">
<!--v-if="subItem.OPState!=1"-->
<template v-if="subItem.OPState!=1">
<span class="Hotel_red">OP选房确认</span>
</template>
<template>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
......@@ -253,7 +257,7 @@
</el-button>
</el-tooltip>
</template>
<!-- <template v-else>
<!--<template v-else>
<span class="Hotel_red">OP选房确认</span>
</template> -->
</td>
......@@ -466,6 +470,8 @@
obj.Address = ckedObj.Address;
obj.Tel = ckedObj.Tel;
obj.NewHotelName = ckedObj.Name;
obj.PayStyle = ckedObj.PayStyle;
obj.PayStyleExt=ckedObj.PayStyle;
} else {
obj.Address = '';
obj.Tel = '';
......@@ -509,11 +515,11 @@
})
this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.getList();
this.Success(res.data.message);
} else {
this.loading = false
this.Error(res.data.message);
}
}, err => {})
......@@ -579,7 +585,7 @@
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 55;
this.boxHeight = height;
this.offsetwidth = width
this.offsetwidth = width;
this.getList();
}
}
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 47a5763e
......@@ -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>
......@@ -139,7 +140,7 @@
</td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" >
<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 @ 47a5763e
......@@ -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/groupTourOrderByTuan.vue
View file @ 47a5763e
......@@ -1477,8 +1477,8 @@
<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>
</div>
......
src/components/SalesModule/productQuery.vue
View file @ 47a5763e
......@@ -702,6 +702,49 @@
<p><span>出发城市</span>{{item.StartCityName}}</p>
<p><span>返回城市</span>{{item.ReturnArriveCityName}}</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 class="d4">
<p><i class="iconfont icon-jiage"></i>价格信息</p>
......@@ -782,51 +825,6 @@
<span slot="reference" class="price">查看价格明细</span>
</el-popover>
</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 class="d5">
<p><i class="iconfont icon-tuanwei"></i>团位信息</p>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 47a5763e
......@@ -2367,13 +2367,31 @@
</div>
<table class="RS_visaTable">
<tr>
<th>签发地</th>
<th colspan="3">请假信息</th>
</tr>
<tr>
<th>姓名</th>
<th>类型</th>
<th width=100>到期日</th>
<th width=100>时间</th>
</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>
<td colspan="3">暂无请假信息</td>
</tr>
</template>
</table>
</div>
<div>
......@@ -2966,6 +2984,8 @@
ScheduleArray: [],
ckedIndex: -1,
LeaderInfoList: [],
//领队请假信息
LeaderHolidyList: [],
beforeInfo: {
DuringHoliday: '',
date: '',
......@@ -3136,7 +3156,8 @@
this.isShowLayer = false;
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.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.TCID,
......@@ -4426,6 +4447,8 @@
},
//点击选中名单
getLeaderInfo(index, LeaderId) {
this.LeaderInfoList = {};
this.LeaderHolidyList = [];
this.ckedIndex = index;
let msg = {
ID: LeaderId,
......@@ -4435,6 +4458,7 @@
"leader_Get_GetPriceLeaderInfo", msg,
res => {
if (res.data.resultCode == 1) {
this.LeaderHolidyList=res.data.data.holidyList;
this.LeaderInfoList = res.data.data;
this.beforeInfo.DuringHoliday = "";
this.beforeInfo.date = "";
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 47a5763e
......@@ -182,7 +182,7 @@
{{item.StartCityName}}</td>
<td>{{item.LtName}}</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.InOutTime}}</td>
<td>{{item.B2CMemberPrice}}</td>
......@@ -251,6 +251,16 @@
};
},
methods: {
goUrlTCList(path, TCNUMS, title) {
this.$router.push({
name: path,
query: {
tcmun: TCNUMS,
blank: 'y',
tab: title
}
})
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 47a5763e
......@@ -481,13 +481,56 @@
{{item.OutBranchName}}
</p>
<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>
</p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</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="el-col" style="width:190px;">
......@@ -557,49 +600,7 @@
<span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span>
</el-popover>
</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 class="el-col" style="width:150px;">
......
src/components/TravelManager/TravelList/TravelpassengerList.vue
View file @ 47a5763e
......@@ -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/scenicSpot/admissionStatisticsDetails.vue
View file @ 47a5763e
......@@ -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;" >
<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 @ 47a5763e
......@@ -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