Skip to content

S
SuperMan
Commit 1becd9f4 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents c5b647e3 644bfe09
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 665 additions and 296 deletions
src/components/Hotel/HotelProductManage2.vue
View file @ 1becd9f4
......@@ -143,6 +143,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="提前还房天数">
<el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="免间数">
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item>
</el-col
<el-col :span="6">
<el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
......@@ -355,17 +367,29 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="提前还房天数">
<el-input-number v-model="msg.BeforeDay" :precision="2" :min="0"
@keyup.native="checkInteger(msg,'BeforeDay')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="免间数">
<el-input-number v-model="msg.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="标准间成本价">
<el-input-number v-model="msg.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
@keyup.native="checkPrice(msg,'CostPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="散客价">
<el-input-number v-model="msg.SanKePrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
@keyup.native="checkPrice(msg,'SanKePrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -577,7 +601,9 @@
DateList: [],
SanKePrice: 0, //散客价
BatchNumber: 1, //批次号
TaxesPrice: 0 //税金
TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数
FreeRoomNum:0,//免间数
},
msg2: {
Hotel: '0',
......@@ -607,7 +633,9 @@
DateList: [],
SanKePrice: 0, //散客价
BatchNumber: 1, //批次号
TaxesPrice: 0 //税金
TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数
FreeRoomNum:0,//免间数
},
rules: {
InventoryType: {
......@@ -931,6 +959,8 @@
this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice;
this.msg.BeforeDay=data.BeforeDay;
this.msg.FreeRoomNum=data.FreeRoomNum;
}
})
},
......@@ -1009,6 +1039,8 @@
this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0;
this.msg.BeforeDay=0;
this.msg.FreeRoomNum=0;
} else {
this.Error(res.data.message)
}
......@@ -1025,6 +1057,8 @@
this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0;
this.msg2.FreeRoomNum=0;
},
//批量删除
delete2Reset: function () {
......@@ -1039,6 +1073,8 @@
that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0;
that.msg2.BeforeDay=0;
that.msg2.FreeRoomNum=0;
} else {
that.Error(res.data.message)
}
......@@ -1047,7 +1083,6 @@
},
// 页面编辑保存
edit2Save: function () {
console.log("msg2",this.msg2);
this.$refs['hotelProductForm2'].validate((valid) => {
if (valid) {
this.apipost('dict_post_HotelOffer_SetNewHotelPrice', this.msg2, res => {
......@@ -1059,6 +1094,8 @@
this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0;
this.msg2.FreeRoomNum=0;
} else {
this.Error(res.data.message)
}
......@@ -1105,7 +1142,6 @@
this.initSupplier();
}
}
</script>
<style>
......
src/components/ShoppingStore/ShoppingReimbursement2.vue 0 → 100644
View file @ 1becd9f4
This diff is collapsed.
src/components/Ticketing/PassengerList.vue
View file @ 1becd9f4
......@@ -126,7 +126,7 @@
<tr>
<th v-if="isShowGuoji">国际机票 <input type="checkbox" @change="checkAllbox(checkdGuoji,'guoji')" v-model="checkdGuoji"/></th>
<th v-if="isShowGuoji">国内机票 <input type="checkbox" @change="checkAllbox(checkedGuonei,'guonei')" v-model="checkedGuonei"/></th>
<th v-if="isShowGuoji">国际中断 <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')" v-model="checkedGJzd"/></th>
<th v-if="isShowGuoji">国际中段 <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')" v-model="checkedGJzd"/></th>
<th v-if="isShowGuoji">税金 <input type="checkbox" @change="checkAllbox(checkedshuijin,'shuijin')" v-model="checkedshuijin"/></th>
<th v-if="isShowGuoji">升舱 <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')" v-model="checkedsc"/></th>
<th>旅客姓名</th>
......@@ -486,9 +486,10 @@
let orderObj = {
OrderID: 0,
OrderSource: 4,
Obj: {},
Obj: JSON.parse(this.$route.query.Obj),
SourceID: this.$route.query.id,
TCIDList: [],
TCIDList: JSON.parse(this.$route.query.TCIDList),
companyIDList:JSON.parse(this.$route.query.companyIDList),
isFromPassenger:true,
}
this.$router.push({
......
src/components/Ticketing/TicketManager.vue
View file @ 1becd9f4
......@@ -1339,6 +1339,17 @@
<span class="_blu_text">{{$t('Airticket.Air_blueType')}}：</span>
{{$t('Airticket.Air_EconomyClass')}}
</li>
<li> <span style="color:#4BCA81 ;">√：</span>
<span >全部出票</span>
</li>
<li>
<span style="color: #E95252;">O：</span>
<span > 已出中段/部分出票</span>
</li>
<li>
<span style="color:#E95252 ;">X：</span>
<span >未处理</span>
</li>
</ul>
<div class="_ol_info" :class="addShow==true||command==true?'_edHeight':''">
<ul class="_ol_list" v-loading="loading">
......@@ -1377,7 +1388,7 @@
</div>
</div>
</el-col>
<el-col :span="6" class="vmiddle">
<el-col :span="5" class="vmiddle">
<div class="TMN_Seat">
<div class="TK_SeatList">
<ul class="clearfix">
......@@ -1456,9 +1467,19 @@
</div>
</div>
</el-col>
<el-col :span="1">
<div><ul>
<!--出票状态-->
<li style="font-size:18px;">
<span style="color: #4BCA81;" v-if="item.TicketState==1">√</span>
<span class="colorE95252" v-else>{{item.TicketState=='0'?"x":"O"}}</span>
</li>
</ul></div>
</el-col>
<el-col :span="4" class="vmiddle">
<div class="TK_raduis">
<ul>
<!--一定-->
<li v-if="item.FirstDeposit!=''">
<div @click="goFinacePage(item,1)" :class="getClass(item.FirstDepositStatus)">
......@@ -1516,7 +1537,7 @@
</div>
</li>
<!--尾款-->
<li v-if="item.FinalPayment!=''&&item.FirstDeposit==''&&item.SecondDeposit==''&&item.ThirdDeposit==''&&item.FourthDeposit==''">
<!-- <li v-if="item.FinalPayment!=''&&item.FirstDeposit==''&&item.SecondDeposit==''&&item.ThirdDeposit==''&&item.FourthDeposit==''">
<div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
......@@ -1528,9 +1549,9 @@
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
</li> -->
<li v-else-if="item.FinalPayment!=''">
<div @click="goCustomList('PassengerList',item,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
<div @click="goCustomList('PassengerList',item, 5,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
</el-tooltip>
......@@ -1562,8 +1583,9 @@
<p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
</div>
</el-col>
<el-col :span="3" class="vmiddle">
<el-button-group size="mini">
<el-col :span="3" class="">
<div>
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="iconfont icon-Edit" @click="getEntityExtend(item.ID)"></el-button>
</el-tooltip>
......@@ -1613,6 +1635,24 @@
</el-popover>
</el-tooltip>
</el-button-group>
</div>
<div style="margin-top:5px;" >
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" content="出票完成" placement="top-start" v-show="item.TicketState!=1">
<el-button type="primary" icon="iconfont icon-ico_shezhi" @click="UpdateTicketState(item.ID,1)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="已出中段" placement="top-start" v-show="item.TicketState==0">
<el-button type="primary" icon="iconfont icon-ico_shezhi" @click="UpdateTicketState(item.ID,2)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="部分出票" placement="top-start" v-show="item.TicketState==0">
<el-button type="primary" icon="iconfont icon-ico_shezhi"
@click="UpdateTicketState(item.ID,3)" ></el-button>
</el-tooltip>
</el-button-group>
</div>
</el-col>
</el-row>
......@@ -2516,15 +2556,18 @@
});
},
//跳转至旅客名单
goCustomList(path, obj, title){
goCustomList(path, obj, type, title){
this.$router.push({
name: path,
query: {
blank: 'y',
isFromTk:true,
id: obj.ID,
TCIDList: obj.TCIDList,
companyIDList: obj.OutBranchIdList,
Obj: JSON.stringify({
Type: type
}),
TCIDList: JSON.stringify(obj.TCIDList),
companyIDList: JSON.stringify(obj.OutBranchIdList),
tab: title
}
})
......@@ -2786,6 +2829,23 @@
},
err => {}
);
}, // 修改 根据ID获取信息
UpdateTicketState(ID,TicketState) {
this.apipost(
"AirTicket_get_UpdateTicketState", {
ID: ID,
TicketState:TicketState
},
res => {
if (res.data.resultCode == 1) {
this.Success("操作成功");
this.getList();
} else {
this.Warning(res.data.message);
}
},
err => {}
);
},
//根据航空公司ID 获取机场列表
getAirportNameList(AirLineID, type) {
......
src/components/activity/MemberLevel.vue
View file @ 1becd9f4
<template>
<div class="flexOne">
<div class="query-box">
<ul class="user_time_picker">
<ul class="user_time_picker">
<li>
<input type="button" @click=" " class="hollowFixedBtn" value="查询">
<input type="button" @click="outerVisible = true,dialogTitle=$t('active.ad_addad'),resetInfo()" class="normalBtn" :value="$t('pub.addBtn')">
<span>
<em>等级名称</em>
<el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>状态</em>
<el-select filterable v-model="msg.state">
<el-option label="不限" :value="-1"></el-option>
<el-option label="正常" :value="1"></el-option>
<el-option label="禁用" :value="0"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" value="查询">
<input type="button" @click="outerVisible = true,dialogTitle='新增等级',resetInfo()" class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
......@@ -13,27 +29,31 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>会员等级</th>
<th>等级名称</th>
<th>积分</th>
<th>特权</th>
<th>升降级标准</th>
<th>星级有效期延长的条件</th>
<th>特权信息</th>
<th>交易金额要求</th>
<th>交易人头要求</th>
<th>等级说明</th>
<th>状态</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.rank}}</td>
<td>{{item.awardName}}</td>
<td>{{item.awardCount}}</td>
<td>{{item.awardWinningCount}}</td>
<td>223</td>
<td>22</td>
<td>{{item.name}}</td>
<td>
<span v-for="son in item.jurisdictionList">
{{son.name}}
</span>
</td>
<td>{{item.tradeMoneyReq}}</td>
<td>{{item.tradePeopleReq}}</td>
<td>{{item.remark}}</td>
<td>{{item.state === 1 ? '正常' : '禁用'}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle=$t('active.ld_editInfo'),updateData(item)"
@click="outerVisible=true,dialogTitle='修改等级',updateData(item)"
></el-button>
</el-tooltip>
</td>
......@@ -48,33 +68,32 @@
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<table class="layerTable layerNoIcon">
<tr>
<td>
<el-form-item label="会员等级" prop="memberLevel">
<el-input v-model="addMsg.memberLevel" class="w217" />
<el-form-item label="等级名称" prop="name">
<el-input v-model="addMsg.name" class="w217" />
</el-form-item>
</td>
<td>
<el-form-item label="等级名称" prop="memberName">
<el-input v-model="addMsg.memberName" class="w217" />
<el-form-item label=" 等级状态" prop="state">
<el-select filterable v-model="addMsg.state">
<el-option label="正常" :value="1"></el-option>
<el-option label="禁用" :value="0"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<td>
<el-form-item label="积分" prop="integral">
<el-input v-model="addMsg.integral" class="w217" />
<el-form-item label="交易金额要求" prop="tradeMoneyReq">
<el-input v-model="addMsg.tradeMoneyReq" placeholder="0为无要求" class="w217" />
</el-form-item>
</td>
<td>
<el-form-item label="特权" prop="privilege" >
<el-select filterable v-model="addMsg.privilege" class="w217" >
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in awardRelationList" :label="item.couponsName" :value="item.couponId" :key="item.couponId"></el-option>
</el-select>
<el-form-item label="交易人头数要求" prop="tradePeopleReq" >
<el-input v-model="addMsg.tradePeopleReq" placeholder="0为无要求" class="w217" />
</el-form-item>
</td>
</tr>
......@@ -107,22 +126,23 @@ export default {
return {
//请求
msg: {
lotteryId: '',
state: -1,
name: '',
},
addMsg:{
id:0,
memberLevel: '',
memberName: '',
integral: '',
privilege: '',
standard: '',
condition: ''
id:0,
name: '',
state: '',
tradeMoneyReq: '',
tradePeopleReq: '',
remark: '',
jurisdictionList: []
},
rules:{
memberLevel: [{ required: true, message: '请输入会员等级', trigger: "blur" }],
memberName: [{ required: true, message: '请输入等级名称', trigger: "blur" }],
integral: [{required: true, message: '请输入积分', trigger: "blur"}],
privilege: [{ required: true, message: '请选择特选', trigger: "change" }],
name: [{ required: true, message: '请输入等级名称', trigger: "blur" }],
tradeMoneyReq: [{required: true, message: '交易金额要求', trigger: "blur"}],
tradePeopleReq: [{ required: true, message: '交易人头数要求', trigger: "change" }],
standard: [{ required: true, message: '请输入升降级标准', trigger: "blur" }],
condition: [{ required: true, message: '请输入星级有效期延长的条件', trigger: "blur" }],
},
......@@ -134,8 +154,7 @@ export default {
};
},
mounted() {
this.msg.lotteryId = this.$route.query.lotteryId;
// this.getList();
this.getList();
},
filters: {
},
......@@ -144,7 +163,7 @@ export default {
//获取数据
getList() {
this.loading = true;
this.apiJavaPost("/api/sell/lottery/getLotteryAwardList", this.msg, res => {
this.apiJavaPost("/api/member/getmemberrate", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......
src/components/leaderPay2.vue
View file @ 1becd9f4
......@@ -161,7 +161,7 @@
</div>
</td>
<td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
<template v-for='(sitem,sindex) in item.DiningSummaryList'>
{{sitem.Remarks}}
</template>
</td>
......
src/router/config.js
View file @ 1becd9f4
......@@ -1170,7 +1170,16 @@ export default {
meta: {
title: '购物报账'
},
}, {
},
{
path: '/ShoppingReimbursement2', //分公司购物报账
name: 'ShoppingReimbursement2',
component: resolve => require(['@/components/ShoppingStore/ShoppingReimbursement2'], resolve),
meta: {
title: '分公司购物报账'
},
},
{
path: '/ShoppingReimbursementDetails', //购物报账 详情
name: 'ShoppingReimbursementDetails',
component: resolve => require(['@/components/ShoppingStore/ShoppingReimbursementDetails'], resolve),
......
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