Skip to content

S
SuperMan
Commit 01e3018c authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 05bb24b2 edc79629
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 35 deletions
src/components/SalesModule/productQuery.vue
View file @ 01e3018c
......@@ -673,7 +673,10 @@
</div>
<div class="d4">
<p><i class="iconfont icon-jiage"></i>价格信息</p>
<p style="color:#47BF8C; font-size: 16px; font-weight: bold; margin: 5px 0;">￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p>
<p style="color:#47BF8C; font-size: 16px; font-weight: bold; margin: 5px 0;">
同业价:￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}<br/>
直客价:￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}
</p>
<p>
<el-popover width="630" trigger="click">
<table class="PQ_detail">
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 01e3018c
......@@ -606,13 +606,22 @@
display: inline-block;
float: left;
width: 36px;
white-space: nowrap;
font-size: 14px;
}
/*OP备注*/
.RL-opremarkTitle {
display: inline-block;
float: left;
width: 53px;
white-space: nowrap;
font-size: 14px;
}
.RegistrationList .RL-remarkCon {
float: left;
display: inline-block;
/* float: left;
display: inline-block;*/
width: 94%;
font-size: 14px;
}
......@@ -1512,12 +1521,12 @@
<tr>
<td colspan="12" class="RL_Order">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList" @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
</p>
<p class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
</span>
</p>
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
</tr>
......@@ -1525,13 +1534,13 @@
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon">{{item.Remarks}}</span>
<p class="RL-redType RL-remarkCon">{{item.Remarks}}</p>
</div>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</span>
<span class="RL-opremarkTitle">OP备注:</span>
<p class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</p>
</div>
</td>
<td colspan="5" style="height: 40px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
......@@ -1548,7 +1557,6 @@
</td>
</tr>
</tbody>
<template v-for="(subItem,subIndex) in OrderDataList.OtherOrderList">
<tr>
<td colspan="14">
......@@ -1714,16 +1722,17 @@
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon">
<p class="RL-redType RL-remarkCon">
<span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
{{childItem.PlatformOrder}};</span>
{{childItem.Remarks}}
</span>
</p>
</div>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">OP备注:</span>
<span class="RL-opremarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
</div>
</td>
......@@ -1939,7 +1948,7 @@
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">OP备注:</span>
<span class="RL-opremarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</span>
</div>
</td>
......@@ -1963,27 +1972,18 @@
<div class="combottomTitle">设置领队</div>
<div class="clearfix">
<el-form label-width="100px">
<el-col :span="4" style="display:none">
<el-form-item label="目的地国家">
<el-select v-model="leaderQueryMsg.CountryID" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('system.ph_buxian')" :value='DefaultSelectValue'></el-option>
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" style="display:none">
<el-form-item label="工作类型">
<el-select v-model="leaderQueryMsg.GetLeaderType" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in workTypeList" :key="item.Value" :label="item.Key" :value="item.Value">
<el-col :span="4">
<el-form-item label="所属公司">
<el-select v-model="leaderQueryMsg.RB_Branch_id" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in BranchList" :key="item.Id" :label="item.BName" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属公司">
<el-select v-model="leaderQueryMsg.RB_Branch_id" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in BranchList" :key="item.Id" :label="item.BName" :value="item.Id">
<el-form-item label="工作类型">
<el-select v-model="leaderQueryMsg.LeaderType" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in leaderTypeArray" :key="item.Id" :label="item.Text" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
......@@ -2059,8 +2059,6 @@
</div>
</div>
</div>
<div class="groupTourOrder_transfer" v-show="transferData.show">
<div class="transfer_header">
<div>订单转团</div>
......@@ -2425,10 +2423,14 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
leaderQueryMsg: {
QTCID: 0,
CountryID: 0,
GetLeaderType: '1',
LeaderType: 2,
RB_Branch_id: 0,
LeaderName: ""
},
leaderTypeArray:[
{Id:2,Text:"领队兼导游"},
{Id:1,Text:"领队"}
],
//国家列表
countryList: [],
//工作类型
......@@ -3726,6 +3728,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
//查询领队
getLeaderList() {
this.loadingSet = true;
this.leaderListArr==[];
this.apipost(
"LeaderSchedule_get_GetPriceCanUseLeader", this.leaderQueryMsg,
res => {
......@@ -3733,7 +3736,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
if (res.data.resultCode == 1) {
this.leaderListArr = res.data.data.LeaderData;
this.ScheduleArray=res.data.data.ScheduleData;
if (this.leaderQueryMsg.GetLeaderType == 1) {
if (this.leaderQueryMsg.LeaderType == 1) {
this.isLeaderType = '领队'
} else {
this.isLeaderType = '领兼地'
......
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