Skip to content

S
SuperMan
Commit 58b89d0e authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 5e69b058 cd20eae5
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 141 deletions
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 58b89d0e
......@@ -646,20 +646,32 @@ export default {
if(!this.checkList||this.checkList.length==0){
return this.$message.error('请选择单据')
}
this.loadingApply = true
let ids = this.checkList.map(x=>{return x.FinanceId})
let msg = {
FrIDs: ids.join(',')
}
this.apipost('Financial_post_SetPlatfromApplyforRecord',msg,res=>{
if(res.data.resultCode==1){
this.getList()
this.loadingApply = false
}else{
this.loadingApply = false
this.$message.error(res.data.message)
}
},err=>{this.loadingApply = false})
this.$confirm(`是否确认标记${msg.FrIDs}`, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.loadingApply = true
this.apipost('Financial_post_SetPlatfromApplyforRecord',msg,res=>{
if(res.data.resultCode==1){
this.$message.success('标记成功')
this.getList()
this.loadingApply = false
}else{
this.loadingApply = false
this.$message.error(res.data.message)
}
},err=>{this.loadingApply = false})
}).catch(() => {
this.$message({
type: 'info',
message:'取消标记'
});
});
},
Export(){
let msg=this.msg;
......@@ -1049,7 +1061,6 @@ export default {
this.allLoading = true
this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
if(r.data.resultCode === 1) {
this.$message.success('标记成功')
this.addChuNa = false
// this.saveMsg=[];
this.getList();
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 58b89d0e
......@@ -33,7 +33,7 @@
<th width="200">{{$t('restaurant.res_resName')}}</th>
<th width="150">{{$t('ground.xiugaict')}}</th>
<th width="80">{{$t('ground.leibie')}}</th>
<th width="70">{{$t('ground.zongrenshu')}}</th>
<th width="70">{{$t('ground.yongcanren')}}<br />{{$t('advmanager.v_type')}}</th>
<th width="70">{{$t('commonPickUp.Pick_Ding')}}<br />{{$t('admin.admin_personNumber')}}</th>
......@@ -228,28 +228,26 @@
</td>
</tr>
<template v-if="subItem.OrderState==1">
<tr>
<td width="60" style="text-align:right;">
确认时间：
</td>
<td style="text-align:left;">
<el-date-picker class='w135'
v-model="subItem.SureTime"
type="date"
placeholder="选择确认时间">
</el-date-picker>
</td>
</tr>
<tr>
<td width="60" style="text-align:right;">
预约时间：
</td>
<td style="text-align:left;">
<el-input class='w135' v-model='subItem.BookTime' type="text"></el-input>
</td>
</tr>
</template>
<template v-if="subItem.OrderState==1">
<tr>
<td width="60" style="text-align:right;">
确认时间：
</td>
<td style="text-align:left;">
<el-date-picker class='w135' v-model="subItem.SureTime" type="date" placeholder="选择确认时间" value-format="yyyy-MM-dd">
</el-date-picker>
</td>
</tr>
<tr>
<td width="60" style="text-align:right;">
预约时间：
</td>
<td style="text-align:left;">
<el-input class='w135' v-model='subItem.BookTime' @keyup.native="checkTime(subItem,'BookTime')"
type="text"></el-input>
</td>
</tr>
</template>
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;">
{{$t('ground.fukuanth')}}:
......@@ -273,7 +271,7 @@
<tr>
<td width="80" style="text-align:right;">{{$t('pub.pubRemark')}}：</td>
<td>
<el-input type='textarea' rows="2" class='w120' v-model='subItem.Remarks' disabled></el-input>
<el-input type='textarea' rows="2" class='w120' v-model='subItem.Remarks'></el-input>
</td>
</tr>
<tr>
......@@ -408,16 +406,15 @@
RealName: str,
ID: x.NewDiningID
})
if (x.ReserveNo == '' || x.ReserveNo == null) {
x.ReserveNo = this.$route.query.NewCombinationNum;;
}
if(x.SureTime)
{
if(x.SureTime=='0001-01-01T00:00:00'){
x.SureTime=''
}else{
x.SureTime=x.SureTime.replace("T", " ");
if (x.SureTime) {
if (x.SureTime == '0001-01-01T00:00:00') {
x.SureTime = ''
} else {
x.SureTime = x.SureTime.replace("T", " ");
}
}
......@@ -478,32 +475,13 @@
},
saveList() {
this.IsDisabled = true;
// if (type == 0) {
// this.list.forEach(item => {
// item.DiningSummaryList.forEach(insideItem => {
// insideItem.OrderState = 0;
// })
// })
// }
// if (type == 1) {
// this.list.forEach(item => {
// item.DiningSummaryList.forEach(insideItem => {
// insideItem.OrderState = 1;
// })
// })
// }
this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => {
// if(insideItem.SureTime=''||insideItem.SureTime.length==0)
// {
// insideItem.SureTime='0001-01-01T00:00:00'
// }
if (insideItem.DiningPriceList) {
insideItem.DiningPriceList.forEach(subItem => {
if (!subItem.Discount) {
subItem.Discount = 0;
}
if (!subItem.DiscountPrice) {
subItem.DiscountPrice = 0;
}
......
src/components/Restaurant/restaurantList.vue
View file @ 58b89d0e
......@@ -349,9 +349,9 @@
</div>
<div class="line"></div>
<div class="dayNum">
<span class="dayNumber">{{item.DieLine}}</span>
{{$t('hotel.hotel_day')}}
<div>{{$t('restaurant.res_advanceDays')}}</div>
<span class="dayNumber">{{item.MinDinnerPrice>0?item.MinDinnerPrice:"/"}}</span>
{{$t('hotel.hotel_people')}}
<div>最低餐标</div>
</div>
</div>
<div style="padding:0 0 15px 15px;margin-top: -5px;">
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 58b89d0e
......@@ -456,7 +456,8 @@
style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>
</div>
<div class="TCL-OutBranchName" title="销售公司">
{{item.UnionBranchName}} &nbsp; <span v-if="item.BZStatus" :style="{'background-color':item.BZStatus==1?'#ff99cc':item.BZStatus==2?'#bcd6ee':'#00c6ff','color':'#000000','margin-top':'3px'}">{{(item.BZStatus==1?'未报账':item.BZStatus==2?'已报账':'报账中')}}</span>
{{item.UnionBranchName}} &nbsp; <span v-if="item.BZStatus"
:style="{'background-color':item.BZStatus==1?'#ff99cc':item.BZStatus==2?'#bcd6ee':'#00c6ff','color':'#000000','margin-top':'3px'}">{{(item.BZStatus==1?'未报账':item.BZStatus==2?'已报账':'报账中')}}</span>
</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
<div class="d12" style="float:none;margin:3px auto;">
......@@ -660,22 +661,21 @@
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<div slot="reference">
<span class="price"
style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</span>
<span
style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</span>
<a class="price"
style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</a>
<a style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</a>
</div>
</el-popover>
</p>
<p class="travelnowrap" v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<div slot="reference">
<span class="price" style="cursor:pointer;text-decoration:underline;">餐厅预定情况</span>
</div>
</el-popover>
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<div slot="reference">
<a class="price" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</a>
</div>
</el-popover>
</p>
<p v-if="(item.LineID==14 ||item.LineID==118) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
......@@ -1219,7 +1219,8 @@
</div>
<div class="TC_remarkContent"
v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
<div class="clearfix TCL-redType" v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
<div class="clearfix TCL-redType"
v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
<div class="TCL_remarkTitle">驳回缘由：</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</div>
......@@ -1593,7 +1594,7 @@
ShowSupplier: false, //是否显示供应商
showCaozuoTime: true, //操作时间
caiwu: true, //显示财务单据
colspanLength: 5 //跨行
colspanLength: 6 //跨行
},
//更新可售机票数量
updateAirticketObj: {
......@@ -2096,10 +2097,10 @@
this.queryCommonData.dataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
this.queryMsg.noData = !this.queryMsg.total > 0;
this.getDiningDetailsList()
if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
this.getTravelAccountStatus()
this.getDiningDetailsList()
}
},
err => {}
......@@ -2155,7 +2156,7 @@
}
)
},
getTravelAccountStatus(){
getTravelAccountStatus() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 58b89d0e
......@@ -381,7 +381,8 @@
</label>
</div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">
{{item.UnionBranchName}} &nbsp; <span v-if="item.BZStatus" :style="{'background-color':item.BZStatus==1?'#ff99cc':item.BZStatus==2?'#bcd6ee':'#00c6ff','color':'#000000','margin-top':'3px'}">{{(item.BZStatus==1?'未报账':item.BZStatus==2?'已报账':'报账中')}}</span>
{{item.UnionBranchName}} &nbsp; <span v-if="item.BZStatus"
:style="{'background-color':item.BZStatus==1?'#ff99cc':item.BZStatus==2?'#bcd6ee':'#00c6ff','color':'#000000','margin-top':'3px'}">{{(item.BZStatus==1?'未报账':item.BZStatus==2?'已报账':'报账中')}}</span>
</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
<div class="d12" style="float:none;margin:3px auto;">
......@@ -507,7 +508,16 @@
</el-popover>
</p>
<p
v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 ">
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<div slot="reference">
<a class="price" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</a>
</div>
</el-popover>
</p>
<p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
:TCNUM="item.TCNUM">
......@@ -915,7 +925,8 @@
</div>
<div class="TC_remarkContent"
v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark||item.PriceTagList">
<div class="clearfix TCL-redType" v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
<div class="clearfix TCL-redType"
v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
<div class="TCL_remarkTitle">驳回缘由：</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</div>
......@@ -1037,12 +1048,14 @@
import commonBusInfo from "../../commonPage/commonBusInfo.vue";
import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import EditLeaveGroup from './components/EditLeaveGroup.vue';
import commonDinnerInfo from "../../commonPage/commonDinnerInfo.vue";
export default {
components: {
commonBusInfo,
priceDialog,
commonHotelInfo,
EditLeaveGroup
EditLeaveGroup,
commonDinnerInfo
},
data() {
return {
......@@ -1539,14 +1552,40 @@
this.queryCommonData.dataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
this.queryMsg.noData = !this.queryMsg.total > 0;
this.getDiningDetailsList();
if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
this.getTravelAccountStatus()
this.getDetailsOfRoyalty();
this.getTravelAccountStatus();
}
},
err => {}
);
},
getDiningDetailsList() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
let msg = [...new Set(Ids)]
this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.DiningList = y.OrderList
}
})
})
this.$forceUpdate()
}
}
)
},
getDetailsOfRoyalty() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
......@@ -1572,7 +1611,7 @@
}
)
},
getTravelAccountStatus(){
getTravelAccountStatus() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 58b89d0e
......@@ -473,7 +473,18 @@
</div>
</el-popover>
</p>
<p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 ">
<p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<div slot="reference">
<a class="price" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</a>
</div>
</el-popover>
</p>
<p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
:TCNUM="item.TCNUM">
......@@ -796,7 +807,8 @@
</div>
<div class="TC_remarkContent"
v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
<div class="clearfix TCL-redType" v-if="(item.OutGroupAuditState==3 || item.Status == 5)&&item.OutGroupAuditRemark">
<div class="clearfix TCL-redType"
v-if="(item.OutGroupAuditState==3 || item.Status == 5)&&item.OutGroupAuditRemark">
<div class="TCL_remarkTitle">驳回缘由：</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</div>
......@@ -928,12 +940,14 @@
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import commonBusInfo from "../../commonPage/commonBusInfo.vue";
import EditLeaveGroup from './components/EditLeaveGroup.vue';
import commonDinnerInfo from "../../commonPage/commonDinnerInfo.vue";
export default {
components: {
commonBusInfo,
priceDialog,
commonHotelInfo,
EditLeaveGroup
EditLeaveGroup,
commonDinnerInfo
},
data() {
return {
......@@ -1447,6 +1461,7 @@
this.queryCommonData.dataList = res.data.data.pageData
this.queryMsg.total = res.data.data.count
this.queryMsg.noData = !this.queryMsg.total > 0;
this.getDiningDetailsList()
if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
}
......@@ -1454,6 +1469,31 @@
err => {}
)
},
getDiningDetailsList() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
let msg = [...new Set(Ids)]
this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.DiningList = y.OrderList
}
})
})
this.$forceUpdate()
}
}
)
},
getDetailsOfRoyalty() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
......
src/components/commonPage/commonDinnerInfo.vue
View file @ 58b89d0e
......@@ -48,20 +48,20 @@
<th width="120">{{$t('salesModule.DJstatus')}}</th>
<th width="150" v-if="showHotelObj.showPrice">
{{$t('restaurant.res_Number')}}<br />{{$t('Operation.Op_price')}}</th>
<th width="150" v-if="showHotelObj.showPrice">
<el-tooltip class="item" effect="dark" content="（用餐人数-免人数）× 价格" placement="top">
<span>总价</span>
</el-tooltip>
</th>
<th width="150" v-if="showHotelObj.showPrice">
<el-tooltip class="item" effect="dark" content="（用餐人数-免人数）× 价格" placement="top">
<span>总价</span>
</el-tooltip>
</th>
<th width="100" v-if="showHotelObj.showZhan">预约时间</th>
<th width="100" v-if="showHotelObj.showZhan">确认时间</th>
<!-- <th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>
<th width="180" v-if="showHotelObj.caiwu">{{$t('salesModule.DJNUM')}}{{$t('hotel.hotel_corrlelatition')}}</th> -->
<th width="100" v-if="showHotelObj.showZhan">操作人</th>
<th width="100" v-if="showHotelObj.showZhan">确认时间</th>
</tr>
<template v-if=" DiningObj&& DiningObj.length>0" >
<template v-if=" DiningObj&& DiningObj.length>0">
<tr v-for="(hotelSubItem,hotelSubIndex) in DiningObj">
<td >
{{hotelSubItem.UseTime}}
<td>
{{hotelSubItem.UseTime}}
</td>
<td style="text-align:left;padding-left:3px;">
<template v-if="hotelSubItem.DinnerName!=hotelSubItem.NewDinnerName && hotelSubItem.NewDinnerName!=''">
......@@ -75,14 +75,14 @@
{{hotelSubItem.DinnerName!=hotelSubItem.NewDinnerName?""+hotelSubItem.NewDinnerName:""}}
</td>
<td>
<span >
<span>
<template v-if="hotelSubItem.DiningChangeState==1">
<a style="color:green">待审核</a>
</template>
</span>
</td>
<td>
<span >
<span>
<template v-if="hotelSubItem.OrderState==1">
<a style="color:green">确定</a>
</template>
......@@ -95,37 +95,33 @@
</span>
</td>
<td v-if="showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0">
<div v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList">
<template v-if="priceSubItem.DiningNum>0">
{{priceSubItem.GuestType==1?"大人：":(priceSubItem.GuestType==2?"中人：":(priceSubItem.GuestType==3?"小人：":""))}}
<template v-if="priceSubItem.DiningDiscount>0">
({{priceSubItem.DiningNum}}-{{priceSubItem.DiningDiscount}}) ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
</template>
<template v-else>
{{priceSubItem.DiningNum}} ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
</template>
</template>
<br />
</div>
<div v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList" :key="`din`+priceSubIndex">
<template v-if="priceSubItem.DiningNum>0">
{{priceSubItem.GuestType==1?"大人：":(priceSubItem.GuestType==2?"中人：":(priceSubItem.GuestType==3?"小人：":""))}}
<template v-if="priceSubItem.DiningDiscount>0">
({{priceSubItem.DiningNum}}-{{priceSubItem.DiningDiscount}})
×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
</template>
<template v-else>
{{priceSubItem.DiningNum}} ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
</template>
</template>
<br />
</div>
</td>
<td>
<template v-if="hotelSubItem.TotalMoney>0">{{ hotelSubItem.TotalMoney }} （{{hotelSubItem.CurrencyName}}）</template>
<template v-if="hotelSubItem.TotalMoney>0">{{ hotelSubItem.TotalMoney }}
（{{hotelSubItem.CurrencyName}}）</template>
</td>
<td >
{{hotelSubItem.DiningTypeName}} </br> {{hotelSubItem.BookTime}}
<td>
{{hotelSubItem.DiningTypeName}} <br /> {{hotelSubItem.BookTime}}
</td>
<td >
{{hotelSubItem.SureTime}}
<td>
{{hotelSubItem.CreateByName}}
</td>
<td>
{{hotelSubItem.SureTime}}
</td>
</tr>
</template>
</table>
......@@ -134,7 +130,6 @@
</template>
<script>
export default {
props: ["DiningObj", "showHotelObj", "TCID", "DMCNum", "TCNUM"],
data() {
......@@ -144,10 +139,10 @@
},
components: {
//日志组件
},
methods: {
goUrl(name, path, id, tcmun) {
this.$router.push({
name: path,
......
src/components/commonPage/commonHotelInfo.vue
View file @ 58b89d0e
......@@ -56,7 +56,6 @@
<th width="100" v-if="showHotelObj.ShowSupplier">{{$t('hotel.hotel_Supplier')}}</th>
<th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>
<th width="180" v-if="showHotelObj.caiwu">{{$t('salesModule.DJNUM')}}{{$t('hotel.hotel_corrlelatition')}}</th>
<th width="70" v-if="showHotelObj.showPrice">
{{$t('fnc.rizhi')}}
</th>
......@@ -133,7 +132,6 @@
{{hotelSubItem.IsPay==1?$t('pub.yes'):$t('pub.no')}}
</td>
<td v-if="showHotelObj.caiwu">
<div>
<div v-if="hotelSubItem.FrList&&hotelSubItem.FrList.length > 0" v-for="(item2, index2) in hotelSubItem.FrList" :key="index2">
<span style="cursor:pointer;text-decoration:underline;" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID,'')">
......@@ -143,7 +141,6 @@
<span v-else
style="cursor: default">{{ $t("system.content_noData") }}</span>
</div>
</td>
<td v-if="showHotelObj.showPrice">
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 58b89d0e
......@@ -101,7 +101,7 @@
<!--当地游-->
<TravelPrice3 v-show="PostConfig.TeamType==2" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:TeamType="PostConfig.TeamType"></TravelPrice3>
:IsDirect="PostConfig.IsDirect"></TravelPrice3>
<!--地接团-->
<TravelPrice4 v-show="PostConfig.TeamType==3" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
......@@ -974,7 +974,7 @@
this.PostConfig.ImgCover = tempData.ImgCover;
this.PostConfig.LtName = tempData.LtName;
this.PostConfig.CreateBy = tempData.CreateBy;
if (tempData.ImgCover != ""&&tempData.ImgCoverList.length > 0) {
if (tempData.ImgCover != "" && tempData.ImgCoverList.length > 0) {
this.PostConfig.fileList = tempData.ImgCoverList;
} else {
this.initFileList();
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 58b89d0e
......@@ -1179,7 +1179,7 @@
BusPriceId: 0, //公司车辆编号
EmergencyContact: "", //紧急联系人
IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum:0,//导游人数
GuideNum: 0, //导游人数
};
}
this.returnPriceList.push(objItem);
......@@ -1256,7 +1256,6 @@
VisaPrice: 0,
YSeat: 0,
OPRemark: "",
}
this.returnPriceList.push(obj);
})
......@@ -1280,7 +1279,6 @@
});
this.returnPriceList = array;
},
initCalendar: function (cur) {
var newDays = this.$calendarUtils.createCalendar(cur);
this.currentDay = newDays.CurrentDay;
......
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