Skip to content

S
SuperMan
Commit 9527332d authored by 黄奎's avatar 黄奎
Browse files
Options

权限修改

parent 721b231e
Hide whitespace changes
Inline Side-by-side
Showing with 3780 additions and 3902 deletions
src/assets/utils/AuthCode.js
View file @ 9527332d
......@@ -8,6 +8,7 @@ var AuthCode = {
EditOrderCreateBy:"EditOrderCreateBy",//修改业务员
EditRoomDinnerTIcket:"EditRoomDinnerTIcket",//房餐景点修改权限
EditQuotation:"EditQuotation",//报价单修改权限
SupperOrderEdit:"SupperOrderEdit",//获取总经理副总经理超级修改权限
LookOrder:"LookOrder",//出纳查看订单权限
};
export default AuthCode;
\ No newline at end of file
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 9527332d
......@@ -252,36 +252,6 @@
.groupTourOrder_remarksBytuan {
font-size: 12px;
}
/* .groupTourOrder_remarks>div>div:nth-child(1) {
float: left;
display: flex;
align-items: flex-start;
}
.groupTourOrder_remarks>div>div:nth-child(1)>span {
line-height: 20px;
font-size: 12px;
color: #e95252;
white-space: nowrap;
}
.groupTourOrder_remarks>div>div:nth-child(1)>p {
line-height: 20px;
font-size: 12px;
color: #e95252;
}
.groupTourOrder_remarks>div>div:nth-child(2) {
float: right;
text-align: right;
font-size: 12px;
color: #e95252;
}
.groupTourOrder_remarks>div>div:nth-child(2)>i {
font-size: 10px;
cursor: pointer;
} */
.groupTourOrder_remarksBytuan>div::after {
display: block;
......@@ -785,28 +755,35 @@
margin: 5px;
text-align: center;
}
.groupts .leftSetInfo,.groupts .GO_TPright{
float:left;
.groupts .leftSetInfo,
.groupts .GO_TPright {
float: left;
}
.KT_Scenic{
width:400px;
.KT_Scenic {
width: 400px;
max-height: 400px;
overflow: auto;
}
.KT_Scenic table th{
height:30px;
border:1px solid #d1d1d1;
.KT_Scenic table th {
height: 30px;
border: 1px solid #d1d1d1;
}
.KT_Scenic table td{
padding:9px 5px!important;
.KT_Scenic table td {
padding: 9px 5px !important;
}
._TravelPricePopover .GOScenicDiv{
._TravelPricePopover .GOScenicDiv {
width: 500px;
max-height: 400px;
overflow: auto;
}
._TravelPricePopover table,.KT_Scenic table{
._TravelPricePopover table,
.KT_Scenic table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
......@@ -816,13 +793,15 @@
width: 100%;
}
._TravelPricePopover table ._color_666 ,.KT_Scenic table ._color_666{
._TravelPricePopover table ._color_666,
.KT_Scenic table ._color_666 {
background-color: #ededed;
color: #666666;
padding: 5px;
}
._TravelPricePopover table td,.KT_Scenic table td{
._TravelPricePopover table td,
.KT_Scenic table td {
background-color: #ffffff;
padding: 9px 0;
color: #333333;
......@@ -833,14 +812,16 @@
._TravelPricePopover table td._d_name {
background-color: #ededed;
}
.groupts .GO_Title{
.groupts .GO_Title {
display: inline-block;
margin-top: 10px;
padding-right:10px;
font-size:12px;
padding-right: 10px;
font-size: 12px;
width: 90px;
text-align: right;
}
.groupts .SimulateDrop-box {
width: 230px;
min-height: 34px;
......@@ -849,13 +830,15 @@
float: left;
margin-top: 4px;
border: 1px solid #d1d1d1;
}
.groupts .GO_SimulaDrop{
position: absolute;
right:10px;
top:5px;
color:#d1d1d1;
}
}
.groupts .GO_SimulaDrop {
position: absolute;
right: 10px;
top: 5px;
color: #d1d1d1;
}
.groupts .SD_flight {
display: inline-block;
height: 24px;
......@@ -864,28 +847,32 @@
max-width: 200px;
white-space: nowrap;
text-overflow: ellipsis;
font-size:12px;
font-size: 12px;
padding: 0 8px;
line-height: 22px;
background-color: #f0f2f5;
}
.GO_Contract{
color:blue;
.GO_Contract {
color: blue;
display: inline-block;
cursor: pointer;
margin-right: 20px;
}
.SQguestList{
.SQguestList {
display: flex;
flex-wrap: wrap;
}
.SQguestList label{
.SQguestList label {
display: inline-block;
min-width: 100px;
display: flex;
align-items: center;
margin-top: 8px;
}
</style>
<template>
......@@ -915,7 +902,8 @@
</el-select>
</el-form-item>
<el-form-item v-if="addMsg.GroupType == '3'" label="是否用房" prop="GroupTypeNeedHouse">
<el-switch @change="$forceUpdate()" v-model="addMsg.GroupTypeNeedHouse" active-value="0" inactive-value="1"></el-switch>
<el-switch @change="$forceUpdate()" v-model="addMsg.GroupTypeNeedHouse" active-value="0"
inactive-value="1"></el-switch>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -935,45 +923,7 @@
</el-select>
<el-input v-else v-model='addMsg.allName' :disabled="true"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4">
<el-form-item label="出发城市" prop="DepartureCityId">
<el-select filterable v-model='addMsg.DepartureCityId' filterable :placeholder="$t('pub.pleaseSel')" @change="addMsg.IsIntermodal=2">
<el-option
v-for="item in startCityList"
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否联运" prop="IsIntermodal" v-show="addMsg.DepartureCityId!=SetOutCityId">
<el-switch v-model="addMsg.IsIntermodal" active-value="1" inactive-value="2" @change='getUnionTravelPrice(addObj,1)'></el-switch>
</el-form-item>
<el-form-item label="联运时间" prop="GoCityTime" v-show='addMsg.IsIntermodal==1&&addMsg.DepartureCityId!=SetOutCityId'>
<el-date-picker :picker-options="pickerOptions0" v-model='addMsg.GoCityTime' value-format="yyyy-MM-dd" type="date" @change='getUnionTravelPrice(addObj,1)'></el-date-picker>
</el-form-item>
</el-col> -->
<!-- <el-col :span="4">
<el-form-item label="返回城市" prop="ReturnArriveCityId">
<el-select filterable v-model='addMsg.ReturnArriveCityId' filterable :placeholder="$t('pub.pleaseSel')" @change="addMsg.IsReturnIntermodal=2">
<el-option
v-for="item in startCityList"
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否联运" prop="IsReturnIntermodal" v-show="addMsg.ReturnArriveCityId!=reOutCityId">
<el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2" @change='getUnionTravelPrice(addObj,2)'></el-switch>
</el-form-item>
<el-form-item label="联运时间" prop="IsReturnIntermodal" v-show='addMsg.IsReturnIntermodal==1&&addMsg.ReturnArriveCityId!=reOutCityId'>
<el-date-picker :picker-options="pickerOptions1" v-model='addMsg.BackCityTime' value-format="yyyy-MM-dd" type="date" @change='getUnionTravelPrice(addObj,2)'></el-date-picker>
</el-form-item>
</el-col> -->
<el-col :span="4">
<el-form-item label="本团单价" prop="TC_Price">
<el-input v-model='addMsg.TC_Price' :disabled="true"></el-input>
......@@ -989,18 +939,10 @@
</el-col>
<el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price">
<!-- <el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select> -->
<!-- 第一个修改信息 -->
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()">
</el-input>
</el-form-item>
<!-- <el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
</el-form-item> -->
</el-col>
</el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
......@@ -1012,17 +954,11 @@
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">本团不支持儿童出游!</p> -->
<el-form-item label="儿童人数" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="儿童占床" prop="ChirdNeedBedNum">
<el-input v-model='addMsg.ChirdNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')" @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col> -->
<el-col :span="4">
<el-form-item label="婴儿人数" prop="BabyNum">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')"
......@@ -1035,11 +971,8 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
......@@ -1084,21 +1017,8 @@
</el-form-item>
</el-col>
<el-col :span="4">
<!--<el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getTotalPrice();getHouseNo()'></el-input>
</el-form-item>-->
&nbsp;
</el-col>
<!-- <el-col :span="4">
<el-form-item label="可退景点">
<el-select filterable multiple class='multiple_input' v-model='addMsg.ScenicRefundArr' :placeholder="$t('pub.pleaseSel')" @change='ScenicRefundMethods'>
<el-option v-for='item in ScenicRefundList'
:label='item.ScenicName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="4">
&nbsp;
</el-col>
......@@ -1134,24 +1054,6 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="费用类型" prop="CostType">
<el-select v-model="addMsg.CostType" filterable placeholder="请选择费用类型">
<el-option v-for='item in fylxList' :label="item.Name" :value="item.ID" :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -1162,10 +1064,6 @@
</el-row>
</el-form>
</div>
<!-- 其他类型的修改信息2 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer">
<p>修改
......@@ -1193,7 +1091,8 @@
</el-select>
</el-form-item>
<el-form-item v-if="addMsg.GroupType == '3'" label="是否用房" prop="GroupTypeNeedHouse">
<el-switch @change="$forceUpdate()" v-model="addMsg.GroupTypeNeedHouse" active-value="0" inactive-value="1"></el-switch>
<el-switch @change="$forceUpdate()" v-model="addMsg.GroupTypeNeedHouse" active-value="0"
inactive-value="1"></el-switch>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1212,7 +1111,6 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="出发城市" prop="DepartureCityId">
......@@ -1249,7 +1147,6 @@
<el-date-picker :picker-options="pickerOptions1" v-model='addMsg.BackCityTime' value-format="yyyy-MM-dd"
type="date" @change='getUnionTravelPrice(addObj,2)'></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="本团单价" prop="TC_Price">
......@@ -1265,16 +1162,6 @@
</el-form-item>
</el-col>
<el-col :span="4" v-if="isChecked==true">
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item> -->
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item> -->
<template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')"
......@@ -1346,7 +1233,6 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
......@@ -1392,8 +1278,6 @@
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="Ysze">
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
......@@ -1415,7 +1299,6 @@
<el-form-item label="杂费">
<el-input v-model='addMsg_form.OtherPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="老人附加费">
<el-input v-model='addMsg_form.OldManChargePrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
......@@ -1425,7 +1308,6 @@
<el-form-item label="单房差">
<el-input v-model='addMsg_form.SingleRoomPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="儿童占床增收">
<el-input v-model='addMsg_form.ChildNeedPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
......@@ -1435,7 +1317,6 @@
<el-form-item label="收损金额">
<el-input v-model='addMsg_form.OpSetLossMoney' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单地接">
<el-input v-model='addMsg_form.SingleDMCPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
......@@ -1444,13 +1325,10 @@
</el-form-item>
<el-form-item v-if="IsUpdateOrderMoney">
<el-button type="primary" style="padding:6px 15px" @click="submitYSZEForm">确定</el-button>
<!-- <el-button type="danger" style="padding:6px" @click="Ysze=false">关闭</el-button> -->
</el-form-item>
</el-form>
</div>
</el-col>
<el-col :span="4">
<el-form-item label="预计提成" prop="Commission">
<el-input v-model='addMsg.Commission' :disabled="true"></el-input>
......@@ -1497,49 +1375,49 @@
</el-col>
<el-col :span="8">
<div class="clearfix">
<div class="leftSetInfo">
<span class="GO_Title">可退景点</span>
<div class="leftSetInfo">
<span class="GO_Title">可退景点</span>
</div>
<div class="GO_TPright clearfix">
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div class="GOScenicDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="_color_666">选择</td>
<td class="_color_666">景点名称</td>
<td class="_color_666">OP设置金额</td>
<td class="_color_666">人数</td>
<td class="_color_666">退款金额</td>
</tr>
<tr v-for="item in ScenicRefundList">
<td>
<el-checkbox :checked="item.IsChecked" @change="getGOScenic(item)"></el-checkbox>
</td>
<td>
{{item.CouponsName}}
</td>
<td>
{{item.RefundMoney}}
</td>
<td>
<el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item)"
@change="getGOScenictWO" v-model="item.Number"></el-input>
</td>
<td>
<el-input class="w80" @keyup.native="checkPrice(item,'BackMoney')" @change="getGOScenictWO"
v-model="item.BackMoney"></el-input>
</td>
</tr>
</table>
</div>
</div>
<div class="GO_TPright clearfix">
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div class="GOScenicDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="_color_666">选择</td>
<td class="_color_666">景点名称</td>
<td class="_color_666">OP设置金额</td>
<td class="_color_666">人数</td>
<td class="_color_666">退款金额</td>
</tr>
<tr v-for="item in ScenicRefundList">
<td>
<el-checkbox :checked="item.IsChecked" @change="getGOScenic(item)"></el-checkbox>
</td>
<td>
{{item.CouponsName}}
</td>
<td>
{{item.RefundMoney}}
</td>
<td>
<el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item)" @change="getGOScenictWO"
v-model="item.Number"></el-input>
</td>
<td>
<el-input class="w80" @keyup.native="checkPrice(item,'BackMoney')" @change="getGOScenictWO"
v-model="item.BackMoney"></el-input>
</td>
</tr>
</table>
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in SciencNameList">{{subItem}}</span>
<i class="iconfont icon-arrow-down GO_SimulaDrop"></i>
</div>
</el-popover>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in SciencNameList">{{subItem}}</span>
<i class="iconfont icon-arrow-down GO_SimulaDrop"></i>
</div>
</el-popover>
</div>
</div>
</el-col>
</el-row>
......@@ -1584,24 +1462,6 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!=''">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay==1&&addMsg.PlatformOrder!=''">
<el-form-item label="费用类型" prop="CostType">
<el-select v-model="addMsg.CostType" filterable placeholder="请选择费用类型">
<el-option v-for='item in fylxList' :label="item.Name" :value="item.ID" :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay==1&&addMsg.PlatformOrder!=''">
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -1713,7 +1573,6 @@
</el-row>
</el-form>
</div>
<!--<span>{{tuanInfo}}</span>-->
<div
style="float:left; border-radius: 4px; margin: 20px 20px 20px 0; padding: 0 10px; height: 34px; line-height: 34px; background: #D2D2D2; font-size: 14px; color: #333; font-weight: bold;">
{{tuanInfo.config&&tuanInfo.config.LtName}}&nbsp;&nbsp;{{tuanInfo.config&&tuanInfo.config.TCNUM}}&nbsp;&nbsp;<span
......@@ -1784,9 +1643,9 @@
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">
<span>{{item.orderId}}</span>
<span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;" v-if="item.scoreNum >= 0"
<span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
v-if="item.scoreNum >= 0"
@click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<!-- <span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span> -->
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top"
v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu"
style="font-size:22px;color:red;"></i></el-tooltip>
......@@ -1801,7 +1660,7 @@
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>下单时间：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
<template v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
</template>
......@@ -1809,76 +1668,47 @@
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
<p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
</div>
<div style="color:red" v-else>
</div>
<div style="color:red" v-else>
<p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
<p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
</div>
<div style="color:red">
<p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
<p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
</div>
<div style="color:red">
<p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
</div>
</div>
</div>
</td>
<td>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'
<p v-if='item.isOwn==1||IsSupperOrderEdit||IsLookOrder || isUpdateOrder'
class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12">
<p v-if='item.isOwn==1||IsSupperOrderEdit||IsLookOrder || isUpdateOrder' class="fz12">
{{item.contactMobile}}</p>
<p class="fz12" v-if="(item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder)&&item.industryCategory!==''" style="color:green">行业类别：{{item.industryCategory}}</p>
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168&&isUpdateOrder==false'>*****</p>
<!-- <p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p class="fz12">{{item.contactMobile}}</p> -->
<p class="fz12"
v-if="(item.isOwn==1||IsSupperOrderEdit||IsLookOrder || isUpdateOrder)&&item.industryCategory!==''"
style="color:green">行业类别：{{item.industryCategory}}</p>
<p v-if='item.isOwn==2&&!IsSupperOrderEdit&&!IsLookOrder&&isUpdateOrder==false'>*****</p>
</td>
<td>
<!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span>
<span>老人：{{item.oldPeopleNum}}人</span>
<span>婴儿：{{item.babyNum}}人</span>
<span>单地接：{{item.airticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>姓名</th>
<th>护照</th>
<th>性别</th>
<th>年龄</th>
<th width="110">联系电话</th>
</tr>
<tr v-if='memberList.length>0' v-for="(item2,index2) in memberList" :key="index2">
<td>{{item2.userName}}</td>
<td>{{item2.passportNo}}</td>
<td>{{item2.sexStr}}</td>
<td>{{item2.age}}</td>
<td>{{item2.mobilePhone}}</td>
</tr>
<tr v-if='memberList.length==0'>
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div> -->
<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>
<!-- </el-popover> -->
</td>
<td style="color:#FF9C00">
<span>{{item.tC_Price}}</span>
</td>
<td style="color:#FF9C00">
<span
v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">{{item.unit_Price}}</span>
v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">{{item.unit_Price}}</span>
<span v-else>*****</span>
</td>
<td>
<p style="color:#FF9C00">
<span
v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">{{item.preferPrice}}</span>
v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">{{item.preferPrice}}</span>
<span v-else>*****</span>
</p>
</td>
......@@ -1895,7 +1725,7 @@
<tr v-if='orderList.length>0' v-for="(item2,index2) in orderList" :key="index2">
<td>{{item2.FrID}}</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item2.PayMoney}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item2.PayMoney}}</span>
<span v-else>******</span>
</td>
<td>{{item2.TypeName}}</td>
......@@ -1906,12 +1736,11 @@
</tr>
</table>
</div>
<span v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'
:style="{cursor: 'pointer',color:item.dueInMoney===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span>
<span v-if='item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder'
:style="{cursor: 'pointer',color:item.dueInMoney===0 ? '' : '#e95252' }"
@click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-else>******</span>
</el-popover>
<!-- <span v-if='item.isOwn!=1 && userId!=1&&userId!=5 && isUpdateOrder==false'>******</span> -->
</td>
<!-- 优惠 -->
<td>
......@@ -1946,26 +1775,24 @@
</tr>
</table>
</div>
<!-- <span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span> -->
<span style="cursor: pointer;color: #e95252;text-decoration: underline;" @click="getOrderDetail(item)"
slot="reference">{{item.discountMoney}}</span>
</el-popover>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">
<el-popover v-if="item.customerId || item.customerId==0" style='padding: 0;' width="600" trigger="click">
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">
<el-popover v-if="item.customerId || item.customerId==0" style='padding: 0;' width="600"
trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>金额</th>
<th>类型</th>
<th>描述</th>
<th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>）</th>
<th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4"
align="center">查看更多</span>）</th>
</tr>
<tr v-for="(item2,index2) in redBagList"
:key="index2">
<tr v-for="(item2,index2) in redBagList" :key="index2">
<td>{{item2.Money}}</td>
<td>
{{item2.Type==1?"收入":"折扣"}}
......@@ -1977,31 +1804,31 @@
<td colspan="4" align="center">暂无数据</td>
</tr>
<tr>
<!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> -->
</tr>
</table>
</div>
<span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;text-decoration: underline;" slot="reference">{{item.redEnvelopeMoney}}</span>
</el-popover>
<span v-else style="cursor: pointer;color: #e95252;text-decoration: underline;">{{item.redEnvelopeMoney}}</span>
</span>
<span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;text-decoration: underline;"
slot="reference">{{item.redEnvelopeMoney}}</span>
</el-popover>
<span v-else
style="cursor: pointer;color: #e95252;text-decoration: underline;">{{item.redEnvelopeMoney}}</span>
</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.refund}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.refund}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.platformTax}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.platformTax}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.zaiTuMoney}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.zaiTuMoney}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder"
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder"
:class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
<span v-else>******</span>
</td>
......@@ -2021,31 +1848,25 @@
</span>
<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)"
style="margin-left: 5px;" class="el-icon-error color999"></i>
<template v-if="item.contractNum.length==0">
<el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5'
:http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action="">
<el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
</el-upload>
</template>
<template v-if="item.contractNum.length==0">
<el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||IsSupperOrderEdit'
:http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action="">
<el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
</el-upload>
</template>
</td>
<td class="groupTourOrderIcon">
<el-button-group v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'>
<el-button-group v-if='item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder'>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button
v-if="(userId==1 || userId==5 || isUpdateOrder) || ( item.isOwn==1 &&item.isOrder=='1'&&item.isHaveFinance!='1'&&item.orderState!='1'&&item.orderState!='4')"
v-if="(IsSupperOrderEdit || isUpdateOrder) || ( item.isOwn==1 &&item.isOrder=='1'&&item.isHaveFinance!='1'&&item.orderState!='1'&&item.orderState!='4')"
type="primary" style='background:#00C6FF; border-color:#00C6FF' icon="iconfont icon-bianji-smal"
@click='getDetail(item)'></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<!-- <el-button
v-if="(userId==1||userId==5)|| ( item.isOwn==1 ||item.isHaveFinance=='1'||item.orderState=='1')"
type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu"
@click='getRemarks(item)'></el-button> -->
<el-button
v-if="(userId==1||userId==5)|| item.isOwn==1"
type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu"
<el-button v-if="(IsSupperOrderEdit)|| item.isOwn==1" type="primary"
style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu"
@click='getRemarks(item)'></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="日志" placement="top-start" style="float:left">
<el-popover width='230' trigger="click">
......@@ -2074,7 +1895,7 @@
<div @click="goUrlT('confirmationOrder',item.orderId)">确认函
{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}
</div>
<div v-if="isEditOrderCreate==1||userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="isEditOrderCreate==1||IsSupperOrderEdit" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span
v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
......@@ -2082,9 +1903,10 @@
@click='getHouse(item)'>修改房型</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission == true"
@click="transfer(item)">订单转团</div>
<div v-if="isUpdateOrder" @click='OPRemark(item),zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注
<div v-if="isUpdateOrder"
@click='OPRemark(item),zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注
</div>
<!-- v-if="item.isUpdateOrderCommission" -->
<div v-if="isUpdateOrderCommission"
@click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate,TCMsg.LatestCommissionMoney=item.latestCommissionMoney, TiChengLoading = true'>
修改提成</div>
......@@ -2095,17 +1917,15 @@
<div
v-if='(item.confirmFileList.length>0||item.contractNum.length>0) && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'
@click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
<div v-if="item.orderState=='1'||item.orderState=='2'"
@click='setChargeLoss(item)'>
<div v-if="item.orderState=='1'||item.orderState=='2'" @click='setChargeLoss(item)'>
<span v-if="item.isChargeLossOrders==1">恢复收损单</span>
<span v-else>设为收损单</span>
</div>
<div v-if="item.orderState==2"
@click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice = item.unit_Price'>
申请优惠</div>
<div
@click='ShenQingPhoto(item)'>
申请照片</div>
<div @click='ShenQingPhoto(item)'>
申请照片</div>
<div
v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')&& item.isCanClear==0"
@click='deleteItem(item)'>取消</div>
......@@ -2123,67 +1943,70 @@
</el-popover>
</el-tooltip>
</el-button-group>
<payurlItem v-if='item.isOwn==1&&item.airConfirm!=2' :item="item" :showID="showID" :photoF="item.photoNum>0"
v-show="item.orderState!='4'&&item.orderState!='3'" v-on:childByValue="childByValue"></payurlItem>
<payurlItem v-if='item.isOwn==1&&item.airConfirm!=2' :item="item" :showID="showID"
:photoF="item.photoNum>0" v-show="item.orderState!='4'&&item.orderState!='3'"
v-on:childByValue="childByValue"></payurlItem>
</td>
</tr>
<tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle"
v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span>
v-if="item.guestList.length>0 && (item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder) ">名单:</span>
<span class="RL-redType RL-remarkCon"
v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">
<span v-for="(childItem) in item.guestList" style="color: blue">{{childItem.userName}}<span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span>
v-if="item.guestList.length>0 && (item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder) ">
<span v-for="(childItem) in item.guestList" style="color: blue">{{childItem.userName}}<span
v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span>
<span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span>
</span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span style="color: red;"n v-for="(childItem, childIndex) in item.cancelGuestList" :key="childIndex">{{childItem.userName}} &nbsp;&nbsp;</span>
<span style="color: red;" n v-for="(childItem, childIndex) in item.cancelGuestList"
:key="childIndex">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息<span v-if="item.oneSex>0"
style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：
{{item.orderGuestHouseStr}}
{{item.orderGuestHouseStr}}
<el-popover trigger="click" popper-class="KT_Scenic">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="150">景点名称</th>
<th width="60">人数</th>
<th width="60">退款金额</th>
</tr>
<tr v-for="fItem in item.orderBackScenicList" style="text-align:center;">
<td style="text-align:left;">{{fItem.couponsName}}</td>
<td>{{fItem.number}}</td>
<td>{{fItem.backMoney}}</td>
</tr>
</table>
<span slot="reference" v-if="item.orderBackScenicList&&item.orderBackScenicList.length>0" style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span>
</el-popover>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="150">景点名称</th>
<th width="60">人数</th>
<th width="60">退款金额</th>
</tr>
<tr v-for="fItem in item.orderBackScenicList" style="text-align:center;">
<td style="text-align:left;">{{fItem.couponsName}}</td>
<td>{{fItem.number}}</td>
<td>{{fItem.backMoney}}</td>
</tr>
</table>
<span slot="reference" v-if="item.orderBackScenicList&&item.orderBackScenicList.length>0"
style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span>
</el-popover>
</span>
<!-- <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span> -->
<div>
<span v-if="item.opTipMoney==''&&item.tipMoney!=''" style="color:red">（小费：{{item.tipMoney}}）</span>
<span v-if="item.opTipMoney!=''" style="color:red">
（小费：{{item.opTipMoney}}）
<span>单据：</span>
<span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
</span>
<div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none;">领取合同</div>
<div v-else class="GO_Contract" @click="goContract(item)" style="display:none;">{{item.contractNum}}</div>
<div>
<template v-if="item.contractNum&&item.contractNum.length>0">
<span v-for="sItem in item.contractNum" class="GO_Contract" @click="goContract(item,sItem)">
{{sItem.client_Name+''+sItem.contractNum}}
</span>
</template>
</div>
</div>
<span @click="gourlTip('FinancialDocumentsDetail',id)"
style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId"
:key="i">{{id}}</span>
</span>
<div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none;">
领取合同</div>
<div v-else class="GO_Contract" @click="goContract(item)" style="display:none;">{{item.contractNum}}
</div>
<div>
<template v-if="item.contractNum&&item.contractNum.length>0">
<span v-for="sItem in item.contractNum" class="GO_Contract" @click="goContract(item,sItem)">
{{sItem.client_Name+''+sItem.contractNum}}
</span>
</template>
</div>
</div>
</td>
</tr>
<tr>
......@@ -2198,19 +2021,16 @@
@click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
</span>
<template>
<template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
<template v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单
{{item.platformOrder}};</span> {{item.remarks}}
</template>
<!-- <template v-else>
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>*****
</template> -->
</template>
</p>
</div>
</div>
<div style="float:right;text-align: right;font-size: 12px;color: #e95252;">
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>历史备注</div>
......@@ -2221,7 +2041,7 @@
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
</div>
<el-button v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder"
<el-button v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder"
slot="reference" icon="iconfont icon-gengduo"
style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"></el-button>
......@@ -2238,10 +2058,10 @@
</div>
</td>
<td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">
特价申请函:
<div v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">
特价申请函:
<template v-if="item.orderspecialofferId === 0">
<span class="font-color-blur" >未申请</span>
<span class="font-color-blur">未申请</span>
</template>
<template v-else>
<span class="font-color-red" v-if="item.orderspecialofferState === -1">拒绝</span>
......@@ -2320,19 +2140,18 @@
{{tuanInfo.config.CSeat-seat.CSeat>0?tuanInfo.config.CSeat-seat.CSeat:0}}E +
{{tuanInfo.config.FSeat-seat.FSeat>0?tuanInfo.config.FSeat-seat.FSeat:0}}F
</template>
</span>
</div>
<div>
<span>候补机位：</span>
<span>
<template v-if="tuanInfo&&tuanInfo.config&&seat">
{{tuanInfo.config.YSeat-seat.YSeat>0 ? 0 : seat.YSeat-tuanInfo.config.YSeat}}Y +
<div>
<span>候补机位：</span>
<span>
<template v-if="tuanInfo&&tuanInfo.config&&seat">
{{tuanInfo.config.YSeat-seat.YSeat>0 ? 0 : seat.YSeat-tuanInfo.config.YSeat}}Y +
{{tuanInfo.config.CSeat-seat.CSeat>0?0:seat.CSeat-tuanInfo.config.CSeat}}E +
{{tuanInfo.config.FSeat-seat.FSeat>0?0:seat.FSeat-tuanInfo.config.FSeat}}F
</template>
</template>
</span>
</div>
</div>
<div>
<span>参团：</span>
<span>{{seat.joinGroupNum}}</span>
......@@ -2360,9 +2179,6 @@
</td>
</tr>
</tbody>
<!-- 取消订单 -->
<tr v-if="cancelRtData!=null && cancelRtData.length>0">
<td colspan="17">
......@@ -2381,9 +2197,8 @@
@click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4">
<i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" content="通过B2B确认单报名" placement="top"
v-show="item.isFormB2B ==1"> <i class="iconfont icon-tiaozheng"
style="font-size:22px;color:#297BEF;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" content="通过B2B确认单报名" placement="top" v-show="item.isFormB2B ==1">
<i class="iconfont icon-tiaozheng" style="font-size:22px;color:#297BEF;"></i></el-tooltip>
</p>
<div>
{{item.createBy}}<br /><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
......@@ -2392,17 +2207,17 @@
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>下单时间：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
<template v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
</template>
</td>
<td>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12 over_ellipsis"
<p v-if='item.isOwn==1||IsSupperOrderEdit||IsLookOrder || isUpdateOrder' class="fz12 over_ellipsis"
style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12">
<p v-if='item.isOwn==1||IsSupperOrderEdit||IsLookOrder || isUpdateOrder' class="fz12">
{{item.contactMobile}}</p>
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168&&isUpdateOrder==false'>*****</p>
<p v-if='item.isOwn==2&&!IsSupperOrderEdit&&!IsLookOrder&&isUpdateOrder==false'>*****</p>
</td>
<td>
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference"
......@@ -2417,13 +2232,13 @@
</td>
<td style="color:#FF9C00">
<span
v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">{{item.unit_Price}}</span>
v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">{{item.unit_Price}}</span>
<span v-else>*****</span>
</td>
<td>
<p style="color:#FF9C00">
<span
v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">{{item.preferPrice}}</span>
v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">{{item.preferPrice}}</span>
<span v-else>*****</span>
</p>
</td>
......@@ -2440,7 +2255,7 @@
<tr v-if='orderList.length>0' v-for="(item2,index2) in orderList" :key="index2">
<td>{{item2.FrID}}</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item2.PayMoney}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item2.PayMoney}}</span>
<span v-else>******</span>
</td>
<td>{{item2.TypeName}}</td>
......@@ -2451,45 +2266,41 @@
</tr>
</table>
</div>
<span v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'
<span v-if='item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder'
:style="{cursor: 'pointer',color:item.dueInMoney===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span>
<span v-else>******</span>
</el-popover>
</td>
<!-- 优惠 -->
<td>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.redEnvelopeMoney}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.redEnvelopeMoney}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.refund}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.refund}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.platformTax}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.platformTax}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.zaiTuMoney}}</span>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.zaiTuMoney}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder"
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder"
:class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
<span v-else>******</span>
</td>
<td colspan="2" class="fz12" :style="item.orderState===3?'color: #e95252;':''">
{{item.statsstr}}
<br />
<span style="color:red;" v-if="item.orderCancelDate!=''">{{item.orderCancelDate}}</span>
</td>
<td>
<span v-if='item.confirmFileList.length>0' style="cursor:pointer" class="fz12 dowloadSpan"
@click="downLoadFile(item.confirmFileList)">
......@@ -2497,25 +2308,25 @@
</span>
<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)"
style="margin-left: 5px;" class="el-icon-error color999"></i>
</td>
<td class="groupTourOrderIcon">
</td>
</tr>
<tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle"
v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span>
v-if="item.guestList.length>0 && (item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder) ">名单:</span>
<span class="RL-redType RL-remarkCon"
v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">
<span v-for="(childItem) in item.guestList" style="color: blue">{{childItem.userName}}<span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span>
v-if="item.guestList.length>0 && (item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder) ">
<span v-for="(childItem) in item.guestList" style="color: blue">{{childItem.userName}}<span
v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span>
<span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span>
</span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span style="color: red;" v-for="(childItem, childIndex) in item.cancelGuestList" :key="childIndex">{{childItem.userName}} &nbsp;&nbsp;</span>
<span style="color: red;" v-for="(childItem, childIndex) in item.cancelGuestList"
:key="childIndex">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<span style="display: block">房间信息<span v-if="item.oneSex>0"
......@@ -2533,7 +2344,7 @@
@click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
</span>
<template>
<template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
<template v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单
{{item.platformOrder}};</span>{{item.remarks}}
</template>
......@@ -2550,7 +2361,7 @@
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
</div>
<el-button v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder"
<el-button v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder"
slot="reference" icon="iconfont icon-gengduo"
style="padding:0px;border:none;background-color:transparent;" class="groupTourOrder_remarks_btn">
</el-button>
......@@ -2653,8 +2464,8 @@
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
<!--修改OP备注-->
<el-dialog custom-class='w350' title="修改OP备注" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg">
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
<el-form-item label="OP备注：" class="w280">
<el-input type="textarea" :rows="2" v-model="OPRemarkMsg.OP_Remarks"></el-input>
......@@ -2665,14 +2476,9 @@
<button class="hollowFixedBtn" @click="initOPRemarkMsg">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<!--修改提成-->
<el-dialog custom-class='w350' title="修改提成" :visible.sync="TiChengLoading" center :before-close="initTCMsg">
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
<!-- <el-form-item label="扣除提成比例：" class="w280">
<el-input placeholder="请输入" v-model="TCMsg.CommissionMinusRate" @keyup.native="maxCommissionMinusRate">
<template slot="append">%</template>
</el-input>
</el-form-item> -->
<el-form-item label="提成金额：" class="w280">
<el-input placeholder="请输入" type="number" v-model="TCMsg.LatestCommissionMoney">
</el-input>
......@@ -2683,8 +2489,7 @@
<button class="hollowFixedBtn" @click="initTCMsg">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<!-- 申请优惠-->
<!--申请优惠-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
style="height: 150px;min-height:200px;">
<p>申请优惠
......@@ -2701,17 +2506,12 @@
<em
style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;"
class='w150'>{{SOMsg.OrderUnitPrice}}</em>
<!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
<el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input> -->
<em style="margin-left: 100px;font-size: 12px !important;color: #606266;">审核人</em>
<el-select placeholder="请选择" v-model="SOMsg.UpdateBy">
<el-option v-for="(item,index) in SuperiorPeople" :label='(item.EmName)' :value='(item.EmployeeId)'
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="申请理由" style="margin-left: 58px;">
<el-input v-model='SOMsg.ApplyReason' type='textarea' maxlength='1000' style="width: 60%"></el-input>
</el-form-item>
......@@ -2743,20 +2543,21 @@
<label><input type="checkbox" v-model="SQcheckdAll">全选</label>
</div>
<div>
<label v-for="item in SQguestList"><input type="checkbox" v-model="item.check">{{item.userName}}({{item.sexStr}})</label>
<label v-for="item in SQguestList"><input type="checkbox"
v-model="item.check">{{item.userName}}({{item.sexStr}})</label>
</div>
<div class="needfenshu">
<label>需要份数：</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input>
<label>需要份数：</label>
<el-input type="number" v-model="SQPhotoNum" class="w200"></el-input>
</div>
<p style="color: red">注：每人每份5元</p>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button>
<button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
import moment from "moment";
import payURL from "../commonPage/payURL.vue";
......@@ -2766,9 +2567,11 @@
export default {
data() {
return {
IsSupperOrderEdit:false,//获取总经理副总经理超级修改权限
IsLookOrder:false,//出纳查看订单权限
//修改业务员权限，1-有
isEditOrderCreate:0,
redBagList:[],
isEditOrderCreate: 0,
redBagList: [],
// 修改应收总额
Ysze: false,
addMsg_form: {},
......@@ -2791,7 +2594,7 @@
ExtraDeductMoney: ''
},
checkedObj: {},
positionId: 0,
pickerOptions0: {
disabledDate: time => {
let starTime = new Date(this.starTime);
......@@ -2816,6 +2619,7 @@
customerId: "",
createByInfo: "",
isUpdateSharePeople: false,
//修改订单提成
isUpdateOrderCommission: false,
starTime: "",
endTime: "",
......@@ -2896,7 +2700,7 @@
AirticketNum: "0",
ScenicRefundArr: [],
//景点新数组
OrderBackScenicList:[],
OrderBackScenicList: [],
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: "-1",
......@@ -3120,7 +2924,7 @@
tcnum: '',
isOrder: '',
},
SciencNameList:[],
SciencNameList: [],
ShenQingPhotoShow: false,
SQguestList: [],
SQcheckdAll: true,
......@@ -3133,7 +2937,8 @@
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan
},watch:{
},
watch: {
SQcheckdAll(val) {
this.checkdAll(val)
}
......@@ -3153,18 +2958,18 @@
}
},
methods: {
SQPhoto(){
SQPhoto() {
let checkID = []
this.SQguestList.map(x=>{
this.SQguestList.map(x => {
if (x.check) {
checkID.push(x.guestId)
}
})
if(checkID.length < 1) {
if (checkID.length < 1) {
this.$message.error('请选择旅客！')
return
}
if(!this.SQPhotoNum) {
if (!this.SQPhotoNum) {
this.$message.error('请输入份数！')
return
}
......@@ -3173,53 +2978,55 @@
PhotoNum: this.SQPhotoNum,
OrderId: this.SQOrderId,
}
this.apipost('sellorder_get_SetOrderGuestPhoto',msg, res => {
this.apipost('sellorder_get_SetOrderGuestPhoto', msg, res => {
if (res.data.resultCode == 1) {
this.getList()
this.ShenQingPhotoShow = false
}
},null)
}, null)
},
checkdAll(val){
checkdAll(val) {
if (val) {
this.SQguestList.map(x=>{
this.SQguestList.map(x => {
x.check = true
})
} else {
this.SQguestList.map(x=>{
this.SQguestList.map(x => {
x.check = false
})
}
this.SQguestList = this.SQguestList
this.$forceUpdate()
},
ShenQingPhoto(item){
ShenQingPhoto(item) {
if (item.guestList.length < 1) {
this.$message.error('暂无旅客，请添加旅客后再尝试申请！')
return
}
item.guestList.map(x=>{
item.guestList.map(x => {
x.check = true
})
this.SQguestList = item.guestList
this.SQOrderId = item.orderId
this.ShenQingPhotoShow = true
},
closeChangeMachie(done) { // 弹=窗口关闭
closeChangeMachie(done) { // 弹=窗口关闭
done();
},
// OP备注赋值
OPRemark(item){
this.apipost('sellorder_post_GetOrderEntity',{ID:item.orderId}, res => {
if (res.data.resultCode == 1) {
this.OPRemarkMsg.OP_Remarks=res.data.data.model.OP_Remarks;
} else {
this.$message.error(res.data.message);
}
}, null)
OPRemark(item) {
this.apipost('sellorder_post_GetOrderEntity', {
ID: item.orderId
}, res => {
if (res.data.resultCode == 1) {
this.OPRemarkMsg.OP_Remarks = res.data.data.model.OP_Remarks;
} else {
this.$message.error(res.data.message);
}
}, null)
},
gourlTip(path,id){
gourlTip(path, id) {
this.$router.push({
name: path,
query: {
......@@ -3228,7 +3035,7 @@
}
});
},
goUrlHappy(item){
goUrlHappy(item) {
this.$router.push({
name: "HappyPassbook",
query: {
......@@ -3237,24 +3044,22 @@
}
});
},
getRedBag(item){
let msg={
CustomerId:item.customerId,
getRedBag(item) {
let msg = {
CustomerId: item.customerId,
pageIndex: 1,
pageSize: 4,
};
if(item.customerId){
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => {
if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData;
} else {
}
}, err => {
})
}else{
this.redBagList =[];
if (item.customerId) {
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList', msg, res => {
if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData;
} else {}
}, err => {})
} else {
this.redBagList = [];
}
},
// 跳转调查列表
goInvetig: function (path, tcid, orderId) {
......@@ -3536,7 +3341,7 @@
this.apipost(
"travel_get_GetTravelConfigTCID", {
TCID: this.$route.query.id,
type:1
type: 1
},
res => {
if (res.data.resultCode == 1) {
......@@ -3690,11 +3495,11 @@
this.getTotalPrice();
this.getTicheng();
},
getScenicRefund(TCID,OrderId) {
getScenicRefund(TCID, OrderId) {
this.OrderId = OrderId;
let msg = {
TCID:TCID,
OrderId:OrderId
TCID: TCID,
OrderId: OrderId
}
this.apipost(
"sellorder_get_GetScenicRefundList", msg,
......@@ -3708,20 +3513,20 @@
);
},
//勾选景点
getGOScenic(item){
item.IsChecked=!item.IsChecked;
getGOScenic(item) {
item.IsChecked = !item.IsChecked;
},
//勾选
getGOScenictWO(){
this.addMsg.OrderBackScenicList=[];
this.SciencNameList=[];
this.ScenicRefundList.forEach(x=>{
if(x.IsChecked&&x.Number>0){
getGOScenictWO() {
this.addMsg.OrderBackScenicList = [];
this.SciencNameList = [];
this.ScenicRefundList.forEach(x => {
if (x.IsChecked && x.Number > 0) {
let obj = {
CouponsId:x.CouponsId,
IsChecked:x.IsChecked,
BackMoney:x.BackMoney,
Number:x.Number
CouponsId: x.CouponsId,
IsChecked: x.IsChecked,
BackMoney: x.BackMoney,
Number: x.Number
}
this.SciencNameList.push(x.CouponsName);
this.addMsg.OrderBackScenicList.push(obj);
......@@ -3729,12 +3534,13 @@
})
},
//验证输入人数
CheckNum(item){
let TotalNum = parseInt(this.addMsg.ManNum)+parseInt(this.addMsg.ChirdNoNeedBedNum)+
parseInt(this.addMsg.ChirdNeedBedNum)+parseInt(this.addMsg.BabyNum)+parseInt(this.addMsg.OldPeopleNum)+parseInt(this.addMsg.AirticketNum);
if(item.Number>TotalNum){
this.Error('不能超过总人数');
item.Number=0;
CheckNum(item) {
let TotalNum = parseInt(this.addMsg.ManNum) + parseInt(this.addMsg.ChirdNoNeedBedNum) +
parseInt(this.addMsg.ChirdNeedBedNum) + parseInt(this.addMsg.BabyNum) + parseInt(this.addMsg.OldPeopleNum) +
parseInt(this.addMsg.AirticketNum);
if (item.Number > TotalNum) {
this.Error('不能超过总人数');
item.Number = 0;
}
},
platformOrderMethods() {
......@@ -3806,8 +3612,8 @@
this.addMsg.OrderId = obj.orderId;
this.IsChargeLossOrders = obj.isChargeLossOrders;
//zk-点击修改清空景点
this.ScenicRefundList=[];
this.SciencNameList=[];
this.ScenicRefundList = [];
this.SciencNameList = [];
this.apipost(
"sellorder_post_GetOrderEntity", {
......@@ -3817,7 +3623,7 @@
if (res.data.resultCode == 1) {
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
let x = res.data.data.model;
let modelPrice = res.data.data.modelPrice;
this.addMsg = x;
this.addObj = res.data.data.modelPrice;
......@@ -3825,8 +3631,8 @@
this.addObj.OpSetLossMoney = x.OpSetLossMoney;
this.addMsg.OneSex = x.OneSex;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid,obj.orderId);
this.getScenicRefund(obj.tcid, obj.orderId);
this.getPlatformAccount(obj.platformAccountTypeId, obj.platformAccount);
this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId;
......@@ -3848,8 +3654,8 @@
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderForm = x.OrderForm;
this.addMsg.allName = x.ContactName;
this.addMsg.OrderBackScenicList=x.OrderBackScenicList;
this.addMsg.OrderBackScenicList = x.OrderBackScenicList;
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
......@@ -3962,7 +3768,7 @@
let x = res.data.data.model;
this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid,obj.orderId);
this.getScenicRefund(obj.tcid, obj.orderId);
this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString();
......@@ -4057,7 +3863,7 @@
}
//HK 新加
if (this.userId == 1 || this.userId == 5 || this.positionId == 168) {
if (this.IsSupperOrderEdit || IsLookOrder) {
//todo
} else {
this.remarksMsg.isOrder = obj.isOrder;
......@@ -4187,7 +3993,7 @@
this.addMsg.SafeNum =
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
ChirdNum +
ChirdNum +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum);
......@@ -4265,10 +4071,11 @@
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (
Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
} else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
......@@ -4326,10 +4133,11 @@
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (
Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
} else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
......@@ -4547,7 +4355,7 @@
},
saveOrder() {
//验证人数和机位数 20190807 修改 如果是不是单地接才判断
if (this.addMsg.GroupType !== '4' && this.addMsg.GroupType !== '3') {
if (
Number(this.addMsg.ManNum) +
......@@ -4603,9 +4411,9 @@
this.$message.warning("儿童占床数量不足！");
return;
}
}
}
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
......@@ -4762,11 +4570,7 @@
this.addMsg.ContactName = obj.customerName + "(" + obj.contact + ")";
this.addMsg.ContactMobile = obj.contactNumber;
}
// HK 2019-01-09注释
// if (this.userId != this.createByInfo) {
// this.addMsg.CommissionSharePeople = this.createByInfo;
// this.isUpdateSharePeople = true;
// }
this.apipost(
"app_today_visit_GetCustomerBrandByCustomerId", {
customerInfoId: this.addMsg.CustomerId
......@@ -4971,14 +4775,14 @@
}
});
},
//跳转至领取合同
goContract(item,sItem){
//跳转至领取合同
goContract(item, sItem) {
let routeData = this.$router.resolve({
name: 'TravelContractNew',
query: {
TCID: item.tcid,
guestId:sItem.guestId,
orderID:item.orderId,
guestId: sItem.guestId,
orderID: item.orderId,
blank: 'y'
}
})
......@@ -5165,7 +4969,7 @@
this.addMsg.Unit_Price = this.addObj.B2CPrice;
}
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
......@@ -5216,19 +5020,38 @@
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
this.isEditOrderCreate = res.data.data;
}
}, err => {})
},
// 获取总经理副总经理超级修改权限
GetSupperOrderEditAuth() {
var actionCode = this.$AuthCode.SupperOrderEdit;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.IsSupperOrderEdit = true;
}
});
},
// 出纳查看订单权限
GetLookOrderAuth() {
var actionCode = this.$AuthCode.LookOrder;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.IsLookOrder = true;
}
});
},
},
mounted() {
this.GetLookOrderAuth();
this.GetSupperOrderEditAuth();
this.GetEditOrderCreateByAuth();
let userInfo = this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.TransferMission = userMenuCode.indexOf(',Sale_TurnGroup,') != -1 ? true : false;
this.userId = this.getLocalStorage().EmployeeId;
this.positionId = this.getLocalStorage().RB_Post_Id;
this.getEmployee();
this.getList();
this.getLineList();
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 9527332d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/SalesModule/planeTicketInquiry.vue
View file @ 9527332d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 9527332d
......@@ -1855,7 +1855,6 @@
<td colspan="4" align="center">{{$t('system.content_noData')}}</td>
</tr>
<tr>
<!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> -->
</tr>
</table>
</div>
......@@ -1918,10 +1917,8 @@
@click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
{{$t('ground.szewaijine')}}</div>
<div @click="SetShouSunClick(item.OrderId,item.GuestNum)">{{$t('ground.shezhissje')}}</div>
<div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">{{$t('ground.zjiatk')}}</div>
<div @click='deleteItem(item)'>{{$t('system.table_delete')}}</div>
</div>
<el-button slot="reference" type="primary"
style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
......@@ -1937,30 +1934,19 @@
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goToPassenger(childItem, 2)">{{childItem.userName}}</span>
<!-- <span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> -->
</p>
<p v-if="item.CancelGuestList.length>0">
<span class="">{{$t('salesModule.CancelOrder')}}:</span>
<span class="RL-redType RL-remarkCon">
<span v-for="(childItem) in item.CancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<span>{{$t('salesModule.RoomInfo')}}：{{item.OrderGuestHouseStr}}</span>
<!-- <div v-if="item.ContractNum.length==0">
<span class="GO_Contract" @click="goContract(item,{})">领取合同</span>
</div> -->
<div v-if="item.ContractNum&&item.ContractNum.length>0">
<span v-for="sItem in item.ContractNum" class="GO_Contract" @click="goContract(item,sItem)">
{{sItem.Client_Name+''+sItem.ContractNum}}
</span>
</div>
<!-- <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)">领取合同</span>
<span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span> -->
</td>
</tr>
<tr>
......@@ -2069,44 +2055,16 @@
</td>
<td>
<p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis"
<p v-if="childItem.IsOwn==1||IsSupperOrderEdit" class="fz12 over_ellipsis"
:title="childItem.ContactName">
{{childItem.ContactName}}</p>
<p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12">{{childItem.ContactMobile}}</p>
<p v-if="childItem.IsOwn==2&&userId!=1&&userId!=5">*****</p>
<p v-if="childItem.IsOwn==1||IsSupperOrderEdit" class="fz12">{{childItem.ContactMobile}}</p>
<p v-if="childItem.IsOwn==2&&!IsSupperOrderEdit">*****</p>
<p v-if="childItem.IndustryCategory!==''" style="color:green">
{{$t('salesModule.HYLB')}}：{{childItem.IndustryCategory}}</p>
</td>
<td>
<!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{childItem.ManNum}}人</span>
<span>儿童：{{childItem.ChirdNum}}人</span>
<span>老人：{{childItem.OldPeopleNum}}人</span>
<span>婴儿：{{childItem.BabyNum}}人</span>
<span>单地接：{{childItem.AirticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>姓名</th>
<th>护照</th>
<th>性别</th>
<th>年龄</th>
<th width="110">联系电话</th>
</tr>
<tr v-if='childItem.GuestList.length>0' v-for="(item2,index2) in childItem.childItem" :key="index2">
<td>{{item2.userName}}</td>
<td>{{item2.passportNo}}</td>
<td>{{item2.sexStr}}</td>
<td>{{item2.age}}</td>
<td>{{item2.mobilePhone}}</td>
</tr>
<tr v-if='childItem.GuestList.length==0'>
<td colspan="5" align="center">{{$t('system.content_noData')}}</td>
</tr>
</table>
</div> -->
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B; " 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>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo nowrap"
......@@ -2207,9 +2165,8 @@
</td>
<td class="RL-BTNlist" rowspan="2">
<el-button-group v-if="isShow===true">
<el-tooltip
v-if="ConfigData.Config.IsCurrentMaxStartData==0||userId==1"
class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-tooltip v-if="ConfigData.Config.IsCurrentMaxStartData==0||IsSupperOrderEdit" class="item"
effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-bianji-smal" @click='getDetail(childItem)'></el-button>
</el-tooltip>
......@@ -2252,7 +2209,7 @@
{{$t('ground.xgtcheng')}}</div>
<div v-if='(childItem.isOwn==1 || userId==1||userId==5) && childItem.orderState==2'
<div v-if='(childItem.isOwn==1 || IsSupperOrderEdit) && childItem.orderState==2'
@click='Discount(childItem.tcid),SOMsg.OrderId = childItem.orderId,SOMsg.OrderUnitPrice = childItem.unit_Price '>
{{$t('pub.ApplyYH')}}</div>
......@@ -2364,32 +2321,34 @@
<td colspan="3" style="height: 40px;">
<div class="clearfix RL-MARK" style="width:100%;float:left;">
<span class="RL-opremarkTitle" style="width:52px;">{{$t('Operation.Op_remark')}}:</span>
<span class="RL-redType RL-remarkCon"
style="width:73%;display:inline-block;">
<span class="RL-redType RL-remarkCon" style="width:73%;display:inline-block;">
{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}
</span>
<div style="text-align:right;">
{{childItem.OPRemarkUpdateName}}&nbsp;&nbsp;{{childItem.OPRemarkUpdateTimeStr}}
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>{{$t('fnc.lsbeizhu')}}</div>
<p v-if="childItem.OPRemarksList.length !== 0" v-for="(item2, index2) in childItem.OPRemarksList" :key="index2" style="padding:5px 0;margin-bottom:5px;">
<span>{{item2.Remarks}}</span>
<span>{{item2.CreateByName}}&ensp;<span
style="color: #666666;">{{item2.CreateDate}}</span></span>
</p>
<span v-if="childItem.OPRemarksList.length === 0">{{$t('system.content_noData')}}</span>
</div>
<div class="groupTourOrder_remarks_popover">
<div>{{$t('fnc.lsbeizhu')}}</div>
<p v-if="childItem.OPRemarksList.length !== 0"
v-for="(item2, index2) in childItem.OPRemarksList" :key="index2"
style="padding:5px 0;margin-bottom:5px;">
<span>{{item2.Remarks}}</span>
<span>{{item2.CreateByName}}&ensp;<span
style="color: #666666;">{{item2.CreateDate}}</span></span>
</p>
<span v-if="childItem.OPRemarksList.length === 0">{{$t('system.content_noData')}}</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo"
style="padding:0px;border:none;color:#e95252;font-size:12px;" class="groupTourOrder_remarks_btn">
style="padding:0px;border:none;color:#e95252;font-size:12px;"
class="groupTourOrder_remarks_btn">
</el-button>
</el-popover>
</div>
</div>
</td>
<td colspan="3">
<template v-if="isShow==true">
<template v-if="isShow==true">
<div style="float:right;" v-if="childItem.IsCanClear==0">
<input type="button" :value="$t('ground.qrendindan')" class="rgsureBtn"
@click="clearSeat(childItem,1)" style="display:block;" />
......@@ -2408,9 +2367,9 @@
</td>
<td colspan="2" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div>
特价申请函:
特价申请函:
<template v-if="childItem.OrderspecialofferId === 0">
<span class="font-color-blur" >未申请</span>
<span class="font-color-blur">未申请</span>
</template>
<template v-else>
<span class="font-color-red" v-if="childItem.OrderspecialofferState === -1">拒绝</span>
......@@ -2536,10 +2495,10 @@
<p>{{$t('restaurant.res_oderTime')}}：{{item.CreateDate}}</p>
</td>
<td>
<p v-if="item.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;"
<p v-if="item.IsOwn==1||IsSupperOrderEdit" class="fz12 over_ellipsis" style="width:90%;"
:title="item.ContactName">{{item.ContactName}}</p>
<p v-if="item.IsOwn==1||userId==1||userId==5" class="fz12">{{item.ContactMobile}}</p>
<p v-if="item.IsOwn==2&&userId!=1&&userId!=5">*****</p>
<p v-if="item.IsOwn==1||IsSupperOrderEdit" class="fz12">{{item.ContactMobile}}</p>
<p v-if="item.IsOwn==2&&!IsSupperOrderEdit">*****</p>
<p v-if="item.IndustryCategory!==''" style="color:green">
{{$t('salesModule.HYLB')}}：{{item.IndustryCategory}}</p>
</td>
......@@ -2733,9 +2692,9 @@
</td>
<td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div>
特价申请函:
特价申请函:
<template v-if="item.OrderspecialofferId === 0">
<span class="font-color-blur" >未申请</span>
<span class="font-color-blur">未申请</span>
</template>
<template v-else>
<span class="font-color-red" v-if="item.OrderspecialofferState === -1">拒绝</span>
......@@ -3159,7 +3118,9 @@
export default {
data() {
return {
EditBtn:false,//恢复订单
IsSupperOrderEdit: false, //获取总经理副总经理超级修改权限
IsLookOrder: false, //出纳查看订单权限
EditBtn: false, //恢复订单
//修改订单业务员权限
isEditOrderCreate: 0,
importFileUrl2: '',
......@@ -4815,9 +4776,6 @@
return;
}
}
if (this.userId == this.createByInfo) {
if (this.addMsg.CommissionSharePeople == "-1") {
this.addMsg.CommissionShareMoney = "0";
......@@ -4890,23 +4848,6 @@
this.$message.warning("保险数量不能大于人数总和！");
return;
}
// if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
// this.$message.warning("儿童占床不能大于儿童数！");
// return;
// }
// if (
// Number(this.addMsg.ChirdNum) -
// Number(this.addMsg.ChirdNeedBedNum) +
// Number(this.addMsg.BabyNum) >
// Number(this.addMsg.ManNum) +
// Number(this.addMsg.OldPeopleNum) +
// Number(this.addMsg.ChirdNeedBedNum)
// ) {
// this.$message.warning("儿童占床数量不足！");
// return;
// }
this.addMsg.TCID = this.addObj.TCID;
this.addMsg.GuestNum =
Number(this.addMsg.ManNum) +
......@@ -4979,10 +4920,6 @@
this.createByInfo = obj.createByInfo;
this.addMsg.ContactName = obj.customerName + "(" + obj.contact + ")";
this.addMsg.ContactMobile = obj.contactNumber;
// if (this.userId != this.createByInfo) {
// this.addMsg.CommissionSharePeople = this.createByInfo;
// this.isUpdateSharePeople = true;
// }
this.isUpdateSharePeople = true;
this.apipost(
"app_today_visit_GetCustomerBrandByCustomerId", {
......@@ -5721,7 +5658,7 @@
var actionCode = this.$AuthCode.EditOrderCreateBy;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.isEditOrderCreate = 1;
this.isEditOrderCreate = 1;
}
});
},
......@@ -5743,7 +5680,7 @@
})
},
GetAuth() {
GetAuth() {
var actionCode = this.$AuthCode.EidtCoupon;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
......@@ -5751,8 +5688,18 @@
}
});
},
// 获取总经理副总经理超级修改权限
GetSupperOrderEditAuth() {
var actionCode = this.$AuthCode.SupperOrderEdit;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.IsSupperOrderEdit = true;
}
});
},
},
mounted() {
this.GetSupperOrderEditAuth();
this.GetAuth();
this.GetEditOrderCreateByAuth();
let userInfo = this.getLocalStorage();
......
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