Skip to content

S
SuperMan
Commit 67f31978 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 371384cc 3a4f0fb8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 482 additions and 149 deletions
src/App.vue
View file @ 67f31978
......@@ -108,7 +108,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_p33f7rq158p.css";
@import "//at.alicdn.com/t/font_635492_a59svrd6x1.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/assets/common/lang/jp.js
View file @ 67f31978
......@@ -627,3 +627,76 @@ export const advmanager = {
export const insManage = {
im_acc:'従属アカウント',
}
export const active = {
ld_name: '受賞の名前',
ld_name2: '受賞の名前',
ld_status: '抽選の状態',
ld_jinyong: '禁用',
ld_addld: '入賞を新たにする',
ld_cjcs: '抽選回数(一人当たり)',
ld_editInfo: '抽選情報を修正する',
ld_seeDr: '賞を調べる',
ld_deletAC: 'イベントを削除',
ld_noData: 'あなたの必要なデータを見つけることができません。',
ld_cjNum: '抽選回数',
ld_cjRule: '抽選規則',
ld_djscwj: 'クリック/引っ張る',
ad_addad: '賞を追加する',
ad_xuhao: 'シリアル番号',
ad_adName: '賞の名',
ad_allNum: '賞の数',
ad_num: '当選数',
ad_endNum: '残りの数',
ad_status: '賞の状態 ',
ad_type: '賞のタイプ',
ad_thankCome: 'ありがとう参加',
ad_ybjx: '一般賞',
ad_yhq: 'クーポン',
ad_jxgl: '賞の関連',
ad_ssxl: '所属シリーズ',
ad_xlmc: 'シリーズ名',
cl_couponName: 'クーポンの名前',
cl_yizuofei: 'もう廃れた',
cl_addCoupon: '追加クーポン',
cl_couponNum: 'クーポンの数',
cl_ffzongliang: '数を支給する',
cl_sytiaojian: '使用条件',
cl_miane: '額面',
cl_djshiyong: '重ねて使用する',
cl_sxriqi: '発効日',
cl_sxzhuangtai: '発効状態',
cl_gqriqi: '期限切れの期日',
cl_addPp: '創建者',
cl_dyquan: '相殺券',
cl_zkquan: '割引券',
cl_byxu: '許さない',
cl_yuncu: '許可する',
cl_sxzhong: '発効中',
cl_wsxiao: '未発効',
cl_ygqi: '期限が切れた',
cl_deleteCoupon: 'クーポンを削除',
cl_couponType: 'クーポンのタイプ',
cl_yhqmiane: 'クーポンの額面',
cl_dkjezk: '金額を控除する/割引',
cl_mdskeyong: '満了する',
cl_yxjzhiri: '有効期限',
cl_zuofei: '廃棄する',
cl_syfanwei: '適用範囲',
cl_tongyong: '通用する',
cl_team: 'チーム',
cl_qianzheng: 'ビザ',
cl_jipiao: '航空券',
cl_wsyong: '未使用',
cl_ysyong: '使用済み',
cl_yzfei: 'もう廃れた',
cl_hdtujing: '方法を得る',
cl_hdqudao: 'ルートを得る',
cl_syzhuangtai: '使用状態',
cl_orderType: '注文タイプ',
cl_syriqi: '使用日',
cl_user: 'ユーザー',
cl_hdriqi: '日付を得る',
cl_choujiang: '賞をもらう',
cl_zanwu: '見送る',
cl_qita: '其他',
}
\ No newline at end of file
src/assets/common/lang/zh.js
View file @ 67f31978
......@@ -652,6 +652,55 @@ export const active = {
ad_status: '奖项状态',
ad_type: '奖项类型',
ad_thankCome: '谢谢参与',
ad_ybjx: '一般奖项',
ad_yhq: '优惠券',
ad_jxgl: '奖项关联',
ad_ssxl: '所属系列',
ad_xlmc: '系列名称',
cl_couponName: '优惠券名称',
cl_yizuofei: '已作废',
cl_addCoupon: '新增优惠券',
cl_couponNum: '优惠券数量',
cl_ffzongliang: '发放数量',
cl_sytiaojian: '使用条件',
cl_miane: '面额',
cl_djshiyong: '叠加使用',
cl_sxriqi: '生效日期',
cl_sxzhuangtai: '生效状态',
cl_gqriqi: '过期日期',
cl_addPp: '创建人',
cl_dyquan: '抵用券',
cl_zkquan: '折扣券',
cl_byxu: '不允许',
cl_yuncu: '允许',
cl_sxzhong: '生效中',
cl_wsxiao: '未生效',
cl_ygqi: '已过期',
cl_deleteCoupon: '删除优惠券',
cl_couponType: '优惠券类型',
cl_yhqmiane: '优惠券面额',
cl_dkjezk: '抵扣金额/折扣',
cl_mdskeyong: '满多少可用',
cl_yxjzhiri: '有效截止日',
cl_zuofei: '作废',
cl_syfanwei: '适用范围',
cl_tongyong: '通用',
cl_team: '团队',
cl_qianzheng: '签证',
cl_jipiao: '机票',
cl_wsyong: '未使用',
cl_ysyong: '已使用',
cl_yzfei: '已作废',
cl_hdtujing: '获得途径',
cl_hdqudao: '获得渠道',
cl_syzhuangtai: '使用状态',
cl_orderType: '订单类型',
cl_syriqi: '使用日期',
cl_user: '用户',
cl_hdriqi: '获得日期',
cl_choujiang: '抽奖',
cl_zanwu: '暂无',
cl_qita: '其他',
}
export const rule = {
company: '请选择公司',
......
src/assets/css/newTravelManager.css
View file @ 67f31978
......@@ -1647,7 +1647,6 @@
}
.TC_Content {
width: 100%;
height:100%;
min-height: 500px;
padding:0 10px;
background-color: #fff;
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 67f31978
......@@ -1346,8 +1346,11 @@ export default {
this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
if(this.msg.endDate!=""){
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
}
if(this.msg.LineId>0){
this.msg.DataType="1";
}
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ 67f31978
......@@ -638,6 +638,48 @@
</script>
<style>
.personNolayer p {
height: 28px;
line-height: 28px;
padding-left: 15px;
}
.personNolayer p > span {
font-size: 12px;
color: #333;
margin-right: 25px;
}
.personNolayer table {
padding: 10px 0 0 20px;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.personNolayer table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.personNolayer table ._color_666 {
color: #666666;
}
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
.enrollTotalSearch {
width: 100%;
min-height: auto;
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ 67f31978
......@@ -157,7 +157,7 @@
<el-tooltip v-else class="item" effect="dark" content="修改备注" placement="top-start">
<el-button type="primary" style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-img_bianji_small" @click='getDetail(item,true)'></el-button>
</el-tooltip>
<el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="结算" placement="top-start">
<el-tooltip v-if="item.visaOrderStatus==1" effect="dark" content="结算" placement="top-start">
<el-button type="primary" style='background:#5EBB64; border-color:#5EBB64' @click='goUrl(item)' icon="iconfont icon-qian"></el-button>
</el-tooltip>
<el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="旅客名单" placement="top-start">
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 67f31978
......@@ -387,6 +387,9 @@
display: block;
}
.shoppingStore .combottomDiv{height:400px;}
.IsConflict td{
background-color:pink!important;
}
/* 购物店 */
</style>
<template>
......@@ -593,7 +596,7 @@
<th>币种</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in importData" :key="item.subCode">
<tr v-for="(item,index) in importData" :key="item.subCode" :class="{'IsConflict':item.IsConflict==1}">
<td :class="{'redType':item.TCIDExist==-1}">
<el-input v-model="item.TCNUM" class="w150"></el-input>
</td>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 67f31978
......@@ -1570,6 +1570,7 @@
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo
this.flagWangYue = this.$route.query.flag
this.$route.query.tcmun = this.$route.query.tcmun
if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun
}
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 67f31978
......@@ -710,6 +710,47 @@ export default {
</script>
<style>
.personNolayer p {
height: 28px;
line-height: 28px;
padding-left: 15px;
}
.personNolayer p > span {
font-size: 12px;
color: #333;
margin-right: 25px;
}
.personNolayer table {
padding: 10px 0 0 20px;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.personNolayer table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.personNolayer table ._color_666 {
color: #666666;
}
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
.enrollTotalSearch {
width: 100%;
min-height: auto;
......
src/components/activity/CouponDetail.vue
View file @ 67f31978
......@@ -7,11 +7,11 @@
<ul class="user_time_picker">
<li>
<span>
<em>状态</em>
<em>{{$t('admin.admin_status')}}</em>
<el-select filterable v-model="msg.useState">
<el-option label="未使用" value="1"></el-option>
<el-option label="已使用" value="2"></el-option>
<el-option label="已作废" value="3"></el-option>
<el-option :label="$t('active.cl_wsyong')" value="1"></el-option>
<el-option :label="$t('active.cl_ysyong')" value="2"></el-option>
<el-option :label="$t('active.cl_yzfei')" value="3"></el-option>
</el-select>
</span>
</li>
......@@ -19,7 +19,7 @@
<input
type="button"
class="hollowFixedBtn"
value="查询"
:value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()"
>
</li>
......@@ -27,43 +27,42 @@
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>获得途径</th>
<th>获得渠道</th>
<th>使用状态</th>
<th>订单号</th>
<th>订单类型</th>
<th>使用日期</th>
<th>类型</th>
<th>用户</th>
<th>获得日期</th>
<th>{{$t('active.cl_hdtujing')}}</th>
<th>{{$t('active.cl_hdqudao')}}</th>
<th>{{$t('active.cl_syzhuangtai')}}</th>
<th>{{$t('hotel.order_Number')}}</th>
<th>{{$t('active.cl_orderType')}}</th>
<th>{{$t('active.cl_syriqi')}}</th>
<th>{{$t('system.query_type')}}</th>
<th>{{$t('active.cl_user')}}</th>
<th>{{$t('active.cl_hdriqi')}}</th>
<!-- <th>操作</th> -->
</tr>
<tr v-for="(item,index) in DataList" v-loading="loading">
<td>
<span v-if="item.accessType == 1">抽奖</span>
<span v-if="item.accessType == 1">{{$t('active.cl_choujiang')}}</span>
</td>
<td>{{item.acessName}}</td>
<td>
<span v-if="item.useState == 1" style="color: green">未使用</span>
<span v-if="item.useState == 2" style="color: gary">已使用</span>
<span v-if="item.useState == 3" style="color: red">已作废</span>
<span v-if="item.useState == 1" style="color: green">{{$t('active.cl_wsyong')}}</span>
<span v-if="item.useState == 2" style="color: gary">{{$t('active.cl_ysyong')}}</span>
<span v-if="item.useState == 3" style="color: red">{{$t('active.cl_yzfei')}}</span>
</td>
<td>
<span v-if="item.orderId === 0">暂无</span>
<span v-if="item.orderId === 0">{{$t('active.cl_zanwu')}}</span>
<span v-else>{{item.orderId}}</span>
</td>
<td>
<span v-if="item.orderType === 0">暂无</span>
<span v-if="item.orderType === 0">{{$t('active.cl_zanwu')}}</span>
<span v-else>
<span v-if="item.orderType == 1">团队</span>
<span v-if="item.orderType == 2">签证</span>
<span v-if="item.orderType == 3">机票</span>
<span v-if="item.orderType == 1">{{$t('active.cl_team')}}</span>
<span v-if="item.orderType == 2">{{$t('active.cl_qianzheng')}}</span>
<span v-if="item.orderType == 3">{{$t('active.cl_jipiao')}}</span>
</span>
</td>
<td>{{item.useDate ? item.useDate : '未使用'}}</td>
<td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
<td>{{item.userPlatform === 1 ? "B2B" : "其他"}}：{{item.userName}}</td>
<td>{{item.useDate ? item.useDate : $t('active.cl_wsyong')}}</td>
<td>{{item.couponsType ===1 ? $t('active.cl_dyquan') : $t('active.cl_zkquan')}}</td>
<td>{{item.userPlatform === 1 ? "B2B" : $t('active.cl_qita')}}：{{item.userName}}</td>
<td>{{item.acessDate}}</td>
<!-- <td>
<el-tooltip class="item" effect="dark" content="修改用户信息" placement="top">
......@@ -88,7 +87,7 @@
</table>
<div class="noDataNotice" v-if="DataList.length<1">
<i class="iconfont icon-kong"></i>
<p>没有找到你需要的数据</p>
<p>{{$t('active.ld_noData')}}</p>
</div>
<el-pagination
background
......
src/components/activity/CouponList.vue
View file @ 67f31978
This diff is collapsed.
src/components/activity/LuckyDraw.vue
View file @ 67f31978
......@@ -112,8 +112,8 @@
<em>{{$t('active.ld_status')}}</em>
<el-select filterable v-model="msg.lotteryStatus">
<el-option :label="$t('system.ph_buxian')" :value="0"></el-option>
<el-option :label="$t('pub.normalSel')" label="正常" :value="1"></el-option>
<el-option :label="$t('active.ld_jinyong')" label="禁用" :value="2"></el-option>
<el-option :label="$t('pub.normalSel')" :value="1"></el-option>
<el-option :label="$t('active.ld_jinyong')":value="2"></el-option>
</el-select>
</span>
</li>
......@@ -135,7 +135,7 @@
<th>{{$t('admin.admin_company')}}</th>
<th>{{$t('active.ld_cjcs')}}</th>
<th>{{$t('hotel.hotel_StartDate')}}</th>
<th>{{$t('hotel.hotel_StartDate')}}</th>
<th>{{$t('hotel.hotel_EndDate')}}</th>
<th>{{$t('active.ld_status')}}</th>
<th width="400">{{$t('hotel.hotel_remark')}}</th>
<th>{{$t('hotel.table_operat')}}</th>
......
src/components/activity/awardList.vue
View file @ 67f31978
......@@ -27,16 +27,16 @@
<td>{{item.awardWinningCount}}</td>
<td>{{item.awardCount-item.awardWinningCount>=0?item.awardCount-item.awardWinningCount:0}}</td>
<td>{{item.awardStatus==1? $t('pub.normalSel') : $t('active.ld_jinyong')}}</td>
<td v-if="item.awardType==1">谢谢参与</td>
<td v-if="item.awardType==2">一般奖项</td>
<td v-if="item.awardType==3">优惠券</td>
<td v-if="item.awardType==1">{{$t('active.ad_thankCome')}}</td>
<td v-if="item.awardType==2">{{$t('active.ad_ybjx')}}</td>
<td v-if="item.awardType==3">{{$t('active.ad_yhq')}}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改抽奖信息" placement="top">
<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='修改抽奖信息',updateData(item)"
@click="outerVisible=true,dialogTitle=$t('active.ld_editInfo'),updateData(item)"
></el-button>
</el-tooltip>
</td>
......@@ -57,29 +57,29 @@
<table class="layerTable layerNoIcon">
<tr>
<td>
<el-form-item label="奖项名" prop="awardName">
<el-input v-model="addMsg.awardName" class="w217" placeholder="奖项名"/>
<el-form-item :label="$t('active.ad_adName')" prop="awardName">
<el-input v-model="addMsg.awardName" class="w217" :placeholder="$t('active.ad_adName')"/>
</el-form-item>
</td>
<td>
<el-form-item label="奖项数量" prop="awardCount">
<el-form-item :label="$t('active.ad_allNum')" prop="awardCount">
<el-input v-model="addMsg.awardCount" class="w217" @keyup.native="checkInteger(addMsg,'awardCount')" placeholder="奖项数量"/>
</el-form-item>
</td>
</tr>
<td>
<el-form-item label="奖项类型" prop="awardType">
<el-form-item :label="$t('active.ad_type')" prop="awardType">
<el-select filterable v-model="addMsg.awardType" class="w217" @change="getAwardRelationId(addMsg.awardType)">
<el-option label="谢谢参与" :value="1"></el-option>
<el-option label="一般奖项" :value="2"></el-option>
<el-option label="优惠券" :value="3"></el-option>
<el-option :label="$t('active.ad_thankCome')" :value="1"></el-option>
<el-option :label="$t('active.ad_ybjx')" :value="2"></el-option>
<el-option :label="$t('active.ad_yhq')" :value="3"></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item label="奖项关联" prop="awardRelationId" v-if="addMsg.awardType==3">
<el-form-item :label="$t('active.ad_jxgl')" prop="awardRelationId" v-if="addMsg.awardType==3">
<el-select filterable v-model="addMsg.awardRelationId" class="w217" >
<el-option label="不限" :value="0"></el-option>
<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>
......@@ -87,15 +87,15 @@
</tr>
<tr>
<td>
<el-form-item label="排序" prop="rank">
<el-input v-model="addMsg.rank" class="w217" @keyup.native="checkInteger(addMsg,'rank')" placeholder="排序"/>
<el-form-item :label="$t('system.table_rank')" prop="rank">
<el-input v-model="addMsg.rank" class="w217" @keyup.native="checkInteger(addMsg,'rank')" :placeholder="$t('system.table_rank')"/>
</el-form-item>
</td>
<td>
<el-form-item label="奖项状态" prop="awardStatus">
<el-form-item :label="$t('active.ad_status')" prop="awardStatus">
<el-select filterable v-model="addMsg.awardStatus" class="w217">
<el-option label="正常" :value="1"></el-option>
<el-option label="禁用" :value="2"></el-option>
<el-option :label="$t('pub.normalSel')" :value="1"></el-option>
<el-option :label="$t('active.ld_jinyong')" :value="2"></el-option>
</el-select>
</el-form-item>
</td>
......@@ -103,8 +103,8 @@
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取 消</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">保存</button>
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
</div>
......
src/components/busManagement/BusInfo.vue
View file @ 67f31978
......@@ -75,12 +75,29 @@
background-color: #e4e7ed;
color: #c0c4cc;
}
.busInfoDetailsDiv span{
display:inline-block;
margin-right: 20px;
}
.busInfoDetailsDiv p{
display:inline-block;
}
.busInfoDetailsDiv p:hover {
text-decoration: underline;
cursor: pointer;
}
</style>
<template>
<div class="flexOne busInfo">
<div class="bus_Notice">注：此处不和任何团队行程做绑定，如需下载车配表，请在车辆绑定团队以后再行下载</div>
<div style="margin-bottom:20px;">{{title}}</div>
<div style="width: 100%; overflow-x: auto;" class="ownScrollbarStyle">
<div class="busInfoDetailsDiv">
<span>进出点：{{InOut}}</span><span>订单人数：{{RealityNum}}</span>
<span>机位总数：{{totalFlySeat}}</span><span>领队：{{LeaderName}}</span><span>导游：{{GuideName}}</span>
<span>团号：<p @click="goUrlT('TravelControlList',TCNUMS,'团控列表')">{{TCNUMS}}</p></span>
</div>
<div style="width: 100%; overflow-x: auto;margin-top:20px;" class="ownScrollbarStyle">
<el-form :model="PostData" :rules="rules" ref="PostData">
<table class="bo_bus" cellspacing="1">
<tr>
......@@ -369,6 +386,16 @@ export default {
},
//团名
title:'',
//团号
TCNUMS:'',
//进出点
InOut:'',
//订单人数
RealityNum:'',
//机位总数
totalFlySeat:'',
LeaderName:'',
GuideName:'',
};
},
methods: {
......@@ -473,7 +500,9 @@ export default {
if (response.data.resultCode == 1) {
this.PlanTableData = response.data.data;
this.PlanTableData.forEach(x=>{
x.BookGroup = this.$route.query.NewCombinationNum;
if(x.BookGroup==''||x.BookGroup==null){
x.BookGroup = this.$route.query.NewCombinationNum;
}
})
}
},
......@@ -622,6 +651,16 @@ export default {
path: path
});
},
goUrlT(path, TCNUMS, title) {
this.$router.push({
name: path,
query: {
tcmun:TCNUMS,
blank: 'y',
tab: title
}
})
},
submitForm(addMsg) {
//提交创建、修改表单
let that = this;
......@@ -653,6 +692,14 @@ export default {
this.GeAccommodationTypeList();
this.BusId = this.$route.query.id;
this.title = this.$route.query.title;
this.TCNUMS = this.$route.query.TCNUMS,
this.InOut = this.$route.query.InOut,
this.RealityNum = this.$route.query.RealityNum,
this.totalFlySeat = this.$route.query.TotalNumber+'/'+this.$route.query.RealityYSeatNum+'/'+
this.$route.query.RealityESeatNum+'/'+this.$route.query.RealityFSeatNum
this.LeaderName = this.$route.query.LeaderName,
this.GuideName = this.$route.query.GuideName
if (this.BusId > 0) {
this.getData();
// this.forbidInput = true;
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 67f31978
......@@ -425,10 +425,18 @@
"TCID": obj.TCIDS,
StartDate: obj.StartDateStr,
DayNum: obj.DayNum,
TotalNumber: obj.TotalSeat,
TotalNumber: obj.TotalSeat, //机位总数
RealityYSeatNum:obj.CommonReport.HouseStatistics.RealityYSeatNum,
RealityESeatNum:obj.CommonReport.HouseStatistics.RealityESeatNum,
RealityFSeatNum:obj.CommonReport.HouseStatistics.RealityFSeatNum,
LeaderName:obj.LeaderName,
GuideName:obj.GuideName,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
title:obj.Titles,
TCNUMS:obj.TCNUMS,
InOut:obj.InOut,
RealityNum:obj.CommonReport.HouseStatistics.RealityNum,
tab: title
}
})
......
src/components/dmc/manager/teamReimbursement.vue
View file @ 67f31978
......@@ -557,7 +557,7 @@
name: path,
query: {
"id": obj.TCIDs,
'num': obj.CombinationNum,
NewCombinationNum: obj.TravelPriceList[0].CombinationNum,
isUpdate: true,
blank: 'y',
tab: title
......@@ -618,6 +618,7 @@
this.queryMsg.total = res.data.data.count;
this.queryMsg.noData = !this.queryMsg.total > 0;
this.queryCommonData.dataList = res.data.data.pageData;
console.log(this.queryCommonData.dataList,'datalist');
}
},
err => {}
......
src/components/index.vue
View file @ 67f31978
......@@ -1313,6 +1313,14 @@ export default {
created() {
//页面刚进入时开启长连接
// this.initWebSocket()
let language = localStorage.language
if (!language) {
this.language = 'zh-CN';
this.$i18n.locale = 'zh-CN';
} else {
this.language = language
this.$i18n.locale = language;
}
//IM_body
let allWindowWidth = window.innerWidth;
this.allWindowWidth = allWindowWidth - 50 - 220 - 60;
......@@ -1328,6 +1336,7 @@ export default {
ChangeLan(str){
this.language=str;
this.$i18n.locale = str;
localStorage.language = str;
},
settingSys: function () {
this.MsgBus.$emit('settingOpen')
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 67f31978
......@@ -398,7 +398,7 @@
<div class="TP_noneed">
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule" :false-label="UnCheckedVaule">支持儿童出游
</el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" :false-label="UnCheckedVaule" style="display:none;">订团
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" :false-label="UnCheckedVaule" style="display:none;" >订团
</el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" style="display:none;" />
</div>
......@@ -713,23 +713,32 @@
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds" :selectFilghtList="selectFilghtList"></TravelPriceFlightList>
</div>
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<!-- <table class="TphotelTable" border="0" cellspacing='1' v-if="returnPriceList.length>0">
<tr v-if="returnPriceList[0].PriceHotelList" v-for="item in returnPriceList[0].PriceHotelList">
<!-- <table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
<tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;【<span style="color:#E95252;">库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
<el-checkbox v-model="item.CheckList[index].CheckStatus" @change="changeHotelStatus(item,index)"></el-checkbox>
<el-checkbox v-model="item.CheckList[index].CheckStatus" @change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
</div>
</div>
</td>
<td>
<el-select class="w180" v-model="item.NewHotelId" @visible-change="getHotelList(item,$event)" @change="changeHotelList()" filterable>
<el-option :key="0" label="请选择" :value="0"></el-option>
<el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
<span style="float: left">{{subItem.Name}}</span>
<span style="float: right; color:red; font-size: 13px">{{ subItem.Inventory }}</span>
</el-option>
</el-select>
</td>
</tr>
</table> -->
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</div> -->
</el-dialog>
</div>
</template>
......@@ -762,8 +771,8 @@
SaleBranchIdArray: []
},
returnPriceList: this.priceList,
//选中的酒店数组
ChooseHotelArray:[],
//酒店列表
HotelList: [],
companyList: [],
offerList: [],
selectFilghtList: [],
......@@ -922,7 +931,9 @@
//是否订团，0-不订，1需要订
IsBookTeam: 0,
//是否重新生成行程数据
IsNew:false,
IsNew: false,
//选中的酒店数组
ChooseHotelArray: [],
};
}
this.returnPriceList.push(objItem);
......@@ -1351,6 +1362,53 @@
subItem.CheckStatus = false;
}
});
},
//获取选择的酒店
changeHotelList() {
this.priceData.ChooseHotelArray = [];
if (this.priceData.PriceHotelList != null && this.priceData.PriceHotelList.length > 0) {
this.priceData.PriceHotelList.forEach(x => {
var obj = {
HotelId: 0,
DayNum: 0
}
if (x.NewHotelId > 0) {
obj.HotelId = x.NewHotelId;
obj.DayNum = x.DayNum;
this.priceData.ChooseHotelArray.push(obj);
} else {
x.CheckList.forEach((y, index) => {
if (y.CheckStatus) {
obj.HotelId = x.SubList[index].HotelId;
obj.DayNum = x.SubList[index].DayNum
this.priceData.ChooseHotelArray.push(obj);
}
})
}
});
if (this.priceData.ChooseHotelArray != null && this.priceData.ChooseHotelArray.length > 0) {
this.priceData.IsNew = true;
}
}
},
//获取酒店信息
getHotelList(item, event) {
if (event) {
var msg = {
Country: 651,
sDate: item.UseDay,
IsMoreThanZero:1
};
this.apipost(
"hotel_post_GetHasStockHotelList", msg,
res => {
if (res.data.resultCode == 1) {
item.HotelList = res.data.data;
}
},
err => {}
);
}
}
},
mounted() {
......@@ -1417,4 +1475,4 @@
}
};
</script>
</script>
\ No newline at end of file
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