Skip to content

S
SuperMan
Commit 98415b11 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 97c83c3a 1b036994
Hide whitespace changes
Inline Side-by-side
Showing with 612 additions and 456 deletions
src/App.vue
View file @ 98415b11
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
} }
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_635492_uiowlzftn6k.css"; @import "//at.alicdn.com/t/font_635492_b8jianjuawm.css";
@import "./assets/css/Semibold.css"; @import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css"; @import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css"; @import "./assets/css/fileIcon.css";
......
src/components/FinancialModule/invoicesManagerAdd.vue
View file @ 98415b11
...@@ -124,11 +124,11 @@ ...@@ -124,11 +124,11 @@
<!-- <tr> <!-- <tr>
<td>应收总额</td> <td>应收总额</td>
<td class="w600 font-weight cursorpointer"> <td class="w600 font-weight cursorpointer">
<span @click="goUrlO(orderList.OrderId)">{{orderList.PreferPrice}}</span> <span @click="goUrlO(orderList.OrderId)">{{orderList.PreferPrice}}</span>
</td> </td>
<td>待收金额</td> <td>待收金额</td>
<td class="w600 font-weight cursorpointer"> <td class="w600 font-weight cursorpointer">
<span @click="goUrlO(orderList.OrderId)">{{orderList.DueInMoney}}</span> <span @click="goUrlO(orderList.OrderId)">{{orderList.DueInMoney}}</span>
</td> </td>
</tr> --> </tr> -->
<tr class="page_iisMgadd_bank"> <tr class="page_iisMgadd_bank">
...@@ -146,14 +146,23 @@ ...@@ -146,14 +146,23 @@
<td>到账日期</td> <td>到账日期</td>
<td>{{orderList.TradeDateStr}}</td> <td>{{orderList.TradeDateStr}}</td>
</tr> </tr>
<tr> <tr>
<td>团号</td> <td>团号</td>
<td colspan="3" class="w600 text-align-left">{{msg.TCID}}</td> <td>{{msg.TCID}}</td>
</tr>
<tr>
<td>订单号</td> <td>订单号</td>
<td colspan="3" class="w600 text-align-left">{{msg.OrderId}}</td> <td>{{msg.OrderId}}</td>
</tr> </tr>
<!-- <tr>-->
<!-- <td>团号</td>-->
<!-- <td colspan="3" class="w600 text-align-left">{{msg.TCID}}</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>订单号</td>-->
<!-- <td colspan="3" class="w600 text-align-left">{{msg.OrderId}}</td>-->
<!-- </tr>-->
<tr> <tr>
<td rowspan="6">开具内容</td> <td rowspan="6">开具内容</td>
<td> <td>
...@@ -216,12 +225,25 @@ ...@@ -216,12 +225,25 @@
<el-input placeholder type="number" v-model="msg.BankNo"></el-input> <el-input placeholder type="number" v-model="msg.BankNo"></el-input>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>备注</td> <td>备注</td>
<td colspan="3"> <td>
<el-input type="textarea" placeholder v-model="msg.Remarks"></el-input> <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>
</td> </td>
<td>预计到账时间</td>
<td>
<el-date-picker v-model='msg.AccountingDate' class="w230" value-format="yyyy-MM-dd" type="date"
placeholder="选择日期"></el-date-picker>
</td>
</tr> </tr>
<!-- <tr>-->
<!-- <td>备注</td>-->
<!-- <td colspan="3">-->
<!-- <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>-->
<!-- </td>-->
<!-- </tr>-->
</table> </table>
<div> <div>
<div> <div>
...@@ -289,6 +311,7 @@ export default { ...@@ -289,6 +311,7 @@ export default {
IsDefaultInfo: 1, IsDefaultInfo: 1,
ApplyPics: [], ApplyPics: [],
ID: 0, ID: 0,
AccountingDate:''
}, },
DepartName: "", DepartName: "",
emName: "", emName: "",
......
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ 98415b11
...@@ -246,11 +246,11 @@ ...@@ -246,11 +246,11 @@
<tr> <tr>
<td>应收总额</td> <td>应收总额</td>
<td class="w600 font-weight cursorpointer"> <td class="w600 font-weight cursorpointer">
<span @click="goUrlO(detail.OrderId)">{{detail.PreferPrice}}</span> <span @click="goUrlO(detail.OrderId)">{{detail.PreferPrice}}</span>
</td> </td>
<td>待收金额</td> <td>待收金额</td>
<td class="w600 font-weight cursorpointer"> <td class="w600 font-weight cursorpointer">
<span @click="goUrlO(detail.OrderId)">{{detail.DueInMoney}}</span> <span @click="goUrlO(detail.OrderId)">{{detail.DueInMoney}}</span>
</td> </td>
</tr> </tr>
<tr class="page_iisMgdetail_bank"> <tr class="page_iisMgdetail_bank">
...@@ -271,21 +271,21 @@ ...@@ -271,21 +271,21 @@
</tr> </tr>
<tr> <tr>
<td>{{$t('ios.tuanhao')}}</td> <td>{{$t('ios.tuanhao')}}</td>
<td colspan="3" class="w600 text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')"> <td class="text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
{{detail.TCNUM}}({{detail.TCID}}) {{detail.TCNUM}}({{detail.TCID}})
</td> </td>
</tr>
<tr>
<td>{{$t('ios.ddanhao')}}</td> <td>{{$t('ios.ddanhao')}}</td>
<td colspan="3" class="w600 text-align-left font-weight cursorpointer"> <td class="text-align-left font-weight cursorpointer">
<span @click="goUrlO(detail.OrderId)">{{detail.OrderId}}</span> <span @click="goUrlO(detail.OrderId)">{{detail.OrderId}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>{{$t('ios.cwdanju')}}</td> <td>{{$t('ios.cwdanju')}}</td>
<td colspan="3" class="w600 text-align-left font-weight cursorpointer"> <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
<template v-for="item in orderList.FrIDs"> <template v-for="item in orderList.FrIDs">
<span @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)">{{item}}</span> <span @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)">{{item}}</span>
</template> </template>
<span v-if="orderList.FrIDs && orderList.FrIDs.length<1">{{$t('ios.zanwu')}}</span> <span v-if="orderList.FrIDs && orderList.FrIDs.length<1">{{$t('ios.zanwu')}}</span>
</td> </td>
...@@ -329,9 +329,13 @@ ...@@ -329,9 +329,13 @@
</tr> </tr>
<tr> <tr>
<td>{{$t('hotel.hotel_remark')}}</td> <td>{{$t('hotel.hotel_remark')}}</td>
<td colspan="3"> <td>
{{detail.Remarks}} {{detail.Remarks}}
</td> </td>
<td>预计到账时间</td>
<td style="width: 190px;">
{{detail.AccountingDate}}
</td>
</tr> </tr>
</table> </table>
<el-dialog :title="$t('pub.hintMsg')" width="400px" :visible.sync="dialogFormVisible2" center :before-close="closeChangeMachie" > <el-dialog :title="$t('pub.hintMsg')" width="400px" :visible.sync="dialogFormVisible2" center :before-close="closeChangeMachie" >
...@@ -422,7 +426,7 @@ ...@@ -422,7 +426,7 @@
</div> </div>
<div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div> <div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
</div> </div>
</div> </div>
<div class="querenhan"> <div class="querenhan">
<p >确认函</p> <p >确认函</p>
<div style="width:100%;" > <div style="width:100%;" >
...@@ -462,7 +466,7 @@ ...@@ -462,7 +466,7 @@
<script> <script>
export default { export default {
data() { data() {
return { return {
detail: {}, detail: {},
orderList: {}, orderList: {},
loading: true, loading: true,
...@@ -518,7 +522,7 @@ export default { ...@@ -518,7 +522,7 @@ export default {
let path = "/Upload/Temporary/" let path = "/Upload/Temporary/"
this.$message.info('上传中...') this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({ this.saveMsg.push({
Type: fileTypeNumber, Type: fileTypeNumber,
Content: x.data.FilePath, Content: x.data.FilePath,
...@@ -569,7 +573,7 @@ export default { ...@@ -569,7 +573,7 @@ export default {
this.$router.push({ name: 'enrollTotal', query: { id: OrderId, blank: 'y', tab: '报名统计'} }); this.$router.push({ name: 'enrollTotal', query: { id: OrderId, blank: 'y', tab: '报名统计'} });
}, },
goUrlT: function (path, obj, title){ // 跳转团页面 goUrlT: function (path, obj, title){ // 跳转团页面
this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}}) this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})
}, },
goSaleFinacial: function () { // 跳转销售财务单据 goSaleFinacial: function () { // 跳转销售财务单据
let obj = { let obj = {
...@@ -604,7 +608,7 @@ export default { ...@@ -604,7 +608,7 @@ export default {
}); });
},1000) },1000)
} }
} }
}, null) }, null)
}, },
......
src/components/Restaurant/RestaurantPackage.vue
View file @ 98415b11
<style> <style>
.RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover { .RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover {
background-color: white; background-color: white;
box-shadow: 0px 0px 14px 0px #adadad; box-shadow: 0px 0px 14px 0px #adadad;
z-index: 10; z-index: 10;
position: relative; position: relative;
} }
.RestaurantPackage .DaysInfo span {
display: inline-block; .RestaurantPackage .DaysInfo span {
background-color: #2aaef2; display: inline-block;
color: white; background-color: #2aaef2;
border-radius: 4px; color: white;
padding: 0 10px; border-radius: 4px;
height: 30px; padding: 0 10px;
line-height: 30px; height: 30px;
} line-height: 30px;
.RestaurantPackage .DaysInfo span i { }
margin-right: 10px;
} .RestaurantPackage .DaysInfo span i {
.RestaurantPackage .singeRowTable tr:nth-child(n + 2) { margin-right: 10px;
height: 80px; }
text-align: center;
} .RestaurantPackage .singeRowTable tr:nth-child(n + 2) {
.RestaurantPackage .detailsIT .singeRowTable tr:nth-child(n + 2):hover { height: 80px;
background-color: white; text-align: center;
box-shadow: 0px 0px 14px 0px #adadad; }
z-index: 10;
position: relative; .RestaurantPackage .detailsIT .singeRowTable tr:nth-child(n + 2):hover {
} background-color: white;
.RestaurantPackage .Ldata { box-shadow: 0px 0px 14px 0px #adadad;
color: #333333; z-index: 10;
margin-top: 5px; position: relative;
} }
.RestaurantPackage .LP {
color: #e95252; .RestaurantPackage .Ldata {
} color: #333333;
.RestaurantPackage .HP { margin-top: 5px;
color: #2aaef2; }
text-align: left;
font-size: 14px; .RestaurantPackage .LP {
font-weight: bold; color: #e95252;
padding-left: 5px; }
display: inline-block;
} .RestaurantPackage .HP {
.RestaurantPackage .T1 { color: #2aaef2;
text-align: right; text-align: left;
color: #666666; font-size: 14px;
display: inline-block; font-weight: bold;
} padding-left: 5px;
.RestaurantPackage .T2 { display: inline-block;
text-align: left; }
color: #e95252;
font-size: 14px; .RestaurantPackage .T1 {
font-weight: bold; text-align: right;
padding-left: 5px; color: #666666;
display: inline-block; display: inline-block;
} }
.RestaurantPackage .descripTion {
border-radius: 4px; .RestaurantPackage .T2 {
width: 266px; text-align: left;
text-align: left; color: #e95252;
padding: 3px; font-size: 14px;
overflow: hidden; font-weight: bold;
text-overflow: ellipsis; padding-left: 5px;
display: -webkit-box; display: inline-block;
/*! autoprefixer: off */ }
-webkit-box-orient: vertical;
/* autoprefixer: on */ .RestaurantPackage .descripTion {
-webkit-line-clamp: 2; border-radius: 4px;
} width: 266px;
.RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover .descripTion { text-align: left;
background-color: #ededed; padding: 3px;
} overflow: hidden;
.RestaurantPackage .roomName { text-overflow: ellipsis;
display: inline-block; display: -webkit-box;
width: 200px; /*! autoprefixer: off */
overflow: hidden; -webkit-box-orient: vertical;
text-overflow: ellipsis; /* autoprefixer: on */
white-space: nowrap; -webkit-line-clamp: 2;
text-align: left; }
padding-left: 20px;
} .RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover .descripTion {
background-color: #ededed;
}
.RestaurantPackage .roomName {
display: inline-block;
width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-align: left;
padding-left: 20px;
}
</style> </style>
<template> <template>
<div class='flexOne RestaurantPackage'> <div class='flexOne RestaurantPackage'>
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<label>{{$t('restaurant.res_packageName')}}</label> <label>{{$t('restaurant.res_packageName')}}</label>
<el-input v-model="msg.MealName" maxlength="30" @keyup.native.enter="getList"></el-input> <el-input v-model="msg.MealName" maxlength="30" @keyup.native.enter="getList"></el-input>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList(),resetPageIndex()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
<input type="button" class="normalBtn" @click="resetId(),outerVisible = true,dialogTitle='添加套餐'" :value="$t('pub.addBtn')"/> @click="getList(),resetPageIndex()" />
</li> <input type="button" class="normalBtn" @click="resetId(),outerVisible = true,dialogTitle='添加套餐'"
</ul> :value="$t('pub.addBtn')" />
</div> </li>
<table class="singeRowTable centerTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading" style="border-collapse:separate;border-spacing:0px 10px;table-layout:fixed;"> </ul>
<tr> </div>
<th width="200">{{$t('restaurant.res_packageName')}}</th> <table class="singeRowTable centerTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"
<th width="200">{{$t('scen.sc_bjts')}}</th> style="border-collapse:separate;border-spacing:0px 10px;table-layout:fixed;">
<th>{{$t('scen.sc_dj')}}</th> <tr>
<th>{{$t('scen.sc_gj')}}</th> <th width="200">{{$t('restaurant.res_packageName')}}</th>
<th width="300">{{$t('hotel.hotel_remark')}}</th> <th width="200">{{$t('scen.sc_bjts')}}</th>
<th>{{$t('hotel.table_operat')}}</th> <th>{{$t('scen.sc_dj')}}</th>
</tr> <th>{{$t('scen.sc_gj')}}</th>
<tr v-for="item in DataList" :key="item.subCode"> <th width="300">{{$t('hotel.hotel_remark')}}</th>
<td> <th>{{$t('hotel.table_operat')}}</th>
<el-tooltip class="item" effect="dark" :content="item.MealName" placement="top-start" popper-class="max-w250"> </tr>
<span class="roomName">{{item.MealName}}</span> <tr v-for="item in DataList" :key="item.subCode">
</el-tooltip> <td>
</td> <el-tooltip class="item" effect="dark" :content="item.MealName" placement="top-start" popper-class="max-w250">
<td class="DaysInfo"> <span class="roomName">{{item.MealName}}</span>
<span><i class="iconfont icon-kaoqintongji"></i>{{item.Days}}{{$t('hotel.hotel_day')}}</span> </el-tooltip>
</td> </td>
<td> <td class="DaysInfo">
<p class="clearfix"> <span><i class="iconfont icon-kaoqintongji"></i>{{item.Days}}{{$t('hotel.hotel_day')}}</span>
<span class="tit_name T1"> </td>
{{item.CurrencyName==''?'':item.CurrencyName}}<span v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span class='tit_name T2'>{{item.LPrice}}</span> <td>
</p> <p class="clearfix">
<p class="Ldata">{{item.LDate}}</p> <span class="tit_name T1">
</td> {{item.CurrencyName==''?'':item.CurrencyName}}<span
<td> v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
<p class="clearfix"> class='tit_name T2'>{{item.LPrice}}</span>
<span class="tit_name T1"> </p>
{{item.CurrencyName==''?'':item.CurrencyName}}<span v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span class='tit_name HP'>{{item.HPrice}}</span> <p class="Ldata">{{item.LDate}}</p>
</p> </td>
<p class="Ldata">{{item.HDate}}</p> <td>
</td> <p class="clearfix">
<td> <span class="tit_name T1">
<el-tooltip class="item" effect="dark" v-if="item.MealDesc" :content="item.MealDesc" placement="top-start" popper-class="max-w250"> {{item.CurrencyName==''?'':item.CurrencyName}}<span
<span class="descripTion">{{item.MealDesc}}</span> v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
</el-tooltip> class='tit_name HP'>{{item.HPrice}}</span>
</td> </p>
<td> <p class="Ldata">{{item.HDate}}</p>
<el-button-group> </td>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"> <td>
<el-button type="primary" icon="iconfont icon-Edit" @click="outerVisible = true,dialogTitle='修改套餐',updateResturant(item.Id)"></el-button> <el-tooltip class="item" effect="dark" v-if="item.MealDesc" :content="item.MealDesc" placement="top-start"
</el-tooltip> popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('restaurant.res_bidManage')" placement="top-start"> <span class="descripTion">{{item.MealDesc}}</span>
<el-button type="primary" icon="iconfont icon-ico_shezhi" @click="goUrl('RestaurantPrice',item.Id)"></el-button> </el-tooltip>
</el-tooltip> </td>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <td>
<el-button type="danger" icon="el-icon-delete" @click="isDelete(item.Id)"></el-button> <el-button-group>
</el-tooltip> <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
</el-button-group> <el-button type="primary" icon="iconfont icon-Edit"
</td> @click="outerVisible = true,dialogTitle='修改套餐',updateResturant(item.Id)"></el-button>
</tr> </el-tooltip>
</table> <el-tooltip class="item" effect="dark" :content="$t('restaurant.res_bidManage')" placement="top-start">
<el-dialog custom-class='w500' :visible.sync="outerVisible" :title="dialogTitle" center :before-close="closeChangeMachie"> <el-button type="primary" icon="iconfont icon-ico_shezhi" @click="goUrl('RestaurantPrice',item.Id)">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="110px"> </el-button>
<el-form-item :label="$t('restaurant.res_packageResource')" prop="DiningId"> </el-tooltip>
<el-select :placeholder="$t('pub.pleaseSel')" class="w300" disabled v-model="addMsg.DiningId"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-option <el-button type="danger" icon="el-icon-delete" @click="isDelete(item.Id)"></el-button>
v-for="item in resList" </el-tooltip>
:key="item.ID" </el-button-group>
:label="item.Name" </td>
:value="item.ID"> </tr>
</el-option> </table>
</el-select> <el-dialog custom-class='w500' :visible.sync="outerVisible" :title="dialogTitle" center
</el-form-item> :before-close="closeChangeMachie">
<el-form-item :label="$t('restaurant.res_packageName')" prop="DiningMealType"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="110px">
<el-select filterable v-model='addMsg.DiningMealType' :placeholder="$t('pub.pleaseSel')"> <el-form-item :label="$t('restaurant.res_packageResource')" prop="DiningId">
<el-option v-for='item in DiningMealTypeList' <el-select :placeholder="$t('pub.pleaseSel')" class="w300" disabled v-model="addMsg.DiningId">
:label='item.Name' <el-option v-for="item in resList" :key="item.ID" :label="item.Name" :value="item.ID">
:value='item.ID' </el-option>
:key='item.ID'> </el-select>
</el-option> </el-form-item>
</el-select> <el-form-item :label="$t('restaurant.res_packageName')" prop="DiningMealType">
</el-form-item> <el-select filterable v-model='addMsg.DiningMealType' :placeholder="$t('pub.pleaseSel')">
<!-- <el-form-item :label="$t('restaurant.res_packageName')" prop="MealName"> <el-option v-for='item in DiningMealTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('restaurant.res_packageName')" prop="MealName">
<el-input class="w300" type="text" v-model="addMsg.MealName" maxlength="20"></el-input> <el-input class="w300" type="text" v-model="addMsg.MealName" maxlength="20"></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item :label="$t('hotel.hotel_produceDes')" prop="MealDesc"> <el-form-item :label="$t('hotel.hotel_produceDes')" prop="MealDesc">
<el-input class="w300" type="textarea" v-model="addMsg.MealDesc" maxlength="200"></el-input> <el-input class="w300" type="textarea" v-model="addMsg.MealDesc" maxlength="200"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp; <button class="hollowFixedBtn"
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
</div> <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</el-dialog> </div>
<div class="noData" v-show="noData"> </el-dialog>
{{$t('system.content_noData')}} <div class="noData" v-show="noData">
</div> {{$t('system.content_noData')}}
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=msg.total></el-pagination>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=msg.total></el-pagination>
</div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 6, pageSize: 6,
DiningId: "", DiningId: "",
MealName: "", MealName: "",
total: 0, total: 0,
currentPage: 1 currentPage: 1
}, },
addMsg: { addMsg: {
Id: "0", Id: "0",
DiningId: "", DiningId: "",
MealName: "", MealName: "",
MealDesc: "", MealDesc: "",
DiningMealType:"", DiningMealType: "",
}, },
loading: true, loading: true,
DiningMealTypeList:[], DiningMealTypeList: [],
outerVisible: false, outerVisible: false,
dialogTitle: "", dialogTitle: "",
noData: false, noData: false,
DataList: "", DataList: "",
//餐厅列表 //餐厅列表
resList: [], resList: [],
rules: { rules: {
//表单必填验证 //表单必填验证
DiningId: [{ required: true, message: "请选择套餐资源" }], DiningId: [{
DiningMealType: [{ required: true, message: "请选择套餐" }] required: true,
} message: "请选择套餐资源"
}; }],
}, DiningMealType: [{
methods: { required: true,
getList() { message: "请选择套餐"
this.loading = true; }]
this.apipost( }
"meal_post_GetPageList", };
this.msg, },
res => { methods: {
if(res.data.resultCode==1){ getList() {
this.loading = true;
this.apipost(
"meal_post_GetPageList",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.msg.total = res.data.data.count; this.msg.total = res.data.data.count;
if (this.msg.total > 0) { if (this.msg.total > 0) {
this.noData = false; this.noData = false;
...@@ -236,150 +261,154 @@ export default { ...@@ -236,150 +261,154 @@ export default {
this.noData = !this.noData; this.noData = !this.noData;
} }
this.loading = false; this.loading = false;
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
null null
); );
}, },
GetDiningMealTypeList(){ GetDiningMealTypeList() {
this.apipost('meal_post_GetDiningMealType',{},res=>{ this.apipost('meal_post_GetDiningMealType', {}, res => {
if(res.data.resultCode==1){
this.DiningMealTypeList=res.data.data
}
},err=>{})
},
saveResource() {
this.DiningMealTypeList.forEach(item=>{
if(this.addMsg.DiningMealType==item.ID)
{
this.addMsg.MealName =item.Name
}
})
this.apipost(
"meal_post_Set",
this.addMsg,
res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getList(); this.DiningMealTypeList = res.data.data
this.Success("保存成功！");
this.outerVisible = false;
this.resetForm("addMsg");
} else {
this.Error(res.data.message);
} }
}, }, err => {})
null },
); saveResource() {
}, this.DiningMealTypeList.forEach(item => {
updateResturant(Id) { if (this.addMsg.DiningMealType == item.ID) {
let msg = { this.addMsg.MealName = item.Name
ID: Id
};
this.apipost(
"meal_post_Get",
msg,
res => {
console.log(res)
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
this.addMsg.DiningId = parseInt(res.data.data.DiningId);
} else {
this.Error(res.data.message);
} }
},
null
);
},
resetId() {
this.addMsg.Id = "0";
},
isDelete(ID) {
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.Success("删除成功!");
let msg = {
ID: ID
};
this.apipost(
"meal_post_Remove",
msg,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
null
);
}) })
.catch(() => { this.apipost(
this.Info("已取消删除"); "meal_post_Set",
this.addMsg,
res => {
if (res.data.resultCode == 1) {
this.getList();
this.Success("保存成功！");
this.outerVisible = false;
this.resetForm("addMsg");
} else {
this.Error(res.data.message);
}
},
null
);
},
updateResturant(Id) {
let msg = {
ID: Id
};
this.apipost(
"meal_post_Get",
msg,
res => {
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
this.addMsg.DiningId = parseInt(res.data.data.DiningId);
} else {
this.Error(res.data.message);
}
},
null
);
},
resetId() {
this.addMsg.Id = "0";
},
isDelete(ID) {
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.Success("删除成功!");
let msg = {
ID: ID
};
this.apipost(
"meal_post_Remove",
msg,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
null
);
})
.catch(() => {
this.Info("已取消删除");
});
},
goUrl(path, id) {
this.$router.push({
path: path,
query: {
MealId: id,
DiningId: this.addMsg.DiningId,
blank: 'y',
tab: '报价管理'
}
}); });
}, },
goUrl(path, id) { handleCurrentChange(val) {
this.$router.push({ //翻页功能按钮
path: path, this.msg.pageIndex = val;
query: { MealId: id, DiningId: this.addMsg.DiningId,blank:'y',tab:'报价管理' } this.getList();
}); },
}, resetPageIndex() {
handleCurrentChange(val) { //查询初始化页码
//翻页功能按钮 this.msg.pageIndex = 1;
this.msg.pageIndex = val; this.msg.currentPage = 1;
this.getList(); },
}, initResrestaurant() {
resetPageIndex() { //初始化套餐资源
//查询初始化页码 let msg = {};
this.msg.pageIndex = 1; this.apipost(
this.msg.currentPage = 1; "dining_post_GetList",
}, msg,
initResrestaurant() { res => {
//初始化套餐资源 if (res.data.resultCode == 1) {
let msg = {}; this.resList = res.data.data;
this.apipost( }
"dining_post_GetList", },
msg, null
res => { );
if (res.data.resultCode == 1) { },
this.resList = res.data.data; submitForm(addMsg) {
//提交创建、修改表单
let that = this;
that.$refs[addMsg].validate(valid => {
if (valid) {
that.saveResource();
} else {
return false;
} }
}, });
null },
); closeChangeMachie(done) {
}, //弹出框关闭初始化弹框内表单
submitForm(addMsg) { done();
//提交创建、修改表单 this.resetForm("addMsg");
let that = this; },
that.$refs[addMsg].validate(valid => { resetForm(formName) {
if (valid) { this.$refs[formName].resetFields();
that.saveResource(); }
} else {
return false;
}
});
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
}, },
resetForm(formName) { mounted() {
this.$refs[formName].resetFields(); this.initResrestaurant();
this.addMsg.DiningId = parseInt(this.$route.query.id);
this.msg.DiningId = this.$route.query.id;
this.getList();
this.GetDiningMealTypeList();
} }
}, };
mounted() {
this.initResrestaurant();
this.addMsg.DiningId = parseInt(this.$route.query.id);
this.msg.DiningId = this.$route.query.id;
this.getList();
this.GetDiningMealTypeList();
}
};
</script> </script>
src/components/SalesModule/addPassenger.vue
View file @ 98415b11
...@@ -140,6 +140,12 @@ ...@@ -140,6 +140,12 @@
element-loading-background="rgba(0, 0, 0, 0.7)"> element-loading-background="rgba(0, 0, 0, 0.7)">
<div class="contForm"> <div class="contForm">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px"> <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px">
<li>
<el-form-item label="身份证号码" prop="IdCard">
<el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
</el-input>
</el-form-item>
</li>
<li> <li>
<el-form-item label="中文姓" prop="SurName"> <el-form-item label="中文姓" prop="SurName">
<el-input v-model='addMsg.SurName' class="w230" @input="Transformation(addMsg.SurName,'SurName')" <el-input v-model='addMsg.SurName' class="w230" @input="Transformation(addMsg.SurName,'SurName')"
...@@ -235,12 +241,7 @@ ...@@ -235,12 +241,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</li> </li>
<li>
<el-form-item label="身份证号码" prop="IdCard">
<el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写">
</el-input>
</el-form-item>
</li>
<li> <li>
<el-form-item label="家庭详细地址" prop="AddressDetail"> <el-form-item label="家庭详细地址" prop="AddressDetail">
...@@ -1904,7 +1905,36 @@ ...@@ -1904,7 +1905,36 @@
err => {} err => {}
); );
}, },
authentication() {
if (this.$route.query.guestId == 0) {
this.apipost(
"sellorder_post_GetGusetByIDCard",
{IdCard: this.addMsg.IdCard,},
res => {
if (res.data.resultCode == 1) {
let obj = res.data.data;
this.addMsg = obj;
this.addMsg.Sex = obj.Sex.toString();
this.addMsg.Marriage = obj.Marriage.toString();
if (this.addMsg.Marriage == "0") {
this.addMsg.Marriage = "";
}
this.addMsg.IsCriminalRecord = obj.IsCriminalRecord === null ? '' : obj.IsCriminalRecord.toString();
this.addMsg.IsDepartureRecord = obj.IsDepartureRecord.toString();
this.addMsg.Id = this.$route.query.guestId;
this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId;
this.Roominformation() //调取下房间信息
} else {
this.$message.error(res.data.message);
}
},
err => {
}
);
}
}
}, },
mounted() { mounted() {
this.getCountry(); this.getCountry();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 98415b11
...@@ -531,6 +531,9 @@ ...@@ -531,6 +531,9 @@
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover> </el-popover>
</p> </p>
<p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
<span style="color:red;font-weight:bold;">※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
</p>
</div> </div>
</div> </div>
<div class="el-col" style="width:190px;"> <div class="el-col" style="width:190px;">
...@@ -1265,7 +1268,7 @@ ...@@ -1265,7 +1268,7 @@
}) })
} }
}); });
// console.log('this.queryCommonData', this.queryCommonData.dataList) console.log("this.queryCommonData.dataList",this.queryCommonData.dataList);
} }
}, },
err => {} err => {}
......
src/components/busManagement/BusInfo.vue
View file @ 98415b11
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
} else if (obj.AirportPickUp == 13) { } else if (obj.AirportPickUp == 13) {
obj.PayType = 7; obj.PayType = 7;
} else { } else {
obj.PayType = 0; obj.PayType = 2;
} }
//高速付款方式默认现付 //高速付款方式默认现付
obj.HighSpeedPayType = 1; obj.HighSpeedPayType = 1;
...@@ -781,6 +781,7 @@ ...@@ -781,6 +781,7 @@
.length - 1]; .length - 1];
} }
let newPlanData = this.PlanTableData[index].BusPlanOrderList[subIndex]; let newPlanData = this.PlanTableData[index].BusPlanOrderList[subIndex];
newPlanData.AirportPickUp=oldPlanData.AirportPickUp;
newPlanData.DriverName = oldPlanData.DriverName; newPlanData.DriverName = oldPlanData.DriverName;
newPlanData.DriverTel = oldPlanData.DriverTel; newPlanData.DriverTel = oldPlanData.DriverTel;
newPlanData.BusNum = oldPlanData.BusNum; newPlanData.BusNum = oldPlanData.BusNum;
......
src/components/commonPage/comCheckHotel.vue
View file @ 98415b11
...@@ -4,16 +4,10 @@ ...@@ -4,16 +4,10 @@
border-bottom:1px solid #d1d1d1; border-bottom:1px solid #d1d1d1;
} }
.comCheckHotel>div{ .comCheckHotel>div{
float:left; width:100%;
width:120px;
border-right:1px solid #d1d1d1;
height:200px; height:200px;
overflow: auto overflow: auto
} }
.comCheckHotel>div:last-child{
width:230px;
border:none;
}
.comCk_list{ .comCk_list{
cursor: pointer; cursor: pointer;
padding:0 20px; padding:0 20px;
...@@ -42,21 +36,24 @@ ...@@ -42,21 +36,24 @@
<template> <template>
<div> <div>
<div class="cm_hotelTitle">酒店信息</div> <div class="cm_hotelTitle">
<el-select filterable v-model="selHotelId" @change="getChangeHotel(selHotelId)" :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in ProvinceList" :label='item.Name' :value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
酒店信息
</div>
<div>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane :label="item.ProvinceName" v-for="item in dataList"></el-tab-pane>
</el-tabs>
</div>
<div class="clearfix comCheckHotel"> <div class="clearfix comCheckHotel">
<div> <div>
<div class="comCk_list" v-for="(item,index) in dataList" :class="{'ckedList':ckindexOne==index}" @click="getCityList(item),ckindexOne=index"> <div class="comCk_list" v-for="(item,index) in HotelList">
{{item.ProvinceName}} <input type="checkbox" v-model="item.isChecked" @click="getCheck(item,index)" style=""/>
</div>
</div>
<div>
<div class="comCk_list" v-for="(item,index) in cityList" :class="{'ckedList':ckindexTwo==index}" @click="getHotelList(item),ckindexTwo=index">
{{item.CityName}}
</div>
</div>
<div>
<div class="comCk_list" v-for="item in HotelList">
<input type="checkbox" v-model="item.isChecked" @click="getCheck(item)" style=""/>
{{item.Name}}<span class="cm_Inventory">{{item.Inventory}}</span> {{item.Name}}<span class="cm_Inventory">{{item.Inventory}}</span>
</div> </div>
</div> </div>
...@@ -66,21 +63,22 @@ ...@@ -66,21 +63,22 @@
</template> </template>
<script> <script>
export default { export default {
// props:["sDate"],
data() { data() {
return { return {
dataList:[], dataList:[],
cityList:[],
HotelList:[], HotelList:[],
ckindexOne:-1, ckindexOne:-1,
ckindexTwo:-1, ckindexTwo:-1,
ID:0, ID:0,
HotelName:'' HotelName:'',
ProvinceList:[],
selHotelId:0,
activeName:'',
}; };
}, },
methods: { methods: {
getCheckHotel(sDate){ getCheckHotel(sDate){
this.$forceUpdate();
this.apipost('hotel_post_GetHasStockHotelList_V2', { this.apipost('hotel_post_GetHasStockHotelList_V2', {
//1-只查询有库存的酒店 //1-只查询有库存的酒店
IsMoreThanZero: 0, IsMoreThanZero: 0,
...@@ -88,52 +86,86 @@ export default { ...@@ -88,52 +86,86 @@ export default {
IsAllHotel: 1, IsAllHotel: 1,
sDate: sDate sDate: sDate
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
x.cityList.forEach(y=>{ x.HotelList.forEach(y=>{
y.HotelList.forEach(z=>{ y.isChecked=false;
z.isChecked=false; })
}) })
}) console.log(this.dataList,'datalist');
})
console.log(this.dataList,'子组件');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
getCityList(item){ getCheck(item,index){
this.cityList = item.cityList; this.HotelList.forEach((x,subIndex)=>{
this.HotelList = []; if(index==subIndex){
}, x.isChecked = !x.isChecked;
getHotelList(item){ }else{
this.HotelList = item.HotelList;
},
getCheck(item){
this.HotelList.forEach(x=>{
x.isChecked = false; x.isChecked = false;
}
}) })
item.isChecked = !item.isChecked;
this.$forceUpdate(); this.$forceUpdate();
}, },
//向父组件传递选中酒店 //向父组件传递选中酒店
sendCkedHotel(){ sendCkedHotel(){
console.log(this.dataList,'重选'); var ckHotelObj = {};
this.dataList.forEach(x=>{ this.HotelList.forEach((x,index)=>{
x.cityList.forEach(y=>{ if(x.isChecked){
y.HotelList.forEach(z=>{ ckHotelObj.ID = x.ID;
if(z.isChecked){ ckHotelObj.Address = x.Address;
this.ID = z.ID; ckHotelObj.Inventory = x.Inventory;
this.HotelName = z.Name; ckHotelObj.Name = x.Name;
} ckHotelObj.PayStyle = x.PayStyle;
}) ckHotelObj.Tel = x.Tel;
}) }
}) })
this.$emit("childHotel", this.ID,this.HotelName); this.$emit("childHotel", ckHotelObj);
},
//获取日本下面的市->下拉框用
getProvinceList(){
let msg = {
Id:651
};
this.apipost("dict_post_Destination_GetChildList", msg,res => {
if(res.data.resultCode == 1){
this.ProvinceList = res.data.data;
}else{
this.Error(res.data.message);
}
},
err => {}
);
},
getChangeHotel(id){
let msg = {
Province:id
}
this.apipost(
"hotel_post_GetHasStockHotelList_V2",msg,res => {
if(res.data.resultCode==1){
this.dataList = res.data.data;
this.HotelList = [];
this.dataList.forEach(x=>{
x.HotelList.forEach(y=>{
y.isChecked=false;
})
})
console.log(this.dataList,'dataList');
}else{
this.Error(res.data.message);
}
},
err => {}
);
},
handleClick() {
this.HotelList = this.dataList[this.activeName].HotelList;
} }
}, },
mounted(){ mounted() {
} }
}; };
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 98415b11
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
</td> </td>
<td> <td>
<div class="link"> <div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}({{item.TCID}})</p>
</div> </div>
</td> </td>
<td> <td>
...@@ -390,9 +390,17 @@ ...@@ -390,9 +390,17 @@
style="background:#00C6FF; border-color:#00C6FF"></el-button> style="background:#00C6FF; border-color:#00C6FF"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="联系OP" placement="top-start"> <el-tooltip class="item" effect="dark" content="联系OP" placement="top-start">
<el-button @click='openChart(item)' icon="iconfont icon-dianhua" type="primary" <el-button @click='openChart(item)' icon="iconfont icon-wechat" type="primary"
style="background:#6DD875; border-color:#6DD875"></el-button> style="background:#6DD875; border-color:#6DD875"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.LineId==14 && item.IsOpenHotel==0" class="item" effect="dark" content="关闭酒店操作" placement="top-start">
<el-button @click="SetIsOpenHotelService(1,item.TCID)"
style="background:#E95252; border-color:#E95252" icon="iconfont icon-suo" type="primary"
></el-button>
</el-tooltip>
<el-tooltip v-if="item.LineId==14 && item.IsOpenHotel==1" class="item" effect="dark" content="开启酒店操作" placement="top-start">
<el-button icon="iconfont icon-suo1" type="primary" style="background:green; border-color:green" @click="SetIsOpenHotelService(0,item.TCID)"></el-button>
</el-tooltip>
</el-button-group> </el-button-group>
</div> </div>
</td> </td>
...@@ -522,10 +530,24 @@ ...@@ -522,10 +530,24 @@
saveRemark() { saveRemark() {
this.apipost('dmcstatistics_post_SetDMCRemark', this.NumObj, res => { this.apipost('dmcstatistics_post_SetDMCRemark', this.NumObj, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message) this.$message.success(res.data.message);
this.getList() this.getList();
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message);
}
}, err => {})
},
//开启关闭酒店操作
SetIsOpenHotelService(status,TCID) {
this.apipost('dmcstatistics_post_SetIsOpenHotelService', {
TCID:TCID,
status:status
}, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
} }
}, err => {}) }, err => {})
}, },
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 98415b11
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
:TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig> :TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig>
<TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters" <TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters"
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData" :TeamType="TeamType"></TravelDaysTripDirect> v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" <TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature> :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters" <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
//是否更新酒店库存 //是否更新酒店库存
IsUpdateHotel:0, IsUpdateHotel:0,
OpenTeamDescribe:"",//开团备注 OpenTeamDescribe:"",//开团备注
IsOpenHotel:0,//0可以添加删除酒店，1-不能修改酒店信息
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -652,6 +653,7 @@ ...@@ -652,6 +653,7 @@
//视频地址 //视频地址
this.PostConfig.VideoStr = tempData.VideoStr; this.PostConfig.VideoStr = tempData.VideoStr;
this.PostConfig.OpenTeamDescribe=tempData.OpenTeamDescribe; this.PostConfig.OpenTeamDescribe=tempData.OpenTeamDescribe;
this.PostConfig.IsOpenHotel=tempData.IsOpenHotel;
this.NoticeParameters.ConfigId = tempData.ConfigId; this.NoticeParameters.ConfigId = tempData.ConfigId;
this.NoticeParameters.CountryID = tempData.CountryID; this.NoticeParameters.CountryID = tempData.CountryID;
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 98415b11
...@@ -864,10 +864,14 @@ ...@@ -864,10 +864,14 @@
</template> </template>
</table> </table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="saveHoteluseDetail()" <button class="normalBtn" type="primary" @click="saveHoteluseDetail()" v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp; :class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp;
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}" <button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button> @click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
<template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1">
<br/>
<span style="color:red;font-weight:bold;" >※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
</template>
</div> </div>
</el-dialog> </el-dialog>
......
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
View file @ 98415b11
...@@ -104,12 +104,13 @@ ...@@ -104,12 +104,13 @@
v-model="HotelChooseArray" v-model="HotelChooseArray"
multiple :multiple-limit="TeamType==0?3:1" @visible-change="getHotelList($event)" multiple :multiple-limit="TeamType==0?3:1" @visible-change="getHotelList($event)"
@change="changeHotelList()" @change="changeHotelList()"
filterable placeholder="请选择"> filterable placeholder="请选择" :disabled="IsOpenHotel==1?true:false">
<el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID"> <el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
<span style="float: left">{{ getHotelItemLabel(item) }}</span> <span style="float: left">{{ getHotelItemLabel(item) }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
</el-option> </el-option>
</el-select> </el-select>
<span style="color:red;font-weight:bold;" v-if="IsOpenHotel==1">※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
<span v-if="dayObj.isRead&&IsDirect==1"> <span v-if="dayObj.isRead&&IsDirect==1">
<span v-for="item in hotelArray"> <span v-for="item in hotelArray">
{{item.HotelName}} {{item.HotelName}}
...@@ -129,7 +130,9 @@ ...@@ -129,7 +130,9 @@
</template> </template>
<script> <script>
export default { export default {
props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType"], props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType",
"IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
],
data() { data() {
return { return {
QHotelList: [], QHotelList: [],
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @ 98415b11
...@@ -147,6 +147,7 @@ ...@@ -147,6 +147,7 @@
v-bind:subConfig="subConfig" v-bind:subConfig="subConfig"
@change="handlerChangeDateList" @change="handlerChangeDateList"
:TeamType="TeamType" :TeamType="TeamType"
:IsOpenHotel="IsOpenHotel"
></travelDaysTrip> ></travelDaysTrip>
</div> </div>
</div> </div>
...@@ -170,7 +171,8 @@ ...@@ -170,7 +171,8 @@
"AirPickUp", "AirPickUp",
"AirSend", "AirSend",
"NoticeParameters", "NoticeParameters",
"TeamType" "TeamType",
"IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
], ],
data() { data() {
return { return {
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ 98415b11
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
</div> </div>
</div> </div>
<hotelTrip :dayObj="dayObj" :CurrentIndex="CurrentIndex" :DayList="DayList" :WarmTripDescribe="WarmTripDescribe" <hotelTrip :dayObj="dayObj" :CurrentIndex="CurrentIndex" :DayList="DayList" :WarmTripDescribe="WarmTripDescribe"
:IsDirect="NoticeParameters.IsDirect" :subConfig="subConfig" :TeamType="TeamType"></hotelTrip> :IsDirect="NoticeParameters.IsDirect" :subConfig="subConfig" :TeamType="TeamType" :IsOpenHotel="IsOpenHotel"></hotelTrip>
<div class="TD_OperaContent"> <div class="TD_OperaContent">
<div class="TD_ComIcon"> <div class="TD_ComIcon">
<i v-if="!dayObj.isRead" class="iconfont icon-chakan" @click="getRead"></i> <i v-if="!dayObj.isRead" class="iconfont icon-chakan" @click="getRead"></i>
...@@ -277,7 +277,8 @@ ...@@ -277,7 +277,8 @@
"DayList", //线路行程 "DayList", //线路行程
"NoticeParameters", "NoticeParameters",
"subConfig", "subConfig",
"TeamType" "TeamType",
"IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
], ],
data() { data() {
return { return {
......
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