Skip to content

S
SuperMan
Commit 1ad7a3fe authored by Mac's avatar Mac
Browse files
Options

增加房间信息 对制单的酒店，门票，餐饮禁止操作。

parent d49e4e9b
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 70 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 1ad7a3fe
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" /> <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -56,9 +56,11 @@ ...@@ -56,9 +56,11 @@
<table class="hotelTable"> <table class="hotelTable">
<tr> <tr>
<td colspan="2"> <td colspan="2">
<p class="link" style="word-break: normal;text-align:left;" <p v-if="IsOperation !=1" class="link" style="word-break: normal;text-align:left;"
:class="{'Hotel_red':subItem.HotelChangeState==3}" :class="{'Hotel_red':subItem.HotelChangeState==3}"
@click="goUrlR('HotelManagement',subItem.HotelId,'酒店管理')">{{subItem.HotelName}}</p> @click="goUrlR('HotelManagement',subItem.HotelId,'酒店管理')">{{subItem.HotelName}}</p>
<p v-else class="link" style="word-break: normal;text-align:left;"
:class="{'Hotel_red':subItem.HotelChangeState==3}">{{subItem.HotelName}}</p>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -116,7 +118,7 @@ ...@@ -116,7 +118,7 @@
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<div class="w150"> <div class="w150">
<!--:disabled="subItem.OPState==1"--> <!--:disabled="subItem.OPState==1"-->
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')" <el-select :disabled='IsOperation !=1? false :true' class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getHotelList(subItem)' @change='sendValue(subItem)'> @visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID' <el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'> :key='itemHotel.ID'>
...@@ -124,10 +126,11 @@ ...@@ -124,10 +126,11 @@
<span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span> <span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
</el-option> </el-option>
</el-select> </el-select>
<p style="padding-top: 5px;"> <p style="padding-top: 5px;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a> <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p> </p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''> <el-upload v-if="IsOperation !=1" :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'> <el-button size="small" type="danger" @click='getItem(index, subIndex)'>
{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button> {{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
</el-upload> </el-upload>
...@@ -135,14 +138,16 @@ ...@@ -135,14 +138,16 @@
</td> </td>
<!-- 房间预定数 --> <!-- 房间预定数 -->
<td> <td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')" <el-input v-if="IsOperation !=1" class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount'></el-input> v-model='childItem.HouseTypeCount'></el-input>
<span v-else>{{childItem.HouseTypeCount}}</span>
</td> </td>
<!-- 预定人数 --> <!-- 预定人数 -->
<td> <td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')" <el-input v-if="IsOperation !=1" class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum'></el-input> @input="calculationPrice(subItem)" v-model='childItem.BookNum'></el-input>
<span v-else>{{childItem.BookNum}}</span>
</td> </td>
<!-- 尚差房间数 --> <!-- 尚差房间数 -->
<td> <td>
...@@ -153,15 +158,17 @@ ...@@ -153,15 +158,17 @@
</td> </td>
<!-- 单价/每人 --> <!-- 单价/每人 -->
<td> <td>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter' <el-input v-if="IsOperation !=1" @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'> @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'>
</el-input> </el-input>
<span v-else>{{childItem.UnitPrice}}</span>
</td> </td>
<!-- 免减人数 --> <!-- 免减人数 -->
<td> <td>
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')" <el-input v-if="IsOperation !=1" class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
v-model='childItem.HotelDiscount' @input="calculationPrice(subItem)"> v-model='childItem.HotelDiscount' @input="calculationPrice(subItem)">
</el-input> </el-input>
<span v-else>{{childItem.HotelDiscount}}</span>
</td> </td>
<!-- 金额小计 --> <!-- 金额小计 -->
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
...@@ -170,7 +177,7 @@ ...@@ -170,7 +177,7 @@
<!--返佣--> <!--返佣-->
<td> <td>
<p class="pHouseStyle link" @input="calculationPrice(subItem)"> <p class="pHouseStyle link" @input="calculationPrice(subItem)">
<span class="spanlink" v-if='childItem.IsRebateRatio==0' <span class="spanlink" v-if='childItem.IsRebateRatio==0 && IsOperation !=1'
@click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span> @click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
<span v-if='childItem.IsRebateRatio!=0'>{{childItem.RebateRatio}}</span> <span v-if='childItem.IsRebateRatio!=0'>{{childItem.RebateRatio}}</span>
</p> </p>
...@@ -185,7 +192,7 @@ ...@@ -185,7 +192,7 @@
<tr> <tr>
<td width="70" style="text-align:right;">订房状态：</td> <td width="70" style="text-align:right;">订房状态：</td>
<td> <td>
<el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')"> <el-select :disabled='IsOperation !=1? false :true' class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='确定' :value='1'></el-option> <el-option label='确定' :value='1'></el-option>
<el-option label='暂定' :value='2'></el-option> <el-option label='暂定' :value='2'></el-option>
...@@ -198,7 +205,7 @@ ...@@ -198,7 +205,7 @@
<tr> <tr>
<td width="70" style="text-align:right;">付款方式：</td> <td width="70" style="text-align:right;">付款方式：</td>
<td> <td>
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select :disabled='IsOperation !=1? false :true' class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option> <el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option> <el-option label='签单' :value='2'></el-option>
...@@ -213,7 +220,8 @@ ...@@ -213,7 +220,8 @@
<tr> <tr>
<td width="70" style="text-align:right;">订团号：</td> <td width="70" style="text-align:right;">订团号：</td>
<td> <td>
<el-input class='w135' v-model='subItem.ReserveNo'></el-input> <el-input v-if="IsOperation !=1" class='w135' v-model='subItem.ReserveNo'></el-input>
<span v-else>{{subItem.ReserveNo}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -222,13 +230,14 @@ ...@@ -222,13 +230,14 @@
<tr> <tr>
<td width="70" style="text-align:right;">备注：</td> <td width="70" style="text-align:right;">备注：</td>
<td> <td>
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input> <el-input v-if="IsOperation !=1" type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
<span v-else>{{subItem.Remarks}}</span>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<!-- 操作 --> <!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0 && IsOperation !=1" :rowspan="5">
<!--v-if="subItem.OPState!=1"--> <!--v-if="subItem.OPState!=1"-->
<template > <template >
<el-tooltip class="item" effect="dark" content="保存" placement="top-start"> <el-tooltip class="item" effect="dark" content="保存" placement="top-start">
...@@ -279,6 +288,7 @@ ...@@ -279,6 +288,7 @@
checkedsubIndex: '', checkedsubIndex: '',
loading: false, loading: false,
boxHeight: 0, boxHeight: 0,
IsOperation:'',
} }
}, },
methods: { methods: {
...@@ -396,6 +406,8 @@ ...@@ -396,6 +406,8 @@
NewCombinationNum: this.$route.query.NewCombinationNum NewCombinationNum: this.$route.query.NewCombinationNum
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
console.log(res.data.data.IsOperation)
let list = res.data.data.HotelOrderListReport; let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy; this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto; this.CreateByPhoto = res.data.data.CreateByPhoto;
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 1ad7a3fe
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" /> <input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" /> <input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -45,8 +45,10 @@ ...@@ -45,8 +45,10 @@
<table class="dinnerTable"> <table class="dinnerTable">
<tr> <tr>
<td colspan="2"> <td colspan="2">
<span style="padding-left:5px;" class="link" <span style="padding-left:5px;" class="link" v-if="IsOperation != 1"
@click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}</span> @click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}</span>
<span style="padding-left:5px;" class="link" v-else>{{subItem.DiningName}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -68,11 +70,12 @@ ...@@ -68,11 +70,12 @@
</table> </table>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
<el-select class='w160 sel' v-model='subItem.NewDiningID' filterable :placeholder="$t('pub.pleaseSel')" <el-select :disabled='IsOperation !=1? false :true' class='w160 sel' v-model='subItem.NewDiningID' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getDingList(item)' @change='sendValue(subItem,item)'> @visible-change='getDingList(item)' @change='sendValue(subItem,item)'>
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.Name' :value='itemHotel.ID' <el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'></el-option> :key='itemHotel.ID'></el-option>
</el-select> </el-select>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{subItem.UseDinnerTypeStr}} {{subItem.UseDinnerTypeStr}}
...@@ -90,20 +93,22 @@ ...@@ -90,20 +93,22 @@
{{childItem.PeopleNum}} {{childItem.PeopleNum}}
</td> </td>
<td> <td>
<span class="spanlink" v-if='childItem.PeoplePrice==0' <span class="spanlink" v-if='childItem.PeoplePrice==0 && IsOperation != 1'
@click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span> @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
<span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span> <span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span>
</td> </td>
<td> <td>
<el-input class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2' <el-input v-if="IsOperation !=1" class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2'
v-model='childItem.Discount' @keyup.native="checkInteger(childItem,'Discount')"></el-input> v-model='childItem.Discount' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
<span v-else>{{childItem.Discount}}</span>
</td> </td>
<td> <td>
{{(childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice}} {{(childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice}}
</td> </td>
<td> <td>
<el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.DiscountPrice' <el-input v-if="IsOperation !=1" class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.DiscountPrice'
@keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input>% @keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input><span v-else>{{childItem.DiscountPrice}}</span>%
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{subItem.TotalPrice}} {{subItem.TotalPrice}}
...@@ -115,21 +120,21 @@ ...@@ -115,21 +120,21 @@
付款方式： 付款方式：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select :disabled='IsOperation !=1? false :true' class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option> <el-option label='请选择' value='0'></el-option>
<el-option label='现付' value='1'></el-option> <el-option label='现付' value='1'></el-option>
<el-option label='签单' value='2'></el-option> <el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='3'></el-option> <el-option label='实物抵扣' value='3'></el-option>
<el-option label='预付' value='4'></el-option> <el-option label='预付' value='4'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="60" style="text-align:right;"> <td width="60" style="text-align:right;">
订餐方式： 订餐方式：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select v-model='subItem.DiningReserveType' class='w135 sel' <el-select :disabled='IsOperation !=1? false :true' v-model='subItem.DiningReserveType' class='w135 sel'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option> <el-option label='请选择' value='0'></el-option>
<el-option label='公司预订' value='1'></el-option> <el-option label='公司预订' value='1'></el-option>
...@@ -142,13 +147,15 @@ ...@@ -142,13 +147,15 @@
订团号： 订团号：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-input class='w135 tcenter' v-model='subItem.ReserveNo'></el-input> <el-input v-if="IsOperation !=1" class='w135 tcenter' v-model='subItem.ReserveNo'></el-input>
<span v-else>{{subItem.ReserveNo}}</span>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
<el-input type='textarea' rows="4" class='w120' v-model='subItem.Remarks'></el-input> <el-input v-if="IsOperation !=1" type='textarea' rows="4" class='w120' v-model='subItem.Remarks'></el-input>
<span v-else>{{subItem.Remarks}}</span>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -169,6 +176,7 @@ ...@@ -169,6 +176,7 @@
flightTotal: 0, flightTotal: 0,
GuestNum: 0, GuestNum: 0,
loading: false, loading: false,
IsOperation:'',
}; };
}, },
methods: { methods: {
...@@ -221,7 +229,8 @@ ...@@ -221,7 +229,8 @@
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.list = res.data.data; this.list = res.data.data.DiningList;
this.IsOperation = res.data.data.IsOperation;
this.list.forEach(item => { this.list.forEach(item => {
item.DinnerList = []; item.DinnerList = [];
item.DiningSummaryList.forEach(x => { item.DiningSummaryList.forEach(x => {
......
src/components/SalesModule/enrollTotal.vue
View file @ 1ad7a3fe
...@@ -193,6 +193,7 @@ ...@@ -193,6 +193,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p> <p>发团：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p> <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p> <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div> <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
...@@ -219,8 +220,8 @@ ...@@ -219,8 +220,8 @@
<td> <td>
<p style="color:#FF9C00">￥{{item.preferPrice}}</p> <p style="color:#FF9C00">￥{{item.preferPrice}}</p>
</td> </td>
<td> <td>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span> <span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span> <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
......
src/components/SalesModule/groupTourOrder.vue
View file @ 1ad7a3fe
...@@ -1512,7 +1512,7 @@ ...@@ -1512,7 +1512,7 @@
<tbody v-for="(item,index) in list" :key="index"> <tbody v-for="(item,index) in list" :key="index">
<tr> <tr>
<td rowspan="3"> <td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p> <p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
@click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}} @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
...@@ -1522,6 +1522,7 @@ ...@@ -1522,6 +1522,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
<p style="min-width: 180px;">发团：{{item.startDate}}</p> <p style="min-width: 180px;">发团：{{item.startDate}}</p>
<p>下单时间：{{item.createDate}}</p> <p>下单时间：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p> <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p> <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
</td> </td>
...@@ -1738,13 +1739,14 @@ ...@@ -1738,13 +1739,14 @@
</tr> </tr>
<tr style="height:20px"> <tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px"> <td colspan="16" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle" v-if="item.guestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
</span> </span>
<span class="RL-redType RL-remarkCon" v-else> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<span>暂无名单</span> <!-- <span>暂无名单</span>-->
</span> <!-- </span>-->
<span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span> <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
</td> </td>
</tr> </tr>
...@@ -2652,7 +2654,7 @@ ...@@ -2652,7 +2654,7 @@
this.showID = data this.showID = data
}, },
getRemarks(obj) { getRemarks(obj) {
// 华国豪5-5新增 // 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate) { if (moment().format("YYYY-MM-DD") >= obj.startDate) {
this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", { this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
...@@ -2683,7 +2685,7 @@ ...@@ -2683,7 +2685,7 @@
this.remarksMsg.isOrder = obj.isOrder this.remarksMsg.isOrder = obj.isOrder
} }
}, },
getDetail(obj) { getDetail(obj) {
this.Ysze = false; this.Ysze = false;
this.starTime = obj.startDate this.starTime = obj.startDate
this.endTime = obj.backDate this.endTime = obj.backDate
...@@ -3471,7 +3473,7 @@ ...@@ -3471,7 +3473,7 @@
err => {} err => {}
) )
}, },
getDdlyList(id) { getDdlyList(id) {
this.apipost( this.apipost(
'sellorder_get_GetSellClientSourceEnumList', { 'sellorder_get_GetSellClientSourceEnumList', {
typeId: id typeId: id
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 1ad7a3fe
...@@ -1526,6 +1526,7 @@ ...@@ -1526,6 +1526,7 @@
</div> </div>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>下单时间：{{item.createDate}}</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||userId==1||userId==5||positionId==168||isUpdateOrder">
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p> <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p> <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
...@@ -1745,13 +1746,14 @@ ...@@ -1745,13 +1746,14 @@
</tr> </tr>
<tr style="height:20px"> <tr style="height:20px">
<td colspan="15" class="RL_Order" style="height:20px"> <td colspan="15" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle" v-if="item.guestList.length>0 && item.isOwn !=2">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0 && item.isOwn !=2">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
</span> </span>
<span class="RL-redType RL-remarkCon" v-else> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<span>暂无名单</span> <!-- <span>暂无名单</span>-->
</span> <!-- </span>-->
<span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span> <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
</td> </td>
</tr> </tr>
...@@ -3142,7 +3144,7 @@ submitYSZEForm(){ ...@@ -3142,7 +3144,7 @@ submitYSZEForm(){
}, },
err => {} err => {}
); );
} else { } else {
} }
}, },
...@@ -3224,7 +3226,7 @@ submitYSZEForm(){ ...@@ -3224,7 +3226,7 @@ submitYSZEForm(){
); );
}, },
getRemarks(obj) { getRemarks(obj) {
// 华国豪5-5新增 // 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate){ if (moment().format("YYYY-MM-DD") >= obj.startDate){
this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", { this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
...@@ -3256,7 +3258,7 @@ submitYSZEForm(){ ...@@ -3256,7 +3258,7 @@ submitYSZEForm(){
this.remarksMsg.Remarks = obj.remarks; this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks; this.remarksMsg.OldRemarks = obj.remarks;
} }
//HK 新加 //HK 新加
if(this.userId==1 || this.userId==5|| this.positionId==168) if(this.userId==1 || this.userId==5|| this.positionId==168)
{ {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 1ad7a3fe
...@@ -1539,6 +1539,7 @@ ...@@ -1539,6 +1539,7 @@
style="color:red">({{item.LeaveStr}})</span></div> style="color:red">({{item.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div> <div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
<p>下单时间：{{item.CreateDate}}</p> <p>下单时间：{{item.CreateDate}}</p>
<p v-if="item.TradeWay ==1">{{item.PlatformOrder}}</p>
</td> </td>
<td> <td>
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位 <p class="fz12 over_ellipsis" style="width: 90%;">领队控位
...@@ -1682,14 +1683,15 @@ ...@@ -1682,14 +1683,15 @@
</tr> </tr>
<tr> <tr>
<td colspan="13" class="RL_Order"> <td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle" v-if="item.GuestList.length>0">名单:</span>
<p 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" <span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</p> </p>
<p class="RL-redType RL-remarkCon" v-else> <!-- <p class="RL-redType RL-remarkCon" v-else>-->
<span>暂无名单</span> <!-- <span>暂无名单</span>-->
</p> <!-- </p>-->
<span>房间信息：{{item.OrderGuestHouseStr}}</span>
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span> <span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td> </td>
</tr> </tr>
...@@ -1744,6 +1746,7 @@ ...@@ -1744,6 +1746,7 @@
style="color:red">({{childItem.LeaveStr}})</span></div> style="color:red">({{childItem.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{childItem.CommissionSPeopleName}}</div> <div class="RL_CreatInfo">关联销售：{{childItem.CommissionSPeopleName}}</div>
<p>下单时间：{{childItem.CreateDate}}</p> <p>下单时间：{{childItem.CreateDate}}</p>
<p v-if="childItem.TradeWay ==1">{{childItem.PlatformOrder}}</p>
<p v-if='childItem.CommissionMoney' style="color:red">提成：{{childItem.CommissionMoney}}</p> <p v-if='childItem.CommissionMoney' style="color:red">提成：{{childItem.CommissionMoney}}</p>
<p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}} <p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}}
</p> </p>
...@@ -1944,14 +1947,15 @@ ...@@ -1944,14 +1947,15 @@
</tr> </tr>
<tr> <tr>
<td colspan="13" class="RL_Order"> <td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle" v-if="childItem.GuestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="childItem.GuestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="childItem.GuestList.length>0">
<span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList" <span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span> @click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
</span> </span>
<span class="RL-redType RL-remarkCon" v-else> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<span>暂无名单</span> <!-- <span>暂无名单</span>-->
</span> <!-- </span>-->
<span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
<span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span> <span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span>
</td> </td>
</tr> </tr>
...@@ -2262,14 +2266,14 @@ ...@@ -2262,14 +2266,14 @@
</tr> </tr>
<tr> <tr>
<td colspan="13" class="RL_Order"> <td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle" v-if="item.GuestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList" <span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span> </span>
<span class="RL-redType RL-remarkCon" v-else> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<span>暂无名单</span> <!-- <span>暂无名单</span>-->
</span> <!-- </span>-->
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span> <span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td> </td>
</tr> </tr>
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 1ad7a3fe
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" /> <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" /> <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -74,15 +74,17 @@ ...@@ -74,15 +74,17 @@
{{childItem.PeopleNum}} {{childItem.PeopleNum}}
</td> </td>
<td> <td>
<el-input class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number" <el-input v-if="IsOperation !=1" class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number"
@input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'UsePeopleNum')"></el-input> @input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'UsePeopleNum')"></el-input>
<span v-else>{{childItem.UsePeopleNum}}</span>
</td> </td>
<td> <td>
<el-input class='w50 tcenter' maxlength='2' v-model='childItem.Discount' type="number" <el-input v-if="IsOperation !=1" class='w50 tcenter' maxlength='2' v-model='childItem.Discount' type="number"
@input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'Discount')"></el-input> @input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
<span v-else>{{childItem.Discount}}</span>
</td> </td>
<td> <td>
<span class="spanlink" v-if='childItem.PeoplePrice==0' <span class="spanlink" v-if='childItem.PeoplePrice==0 && IsOperation !=1'
@click="goUrl('ticketManagement',subItem,'门票管理')">设置</span> @click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
<span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span> <span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span>
</td> </td>
...@@ -90,7 +92,7 @@ ...@@ -90,7 +92,7 @@
{{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}} {{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
</td> </td>
<td> <td>
<span class="spanlink" v-if='childItem.DiscountPrice==0' <span class="spanlink" v-if='childItem.DiscountPrice==0 && IsOperation !=1'
@click="goUrl('scenicSpotInfoManage',subItem,'景区列表')">设置</span> @click="goUrl('scenicSpotInfoManage',subItem,'景区列表')">设置</span>
<span v-if='childItem.DiscountPrice!=0'>{{childItem.DiscountPrice}}%</span> <span v-if='childItem.DiscountPrice!=0'>{{childItem.DiscountPrice}}%</span>
</td> </td>
...@@ -104,13 +106,14 @@ ...@@ -104,13 +106,14 @@
付款方式： 付款方式：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select :disabled='IsOperation !=1? false :true' class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option> <el-option label='请选择' value='0'></el-option>
<el-option label='现付' value='1'></el-option> <el-option label='现付' value='1'></el-option>
<el-option label='签单' value='2'></el-option> <el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='5'></el-option> <el-option label='实物抵扣' value='5'></el-option>
<el-option label='预付' value='4'></el-option> <el-option label='预付' value='4'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -118,13 +121,15 @@ ...@@ -118,13 +121,15 @@
订团号： 订团号：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-input class='w135' v-model='subItem.CombinationNum' type="text"></el-input> <el-input v-if="IsOperation !=1" class='w135' v-model='subItem.CombinationNum' type="text"></el-input>
<span v-else>{{subItem.CombinationNum}}</span>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3" >
<el-input type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input> <el-input v-if="IsOperation !=1" type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input>
<span v-else>{{subItem.Remarks}}</span>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -144,6 +149,7 @@ ...@@ -144,6 +149,7 @@
flightTotal: 0, flightTotal: 0,
GuestNum: 0, GuestNum: 0,
loading: false, loading: false,
IsOperation:'',
} }
}, },
methods: { methods: {
...@@ -179,7 +185,8 @@ ...@@ -179,7 +185,8 @@
}, res => { }, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DataList = res.data.data; this.DataList = res.data.data.ScenicList;
this.IsOperation = res.data.data.IsOperation;
this.DataList.forEach(item => { this.DataList.forEach(item => {
item.ScenicStatisticsList.forEach(x => { item.ScenicStatisticsList.forEach(x => {
x.PayStyle = x.PayStyle.toString(); x.PayStyle = x.PayStyle.toString();
......
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