Skip to content

S
SuperMan
Commit 848c6b4a authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents cde41d79 8e6464b7
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 119 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 848c6b4a
...@@ -204,22 +204,22 @@ ...@@ -204,22 +204,22 @@
<el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12'></el-option>
</el-select> </el-select>
<el-select filterable v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1"> <el-select v-if="!showDisable" filterable v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
<el-option v-for='item in ClientTypeList' <el-option v-for='item in ClientTypeList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
:key='item.ID'> :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<el-select filterable v-if="msg.ClientType==7" v-model='msg.IsLeader' :placeholder="$t('fnc.khmingcheng')" class="w135 _border_b_1"> <el-select filterable v-if="msg.ClientType==7&&!showDisable" v-model='msg.IsLeader' :placeholder="$t('fnc.khmingcheng')" class="w135 _border_b_1">
<el-option :label='$t("fnc.zslingdui")' :value='1' :key='1'> </el-option> <el-option :label='$t("fnc.zslingdui")' :value='1' :key='1'> </el-option>
<el-option :label='$t("fnc.lslingdui")' :value='0' :key='0'> </el-option> <el-option :label='$t("fnc.lslingdui")' :value='0' :key='0'> </el-option>
</el-select> </el-select>
<template v-if="msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3"> <template v-if="msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable">
<el-select v-if="msg.IsLeader==1" filterable v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1"> <el-select v-if="msg.IsLeader==1" filterable v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1">
<el-option v-for='item in ClientAccountList' <el-option v-for='item in ClientAccountList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -227,8 +227,8 @@ ...@@ -227,8 +227,8 @@
</el-option> </el-option>
</el-select> </el-select>
</template> </template>
<template v-if="msg.ClientType!=7&&msg.IsPublic!=2&&msg.IsPublic!=3"> <template v-if="msg.ClientType!=7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable">
<el-select filterable v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1"> <el-select filterable v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1">
<el-option v-for='item in ClientAccountList' <el-option v-for='item in ClientAccountList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
</table> </table>
<div class="rb_top_row _r_mt10"> <div class="rb_top_row _r_mt10">
<template v-for="(item,index) in newAuditList"> <template v-for="(item,index) in newAuditList">
<p> <p :key="index">
{{item.AuditDescription}}:<span class="_r_name" ></span> {{item.AuditDescription}}:<span class="_r_name" ></span>
</p> </p>
</template> </template>
...@@ -673,6 +673,7 @@ export default { ...@@ -673,6 +673,7 @@ export default {
EmployeeId:0, EmployeeId:0,
describeList:[], describeList:[],
isFrompassenger:false, isFrompassenger:false,
showDisable:false,
} }
}, },
methods:{ methods:{
...@@ -682,13 +683,16 @@ export default { ...@@ -682,13 +683,16 @@ export default {
this.msg.detailList.splice(i,1); this.msg.detailList.splice(i,1);
this.$forceUpdate(); this.$forceUpdate();
}, },
IsPublicChange(){ IsPublicChange(val){
// if(this.msg.IsPublic==2||this.msg.IsPublic==3){ this.showDisable=false;
// this.msg.AccountNumber = '';
// }
this.msg.ClientType = ''; this.msg.ClientType = '';
this.msg.ClientID = ''; this.msg.ClientID = '';
this.msg.AccountNumber = ''; this.msg.AccountNumber = '';
this.ClientAccountListS=[];
if(val==8){
this.showDisable=true;
}
}, },
jumpPage(path,obj,type){ //生成单据时连带信息跳转 jumpPage(path,obj,type){ //生成单据时连带信息跳转
if(type==1){ if(type==1){
...@@ -864,7 +868,11 @@ export default { ...@@ -864,7 +868,11 @@ export default {
if(this.msg.detailList.length<1)return this.$message.error(this.$t('rule.qtxzsyxfyshuoming')); if(this.msg.detailList.length<1)return this.$message.error(this.$t('rule.qtxzsyxfyshuoming'));
if(this.msg.PayDate==='') return this.$message.error(this.$t('rule.qxzyjfkshijian')); if(this.msg.PayDate==='') return this.$message.error(this.$t('rule.qxzyjfkshijian'));
} }
if(this.msg.IsPublic!=8){
if(this.msg.ClientType==='')return this.$message.error(this.$t('rule.qxzfkduixiang')); if(this.msg.ClientType==='')return this.$message.error(this.$t('rule.qxzfkduixiang'));
}else{
this.msg.ClientType=0;
}
// IsPublic 2 现金 IsLeader 0 临时领队 // IsPublic 2 现金 IsLeader 0 临时领队
if(this.msg.IsPublic<2 && this.IsLeader===1){ if(this.msg.IsPublic<2 && this.IsLeader===1){
if(this.msg.ClientID==='') return this.$message.error(this.$t('rule.qxzkhmingcheng')); if(this.msg.ClientID==='') return this.$message.error(this.$t('rule.qxzkhmingcheng'));
......
src/components/Hotel/HotelProductManage2.vue
View file @ 848c6b4a
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<th width="50">批次</th> <th width="50">批次</th>
<th width="50">价格</th> <th width="50">价格</th>
<th width="50">库存</th> <th width="50">库存</th>
<th width="50">剩余库存</th>
</tr> </tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList"> <tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td> <td>
...@@ -80,8 +81,12 @@ ...@@ -80,8 +81,12 @@
<td> <td>
{{childItem.Inventory}} {{childItem.Inventory}}
</td> </td>
<td>
{{childItem.RemainingInventory}}
</td>
</tr> </tr>
</table> </table>
<input type="button" class="hollowFixedBtn Htupbtn" value="修改" @click="goEdit('2', subItem.day,subItem.data.SubList[0].BatchNumber)"/>
</div> </div>
</template> </template>
</div> </div>
...@@ -1601,7 +1606,7 @@ ...@@ -1601,7 +1606,7 @@
.hotelProductManage2 .detailInfo { .hotelProductManage2 .detailInfo {
display: none; display: none;
position: absolute; position: absolute;
left: -52px; left: -70px;
top: 50px; top: 50px;
z-index: 999; z-index: 999;
} }
...@@ -1609,7 +1614,7 @@ ...@@ -1609,7 +1614,7 @@
.hotelProductManage2 .triangle_border_up { .hotelProductManage2 .triangle_border_up {
width: 0; width: 0;
height: 0; height: 0;
border-width: 0 86px 30px; border-width: 0 103px 30px;
border-style: solid; border-style: solid;
opacity: 0.75; opacity: 0.75;
border-color: transparent transparent rgba(233, 82, 82, 1); border-color: transparent transparent rgba(233, 82, 82, 1);
...@@ -1617,8 +1622,8 @@ ...@@ -1617,8 +1622,8 @@
} }
.hotelProductManage2 .detailInfo .popContent { .hotelProductManage2 .detailInfo .popContent {
width: 170px; width: 205px;
height: 80px; min-height: 80px;
background-color: #e95252; background-color: #e95252;
text-align: left; text-align: left;
color: #fff; color: #fff;
...@@ -1641,5 +1646,7 @@ ...@@ -1641,5 +1646,7 @@
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
text-align: right; text-align: right;
} }
.hotelProductManage2 .Htupbtn{
padding:0 10px;height:25px;margin:10px 0 0 75px;
}
</style> </style>
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 848c6b4a
...@@ -256,6 +256,12 @@ ...@@ -256,6 +256,12 @@
this.list.forEach(item => { this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => { item.DiningSummaryList.forEach(insideItem => {
insideItem.OrderState = 0; insideItem.OrderState = 0;
if (!insideItem.Discount) {
insideItem.Discount = 0;
}
if (!insideItem.DiscountPrice) {
insideItem.DiscountPrice = 0;
}
}) })
}) })
} }
...@@ -263,6 +269,12 @@ ...@@ -263,6 +269,12 @@
this.list.forEach(item => { this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => { item.DiningSummaryList.forEach(insideItem => {
insideItem.OrderState = 1; insideItem.OrderState = 1;
if (!insideItem.Discount) {
insideItem.Discount = 0;
}
if (!insideItem.DiscountPrice) {
insideItem.DiscountPrice = 0;
}
}) })
}) })
} }
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 848c6b4a
...@@ -876,12 +876,14 @@ ...@@ -876,12 +876,14 @@
font-size: 20px; font-size: 20px;
cursor: pointer; cursor: pointer;
} }
.groupts .underline{
.groupts .underline {
text-decoration: underline; text-decoration: underline;
margin: 5px; margin: 5px;
text-align: center; text-align: center;
} }
.rgsureBtn{
.rgsureBtn {
color: #fff; color: #fff;
padding: 0 15px; padding: 0 15px;
height: 25px; height: 25px;
...@@ -891,19 +893,21 @@ ...@@ -891,19 +893,21 @@
border-radius: 15px; border-radius: 15px;
margin-left: 10px; margin-left: 10px;
} }
.rgsureBtn:hover{
.rgsureBtn:hover {
background-color: #297BEF; background-color: #297BEF;
} }
.rgComTips{
text-align:left;font-size:12px; .rgComTips {
margin-left:10px; text-align: left;
font-size: 12px;
margin-left: 10px;
} }
</style> </style>
<template> <template>
<div class="flexOne RegistrationList groupts" style="min-width: 1200px;"> <div class="flexOne RegistrationList groupts" style="min-width: 1200px;">
<div class="planeTicketEdit ownScrollbarStyle" v-show="isShowLayer2"> <div class="planeTicketEdit ownScrollbarStyle" v-show="isShowLayer2">
<p>修改 <p>修改
<span class="fr" style="margin-right:60px;"> <span class="fr" style="margin-right:60px;">
...@@ -961,17 +965,9 @@ ...@@ -961,17 +965,9 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price"> <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' :disabled="true" <el-input v-model='addMsg.Unit_Price' :disabled="true"
@keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item> </el-form-item>
<!-- <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-col> </el-col>
</el-row> </el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div> <div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
...@@ -1080,25 +1076,6 @@ ...@@ -1080,25 +1076,6 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="23"> <el-col :span="23">
...@@ -1210,7 +1187,6 @@ ...@@ -1210,7 +1187,6 @@
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'> <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -1294,8 +1270,8 @@ ...@@ -1294,8 +1270,8 @@
@input='getTotalPrice()'></el-input> @input='getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="拒签人数" prop="RefuseVisaNum" > <el-form-item label="拒签人数" prop="RefuseVisaNum">
<el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')" <el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
@input='getTotalPrice()'></el-input> @input='getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
...@@ -1368,11 +1344,6 @@ ...@@ -1368,11 +1344,6 @@
</el-form> </el-form>
</div> </div>
</el-col> </el-col>
<!-- <el-col :span="4">
<el-form-item label="预计提成" prop="Commission">
<el-input v-model='addMsg.Commission' :disabled="true"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="4" v-show="addMsg.CustomerType==1||addMsg.CustomerType==2"> <el-col :span="4" v-show="addMsg.CustomerType==1||addMsg.CustomerType==2">
<el-form-item label="分摊人" prop="CommissionSharePeople"> <el-form-item label="分摊人" prop="CommissionSharePeople">
<el-select :disabled="isUpdateSharePeople" filterable clearable @change='getTicheng' <el-select :disabled="isUpdateSharePeople" filterable clearable @change='getTicheng'
...@@ -1458,25 +1429,6 @@ ...@@ -1458,25 +1429,6 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="23"> <el-col :span="23">
...@@ -1532,7 +1484,6 @@ ...@@ -1532,7 +1484,6 @@
</div> </div>
</div> </div>
<div class="RL_rightBtn" v-if="isShow===true"> <div class="RL_rightBtn" v-if="isShow===true">
<!--item.TCID,item.OutBranchId-->
<input type="button" class="normalBtn" <input type="button" class="normalBtn"
@click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)" value="团报" /> @click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)" value="团报" />
...@@ -1579,10 +1530,10 @@ ...@@ -1579,10 +1530,10 @@
<tbody v-for="(item,index) in OrderDataList.leadetList" :key="index"> <tbody v-for="(item,index) in OrderDataList.leadetList" :key="index">
<tr> <tr>
<td rowspan="3"> <td rowspan="3">
<!-- @click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)"-->
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="item.OrderId"> <div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="item.OrderId">
{{item.OrderId}} {{item.OrderId}}
<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="通过小程序确认单报名" placement="top" v-show="item.OrderForm==4">
<i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</div> </div>
<div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" <div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''"
style="color:red">({{item.LeaveStr}})</span></div> style="color:red">({{item.LeaveStr}})</span></div>
...@@ -1590,7 +1541,10 @@ ...@@ -1590,7 +1541,10 @@
<p>下单时间：{{item.CreateDate}}</p> <p>下单时间：{{item.CreateDate}}</p>
</td> </td>
<td> <td>
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p> <p class="fz12 over_ellipsis" style="width: 90%;">领队控位
<input type="button" class="normalBtn" @click="UpdateLeaderSeat(item)" style="display:none;"
:value="ConfigData.Config.IsLeaderUseSeat==0?'占机位':'取消机位'" />
</p>
</td> </td>
<td> <td>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" <span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap"
...@@ -1599,7 +1553,6 @@ ...@@ -1599,7 +1553,6 @@
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span> slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" <span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span> slot="reference">{{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>
<td>{{item.TC_Price}}</td> <td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td> <td>{{item.Unit_Price}}</td>
...@@ -1783,7 +1736,9 @@ ...@@ -1783,7 +1736,9 @@
<p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p> <p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p>
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId"> <div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId">
{{childItem.OrderId}} {{childItem.OrderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="childItem.OrderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip> <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top"
v-show="childItem.OrderForm==4"> <i class="iconfont icon-xiaochengxu"
style="font-size:22px;color:red;"></i></el-tooltip>
</div> </div>
<div class="RL_CreatInfo">{{childItem.CreateBy}}<span v-if="childItem.LeaveStr!=''" <div class="RL_CreatInfo">{{childItem.CreateBy}}<span v-if="childItem.LeaveStr!=''"
style="color:red">({{childItem.LeaveStr}})</span></div> style="color:red">({{childItem.LeaveStr}})</span></div>
...@@ -1918,9 +1873,9 @@ ...@@ -1918,9 +1873,9 @@
:class="{'RL-redType':childItem.statsstr=='候补'}">{{childItem.statsstr}}</span></td> :class="{'RL-redType':childItem.statsstr=='候补'}">{{childItem.statsstr}}</span></td>
<td> <td>
<div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div> <div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div>
<span v-if='childItem.ConfirmFileList.length>0' <span v-if='childItem.ConfirmFileList.length>0' @click="downLoadFile(childItem.ConfirmFileList)"
@click="downLoadFile(childItem.ConfirmFileList)" style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span> style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span>
</td> </td>
<td class="RL-BTNlist" rowspan="2"> <td class="RL-BTNlist" rowspan="2">
<el-button-group> <el-button-group>
...@@ -2019,17 +1974,20 @@ ...@@ -2019,17 +1974,20 @@
<td colspan="6" style="height: 40px;"> <td colspan="6" style="height: 40px;">
<div class="clearfix RL-MARK" style="width:75%;float:left;"> <div class="clearfix RL-MARK" style="width:75%;float:left;">
<span class="RL-opremarkTitle">OP备注:</span> <span class="RL-opremarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon" style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span> <span class="RL-redType RL-remarkCon"
style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
</div> </div>
<div style="float:right;" v-if="childItem.IsCanClear==0"> <div style="float:right;" v-if="childItem.IsCanClear==0">
<input type="button" value="确认订单" class="rgsureBtn" @click="clearSeat(childItem,1)" style="display:block;"/> <input type="button" value="确认订单" class="rgsureBtn" @click="clearSeat(childItem,1)"
<div class="rgComTips">该订单<span style="color:red;">未确认</span>会</div> style="display:block;" />
<div class="rgComTips">被系统自动清位</div> <div class="rgComTips">该订单<span style="color:red;">未确认</span>会</div>
<div class="rgComTips">被系统自动清位</div>
</div> </div>
<div style="float:right;" v-else> <div style="float:right;" v-else>
<input type="button" value="取消确认" class="normalBtn" @click="clearSeat(childItem,2)" style="display:block;padding:0 15px;height:25px;"/> <input type="button" value="取消确认" class="normalBtn" @click="clearSeat(childItem,2)"
<div class="rgComTips">该订单<span style="color:green">已确认</span>不</div> style="display:block;padding:0 15px;height:25px;" />
<div class="rgComTips">会被系统清位</div> <div class="rgComTips">该订单<span style="color:green">已确认</span>不</div>
<div class="rgComTips">会被系统清位</div>
</div> </div>
</td> </td>
<td colspan="4" style="height: 40px;cursor: pointer;" <td colspan="4" style="height: 40px;cursor: pointer;"
...@@ -2050,10 +2008,14 @@ ...@@ -2050,10 +2008,14 @@
<div> <div>
<span>发票单据：</span> <span>发票单据：</span>
<span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2"> <span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
<span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span> @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3"
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span> class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 "
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
</span> </span>
<span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">暂无数据</span> <span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
</div> </div>
...@@ -2105,8 +2067,10 @@ ...@@ -2105,8 +2067,10 @@
<div> <div>
<p class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="item.OrderId" <p class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="item.OrderId"
@click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)">{{item.OrderId}} @click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)">{{item.OrderId}}
<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="通过小程序确认单报名" placement="top"
</p> v-show="item.OrderForm==4"> <i class="iconfont icon-xiaochengxu"
style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p v-if="item.IsLeaderOrder==1">(领队)</p> <p v-if="item.IsLeaderOrder==1">(领队)</p>
<p v-else-if="item.IsLeaderOrder!=1&&item.GroupType==1">(散拼跟团)</p> <p v-else-if="item.IsLeaderOrder!=1&&item.GroupType==1">(散拼跟团)</p>
<p v-else-if="item.IsLeaderOrder!=1&&item.GroupType==2">(小包团)</p> <p v-else-if="item.IsLeaderOrder!=1&&item.GroupType==2">(小包团)</p>
...@@ -2241,7 +2205,8 @@ ...@@ -2241,7 +2205,8 @@
</td> </td>
<td> <td>
<div @click="goOpenUrl('confirmationOrder',item.orderId)" style="cursor:pointer;">电子确认函</div> <div @click="goOpenUrl('confirmationOrder',item.orderId)" style="cursor:pointer;">电子确认函</div>
<span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)" style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span> <span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)"
style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span>
</td> </td>
<td class="RL-BTNlist" rowspan="2"> <td class="RL-BTNlist" rowspan="2">
<el-button-group> <el-button-group>
...@@ -2652,7 +2617,7 @@ ...@@ -2652,7 +2617,7 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<a id='RegistrationList_DownLoad' target="_blank" style="display:none">1不要删除</a> <a id='RegistrationList_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div> </div>
</template> </template>
...@@ -2795,7 +2760,7 @@ ...@@ -2795,7 +2760,7 @@
CommissionShareMoney: "0", CommissionShareMoney: "0",
//订单归属【HK新加，报名清单页面修改使用】 //订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0, CreateBy: 0,
RefuseVisaNum:0,//拒签人数 RefuseVisaNum: 0, //拒签人数
}, },
//行程下载使用 //行程下载使用
travelControlTripLayerShow: false, travelControlTripLayerShow: false,
...@@ -3135,7 +3100,7 @@ ...@@ -3135,7 +3100,7 @@
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString(); this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString(); this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString(); this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString(); this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.IsChildrenTour = x.IsChildrenTour; this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount; this.IsBirdDiscount = x.IsBirdDiscount;
...@@ -4370,7 +4335,7 @@ ...@@ -4370,7 +4335,7 @@
getFlightInfo() { getFlightInfo() {
let msg = { let msg = {
ID: this.ConfigData.Config.AirTicketId, ID: this.ConfigData.Config.AirTicketId,
TCID:this.msg.TCID TCID: this.msg.TCID
} }
this.apipost("ticket_get_GetFlightListByTCID", msg, res => { this.apipost("ticket_get_GetFlightListByTCID", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -4694,10 +4659,6 @@ ...@@ -4694,10 +4659,6 @@
}, },
//申请优惠 //申请优惠
Preservation() { Preservation() {
// if (this.SOMsg.ApplyPrice < 0) {
// this.$message.error('请填写大于等于0的金额')
// return
// }
var numReg = /^[0-9]+$/ var numReg = /^[0-9]+$/
var numRe = new RegExp(numReg) var numRe = new RegExp(numReg)
if (!numRe.test(this.SOMsg.ApplyPrice)) { if (!numRe.test(this.SOMsg.ApplyPrice)) {
...@@ -4730,8 +4691,7 @@ ...@@ -4730,8 +4691,7 @@
this.SOMsg.ApplyReason = '' this.SOMsg.ApplyReason = ''
} }
}, },
err => { err => {}
}
) )
}, },
//点击修改业务员 //点击修改业务员
...@@ -4745,16 +4705,16 @@ ...@@ -4745,16 +4705,16 @@
this.showChangeSales = false; this.showChangeSales = false;
}, },
//清位 //清位
clearSeat(item,type){ clearSeat(item, type) {
let msg={}; let msg = {};
if(type==1){ if (type == 1) {
msg.IsCanClear = 1; msg.IsCanClear = 1;
msg.OrderId = item.OrderId msg.OrderId = item.OrderId
}else{ } else {
msg.IsCanClear = 0; msg.IsCanClear = 0;
msg.OrderId = item.OrderId msg.OrderId = item.OrderId
} }
this.apipost('sellorder_post_SetOrderIsCanClear',msg, this.apipost('sellorder_post_SetOrderIsCanClear', msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message) this.Success(res.data.message)
...@@ -4764,7 +4724,24 @@ ...@@ -4764,7 +4724,24 @@
} }
}, },
err => {}) err => {})
} },
//更新领队是否占机位
UpdateLeaderSeat(item) {
let msg = {
OrderId: item.OrderId,
IsLeaderUseSeat: this.ConfigData.Config.IsLeaderUseSeat
};
// this.apipost('sellorder_post_SetOrderIsCanClear', msg,
// res => {
// if (res.data.resultCode == 1) {
// this.Success(res.data.message)
// this.getList();
// } else {
// this.Error(res.data.message)
// }
// },
// err => {})
}
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 848c6b4a
...@@ -580,7 +580,14 @@ ...@@ -580,7 +580,14 @@
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
@keyup.native="checkInteger(priceData,'ClearOrderHour')" @keyup.native="checkInteger(priceData,'ClearOrderHour')"
@blur="checkInteger(priceData,'ClearOrderHour')"> @blur="checkInteger(priceData,'ClearOrderHour')">
<template slot="prepend">自动清位</template> <template slot="prepend">同行清位时间</template>
</el-input>
</el-form-item>
<el-form-item >
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SaleClearOrderHour"
@keyup.native="checkInteger(priceData,'SaleClearOrderHour')"
@blur="checkInteger(priceData,'SaleClearOrderHour')">
<template slot="prepend">销售清位时间</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<span class="TP_Sendprepend">送签时间</span> <span class="TP_Sendprepend">送签时间</span>
...@@ -1095,6 +1102,8 @@ ...@@ -1095,6 +1102,8 @@
IsNew: false, IsNew: false,
//选中的酒店数组 //选中的酒店数组
ChooseHotelArray: [], ChooseHotelArray: [],
//销售清位时间
SaleClearOrderHour:0,
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 848c6b4a
...@@ -203,6 +203,10 @@ ...@@ -203,6 +203,10 @@
if (!subItem.Discount) { if (!subItem.Discount) {
subItem.Discount = 0; subItem.Discount = 0;
} }
if(!subItem.UsePeopleNum)
{
subItem.UsePeopleNum=0;
}
}); });
}) })
}) })
...@@ -215,6 +219,10 @@ ...@@ -215,6 +219,10 @@
if (!subItem.Discount) { if (!subItem.Discount) {
subItem.Discount = 0; subItem.Discount = 0;
} }
if(!subItem.UsePeopleNum)
{
subItem.UsePeopleNum=0;
}
}); });
}) })
}) })
......
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