Skip to content

S
SuperMan
Commit 82198d2b authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

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