Skip to content

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

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

parents 4977548e 1d066509
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 17 deletions
src/components/SalesModule/enrollTotal.vue
View file @ b42f5fef
......@@ -214,6 +214,10 @@
</td>
<td>
{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
<br/>
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
</span>
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td>
......
src/components/SalesModule/groupTourOrder.vue
View file @ b42f5fef
......@@ -1572,6 +1572,10 @@
@click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference"
@click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ b42f5fef
......@@ -1572,6 +1572,10 @@
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td style="color:#FF9C00">
......@@ -1916,6 +1920,10 @@
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td style="color:#FF9C00">
......
src/components/Supplier/roomQuery.vue
View file @ b42f5fef
<template>
<div>
<div class="roomQuery">
<div class="query-box" style="border-bottom: none;">
<ul style="position:relative;">
<li>
......@@ -102,13 +102,18 @@
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="font-size:12px;padding:2px 4px 3px 20px; color:red">注意事项:每次导出数据最好不要超过一个月。</div><br/>
<div style="font-size:12px;padding:2px 4px 3px 20px;">颜色说明: <a>未操作</a> <a>操作中</a> <a>操作完成</a> <a>机位数和人数不相符</a> 。</div>
<div style="font-size:12px;padding:2px 4px 3px 20px;">
<div style="display:inline-block;color:red">注意事项:每次导出数据最好不要超过一个月。</div>
<div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span class="rq_span4">机位数和人数不相符</span>
</div>
</div><br/>
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
<tr>
<th width="100">序号</th>
<th width="120">出发地</th>
<th width="100">公司团号</th>
<th width="80">团队状态</th>
<th width="100">系列</th>
<th width="120">机位总数<br />(Y/E/F)</th>
<th width="100">时间</th>
......@@ -130,6 +135,10 @@
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.TCNUMS}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<span v-if="subItem.TCState==3&&subItem.Status==1">正常</span>
<span v-else>取消</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.LineteamIdNames}}
......@@ -176,16 +185,17 @@
<template v-else-if="childItem.SupplierHotelStatus==2"><a style="color:blue">操作完成</a></template>
</template>
</td>
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<el-tooltip class="item" effect="dark" content="操作信息" placement="top-start">
<el-popover placement="bottom" width="460" trigger="click">
<el-popover placement="bottom" width="500" trigger="click">
<table>
<tr>
<th width="100">
<th width="90">
时间
</th>
<th width="150">
<th width="160">
酒店
</th>
<th width="100">
......@@ -200,7 +210,7 @@
<td>
{{opItem.CheckInDateStr}}
</td>
<td>
<td style="padding-right:10px;">
{{opItem.NewHotelName}}
</td>
<td>
......@@ -240,7 +250,7 @@
</tr>
<template v-if="subItem.SupplierRemarks">
<tr v-if="subIndex==0" :class="{roomQuerySplitTrCss:index%2!=0}">
<td colspan="8" class="redTip">
<td colspan="9" class="redTip">
<p>备注：{{subItem.SupplierRemarks}}</p>
</td>
</tr>
......@@ -626,5 +636,28 @@
color: red;
padding-left: 5px;
}
.roomQuery .rq_comSpan{
font-size:14px;
margin-left: 20px;
}
.roomQuery .rq_comSpan>span{
display: inline-block;
padding:2px 4px;
color:#fff;
border-radius:5px;
margin-right:10px;
}
.roomQuery .rq_span1{
background-color: #333;
}
.roomQuery .rq_span2{
background-color: #7abd53;
}
.roomQuery .rq_span3{
background-color: blue;
}
.roomQuery .rq_span4{
background-color: red;
}
</style>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ b42f5fef
......@@ -1554,6 +1554,10 @@
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
</td>
<td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td>
......@@ -1797,6 +1801,10 @@
slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<br/>
<span v-if="childItem.RefuseVisaNum>0" style="color:red">
(拒签 {{childItem.RefuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td class="nowrap">{{childItem.TC_Price}}</td>
......@@ -2131,6 +2139,10 @@
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo"
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td>{{item.TC_Price}}</td>
......@@ -3081,6 +3093,7 @@
if (res.data.resultCode === 1) {
this.$message.success(res.data.message)
this.getList()
this.FyongLoading = false
} else {
this.$message.error(res.data.message)
}
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ b42f5fef
......@@ -157,10 +157,10 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
<tr>
<th width="50">{{$t('active.ad_xuhao')}}</th>
<th width="60">{{$t('Operation.Op_chutuan')}}</th>
<th width="100">{{$t('Operation.Op_chutuan')}}</th>
<th width='120'>{{$t('Operation.Op_TeamName')}}</th>
<th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="130">团期编号</th>
<th width="80">团期编号</th>
<th width="80">{{$t('Operation.Op_jinchudian')}}</th>
<th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
<th width="50">{{$t('Operation.Op_price')}}</th>
......@@ -179,7 +179,7 @@
'Rs_Start4':item.StartCityNum==4,'Rs_Start5':item.StartCityNum==5,'Rs_Start6':item.StartCityNum==6,
'Rs_Start7':item.StartCityNum==7,'Rs_Start8':item.StartCityNum==8,'Rs_Start9':item.StartCityNum==9,
'Rs_Start10':item.StartCityNum==10,'Rs_Start11':item.StartCityNum==11,'Rs_Start12':item.StartCityNum==12,'Rs_Start13':item.StartCityNum==13}">
{{item.StartCityName}}</td>
{{item.StartCityName}} ({{item.OutBranchName}})</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="goUrlTCList('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ b42f5fef
......@@ -231,7 +231,11 @@
</p>
<p style="max-width: 160px;display: block;text-decoration:underline;cursor:pointer;" title="点击跳转到报名清单" class="over_ellipsis" :title="item.ltName" @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">{{item.ltName}}</p>
</td>
<td>{{item.guestNum}}</td>
<td>{{item.guestNum}}
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
</span>
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td>
<td>
......
src/components/activity/addIntegralMall.vue
View file @ b42f5fef
......@@ -617,8 +617,8 @@ export default {
let obj = localStorage.editIntegralMall ? JSON.parse(localStorage.editIntegralMall) : false
if (obj) {
this.addMsg = obj
this.apiUrl = 'updateGoodsInfo'
if (obj.images) {
this.apiUrl = 'updateGoodsInfo'
this.DiningImageArray = obj.images.split(',')
this.DiningImageArray2 = obj.descripImg.split(',')
}
......
src/components/scenicSpot/scenicSpotPackagePrice.vue
View file @ b42f5fef
......@@ -394,7 +394,7 @@ input[type="number"] {
<el-col :span="2">
<div class="LM_BTNList">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" circle icon="el-icon-edit" @click="isShowDIv = true,divTitle='修改报价',updateData(index)"></el-button>
<el-button type="primary" circle icon="el-icon-edit" @click="isShowDIv = true,divTitle='修改报价',updateData(item.ID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" circle icon="el-icon-delete" @click="isdelete(item.ID)"></el-button>
......@@ -691,9 +691,17 @@ export default {
this.addMsg.CurrentRate = "";
},
//修改报价信息
updateData(index) {
var ticketPrice = this.tableData[index];
this.addMsg = JSON.parse(JSON.stringify(ticketPrice));
updateData(ID) {
this.apipost(
"ticketcouponsprice_post_Get",
{ID:ID},
res => {
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
}
},
err => {}
);
},
//获取所有币种
getAllCurrency() {
......
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