Skip to content

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

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

parents d477126a 46d40444
Hide whitespace changes
Inline Side-by-side
Showing with 579 additions and 23 deletions
src/components/Details.vue
View file @ dcf71d32
......@@ -578,6 +578,9 @@ export default {
case "/happyMoney": // 红包结算
path = "/LianMengManagement";
break;
case "/OpHotelOrderDetail": // 酒店订单详情
path = "/OpHotelOrder";
break;
}
//找到Root
......@@ -807,6 +810,9 @@ export default {
case "/happyMoney": // 红包结算
path = "/LianMengManagement";
break;
case "/OpHotelOrderDetail": // 酒店订单详情
path = "/OpHotelOrder";
break;
}
//找到Root
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ dcf71d32
......@@ -492,7 +492,7 @@
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
<textarea v-model="Description">
<textarea v-model="msg.Description">
</textarea>
</div>
<div>
......@@ -915,7 +915,7 @@ export default {
}
}
this.loading = true;
this.msg.Description=this.Description;
// this.msg.Description=this.Description;
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
//清除旅客名单数据
......@@ -1257,7 +1257,7 @@ export default {
if(this.orderObj!=null&&this.orderObj.OrderSource===10){
}else{
this.Description=this.GetDetail.Description;
this.msg.Description=this.GetDetail.Description;
}
if(this.orderObj){
......@@ -1272,7 +1272,7 @@ export default {
this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
this.detailList.Number = this.orderObj.CostType ? 1 : 0
if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
this.msg.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
}
}
if(data.VorcherInos){
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ dcf71d32
......@@ -398,7 +398,7 @@
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
<textarea v-model="Description">
<textarea v-model="msg.Description">
</textarea>
</div>
......@@ -485,6 +485,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue";
export default {
data(){
return{
Description:'',
msg:{
FrID:0,
ClientType:0,
......@@ -1052,7 +1053,7 @@ export default {
this.msg.TipGuestList=tipguestInfo;
}
this.msg.Description=this.Description;
// this.msg.Description=this.Description;
if(z){
this.msg.Status = 0;
}else{
......@@ -1395,7 +1396,7 @@ export default {
this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
this.msg.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
}
}
if(data.VorcherInos){
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ dcf71d32
......@@ -856,7 +856,7 @@ export default {
//初始化创建、修改表单数据
let newMsg = {
ID: "0",
Type: "",
Type: 1,
EmployeeId: "",
Surname: "",
Name: "",
......
src/components/TravelManager/TravelList/OpHotelOrder.vue
View file @ dcf71d32
......@@ -83,7 +83,7 @@
<th>入住时间</th>
<th>离店时间</th>
<th>取消费用</th>
<!-- <th>操作</th> -->
<th>操作</th>
</tr>
<tbody v-for="(item,index) in dataList">
<tr>
......@@ -103,7 +103,7 @@
<td>{{item.CheckInStr}}</td>
<td>{{item.CheckOutStr}}</td>
<td>{{item.CancelFee}}</td>
<!-- <td>详情</td> -->
<td class="cursorpointer" @click="goOrderDetails(item.OrderID)">详情</td>
</tr>
<tr>
<td colspan="6" style="text-align:left;width:600px">
......@@ -116,7 +116,7 @@
</div>
</div>
</td>
<td colspan="6" style="text-align:left;width:600px">
<td colspan="7" style="text-align:left;width:600px">
<div class="SH_OrderDan">
<div>收款单据：</div>
<div>
......@@ -181,6 +181,15 @@ export default {
};
},
methods: {
goOrderDetails(ID){
this.$router.push({
name: 'OpHotelOrderDetail',
query: {
ID: ID,
blank:'y',
}
})
},
getList() {
//获取现有线路列表
this.loading = true;
......
src/components/TravelManager/TravelList/OpHotelOrderDetail.vue 0 → 100644
View file @ dcf71d32
<style>
.HotelSure{
width:1200px;
/* margin:20px auto; */
padding: 0 20px 20px 20px;
display: flex;
background-color: white;
}
.HS_LeftInfo{
display: inline-block;
width:792px;
height:auto;
}
.HS_RightList{
width:388px;
display: inline-block;
margin-left:20px;
height:auto;
}
.HS_div1{
width:100%;
height:190px;
border:1px solid #E0E0E0;
}
.HS_divFirst{
margin:32px 0 21px 20px;
}
.Hs_OneType{
color:#2EB000;
font-size:18px;
font-weight: bold;
display: flex;
align-items: center;
}
.HS_divTwo{
margin:0 0 21px 20px;
}
.Hs_OneType img,.HS_divThree img{
margin-right:10px;
}
.HS_divThree{
color:#FFA835;
font-size:18px;
font-weight: bold;
margin-left:20px;
display: flex;
align-items: center;
}
.HS_div2{
width:100%;
border:1px solid #E0E0E0;
margin:20px 0;
overflow: hidden;
padding-bottom:20px;
}
.HS_bookTitle{
padding-left:20px;
width:100%;
background-color: #EDF4FF;
color:#111111;
font-size:12px;
font-weight: bold;
height:29px;
display: flex;
align-items: center;
border-bottom:1px solid #E0E0E0;
}
.HS_div2One{
margin:15px 0 0 20px;
}
.HS2_title{
color:#888888!important;
}
.HS_div2 ul li,.HS_div3 ul li{
display: inline-block;
margin-right:21px;
font-size:12px;
color:#111111;
}
.HS_div3>div:nth-child(2){
padding: 20px;
}
.HS_div3>div:nth-child(2)>div{
display: flex;
margin-bottom: 15px;
}
.HS_div3>div:nth-child(2)>div:last-child{
margin-bottom: 0;
}
.HS_div3One{
margin:15px 0 0 20px;
color:#333333;
}
.HS_Line{
width:30px;
height:1px;
display:inline-block;
position: relative;
top:-3px;
margin-right:10px;
border-top:1px solid #111111;
}
.HS_UpdateDate{
width:84px;
height:32px;
border:1px solid #EE4454;
background: #fff;
color:#EE4454;
outline: none;
border-radius: 3px;
cursor: pointer;
}
.HS_roomNum .el-input__inner{
height:30px;
border:none;
border-radius:0;
border-bottom:1px solid #DDDDDD;
}
.HS_fangfei{
display: inline-block;
width:90px;
height:86px;
border:1px solid #BBC9DA;
background-color: #fff;
font-size:14px;
margin-right:10px;
text-align: center
}
.HS_fangfei_Top{
width:100%;
height:32px;
margin-bottom:10px;
background-color: #F5F7F8;
line-height: 32px;
color:#666666;
}
.HS_fangfei span{
color:#EE4454;
}
.HS_div3{
width:792px;
height:auto;
overflow: hidden;
position: relative;
border:1px solid #E0E0E0;
}
.HS_bookTitle span{
color:#FFA835;
font-size:12px;
position: absolute;
right:20px;
}
.HS_bookTitle span i{
position: relative;
top:1px;
margin-right:3px;
}
.HS_wenhao{
position: relative;
top: 2px;
margin-left: 5px;
}
.HS_BookMan .el-input__inner{
height:30px;
border:0;
border-radius: 0;
border-bottom:1px solid #DDDDDD;
}
.HS_AreaSelect .el-input__inner{
height: 30px;
border: none;
border-radius: 0;
border-bottom: 1px solid #DDDDDD;
}
.HS_AreaSelect .el-input__icon,.HS_roomNum .el-input__icon{
line-height: 0;
}
.HS_detailAddress .el-input__inner,.HS_Email .el-input__inner{
height:40px;
border:0;
border-radius: 0;
border-bottom:1px solid #DDDDDD;
}
.HS_RightTopImg{
width:100%;
height:194px;
}
.HS_RightList img{
width:100%;
height:100%;
}
.HS_HotelRight{
height:184px;
padding:17px 20px 20px 20px;
border:1px solid #E0E0E0;
border-top:0;
color:#666666;
}
.HS_HtName{
color:#EE4454;
font-size:21px;
}
.HS_EnName{
font-size:12px;
color:#999999;
margin:8px 0 19px 0;
}
.HS_HAddress{
font-size:12px;
margin:20px 0;
}
.HS_HAddress img{
width:10px;
position: relative;
top:2px;
}
.HS_Haohua{
font-size:14px;
margin-bottom:10px;
}
.f12{
font-size:12px;
}
.C9{
color:#999999;
margin-right:20px;
}
.HS_RoomInfo li{
display: block;
width:100%;
font-size:14px;
margin-top:18px;
}
.HS_RoomInfo li span{
display: inline-block;
}
.HS_RightBtm{
width:100%;
/* height:160px; */
margin-top:20px;
overflow: hidden;
border:1px solid #E0E0E0;
}
.HS_RitTop{
height:72px;
background-color: #EDF4FF;
display: flex;
padding:0 20px;
align-items: center;
position: relative;
}
.HS_RitTop_Left{
color:#111111;
float:left;
font-size:20px;
font-weight: 400;
}
.HS_RitPrice{
float:right;
font-size:24px;
color:#EE4454;
font-size:24px;
position: absolute;
right:20px
}
.HS_RitPrice i{
font-style: normal;
margin-right:5px;
font-size:14px;
}
.HS_RitBottom{
padding:20px;
font-size:14px;
color:#111111;
}
.HS_RitBottom span{
display:inline-block;
}
.HS_btLine{
width:245px;
height:1px;
margin:0 10px;
position: relative;
top:-3px;
border-top:1px dashed #999999;
}
.HS_btLineTwo{
width:204px;
height:1px;
margin:0 10px;
position: relative;
top:-3px;
border-top:1px dashed #999999;
}
.HS_RitBottom>div{
margin-bottom:15px;
}
.HD_payBtn{
width:100%;
height:66px;
background-color: #EE4454;
color:#fff;
outline: none;
border:none;
cursor: pointer;
margin-top:30px;
font-size:18px;
border-radius: 4px;
}
.HD_payBtn:hover{
opacity: 0.8;
}
.HS_BookMan .el-input__icon{
line-height: 0;
}
.HS_FFEI:last-child{
visibility: hidden;
}
.cantBaoChild{
color:red;
}
.disBtn{
background-color: gray;
cursor: default;
}
.disBtn:hover{
opacity: 1;
}
</style>
<template>
<div class="HotelSure" v-loading="loading">
<div class="HS_LeftInfo">
<div class="HS_div2">
<div class="HS_bookTitle">预订信息</div>
<div class="HS_div3One">
<ul>
<li class="HS2_title">订单号</li>
<li>{{details.model.ThirdOrderNo}}</li>
</ul>
</div>
<div class="HS_div2One">
<ul>
<li class="HS2_title">房型信息</li>
<li>
<div>
<template v-if="details.parmResult.roomType==1">单人</template>
<template v-if="details.parmResult.roomType==2">双人</template>
<template v-if="details.parmResult.roomType==3">双</template>
<template v-if="details.parmResult.roomType==4">三人间</template>
<template v-if="details.parmResult.roomType==5">4床</template>
<template v-if="details.parmResult.roomType==6">日式房间</template>
<template v-if="details.parmResult.roomType==7">和洋室</template>
<template v-if="details.parmResult.roomType==8">半开房</template>
<template v-if="details.parmResult.roomType==9">其他的</template>
</div>
</li>
</ul>
</div>
<div class="HS_div2One">
<ul>
<li class="HS2_title">入住日期</li>
<li>
<span>{{details.model.CheckIn.split('T')[0]}}</span>
<div class="HS_Line"></div>
<span>{{details.model.CheckOut.split('T')[0]}}</span>
</li>
</ul>
</div>
<div class="HS_div2One HS_roomNum">
<ul>
<li class="HS2_title">房间数量</li>
<li>
{{details.model.Number}}
</li>
</ul>
</div>
</div>
<div class="HS_div3">
<div class="HS_bookTitle" >
入住信息<span></span>
</div>
<div>
<div>
<label class="HS2_title">预订人：</label>
<div>{{details.parmResult.guestLastName + details.parmResult.guestFirstName}}</div>
</div>
<div>
<label class="HS2_title">当前地址：</label>
<div>{{details.parmResultRoomInfo.guestAddress}}</div>
</div>
<div>
<label class="HS2_title">Email：</label>
<div>{{details.parmResultRoomInfo.guestEmail}}</div>
</div>
<div>
<label class="HS2_title">电话：</label>
<div>{{details.parmResultRoomInfo.guestPhoneNumber}}</div>
</div>
<div>
<label class="HS2_title">客户备注：</label>
<div>{{details.model.Remark}}</div>
</div>
</div>
</div>
</div>
<div class="HS_RightList">
<div class="HS_RightBtm">
<div class="HS_RitTop">
<span class="HS_RitTop_Left">订单总额</span>
<span class="HS_RitPrice">
<i>¥</i>{{details.model.TotalPrice}}
</span>
</div>
</div>
<div class="HS_RightTopImg">
<template v-if="details">
<img :src="details.model.HotelPic" alt=""/>
</template>
</div>
<div class="HS_HotelRight">
<div class="HS_HtName">{{details.model.HotelName}}</div>
<div class="HS_HAddress">
<img src="../../../assets/img/hotel/redAddress.png" alt=""/>
{{details.parmResult.address}}
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
details: {
model:{
ThirdOrderNo: ''
}
},
loading: true
};
},
mounted() {
},
created() {
let id = this.$route.query.ID
this.loading = true;
this.apipost(
"dmc_post_Get_GetJAPAN_OrderDetail",
{orderId: id},
res => {
this.loading = false;
if (res.data.resultCode == 1) {
let data = res.data.data
this.details = data
} else {
this.Error(res.data.message);
}
})
},
methods: {
}
};
</script>
src/components/leaderPay2.vue
View file @ dcf71d32
......@@ -488,7 +488,7 @@ input[type="number"] {
<th>类型</th>
<th>预计总金额</th>
<th>实付金额</th>
<th>报账金额
<!-- <th>报账金额
<input
v-if="totalList.SelfPayingExpendTotalPrice>0 || totalList.SelfPayingIncomeTotalPrice>0 || (totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0 ||
totalScenicPrice>0 || totalTrafficPrice>0 || totalDinnerPrice>0 || totalHotelPrice>0"
......@@ -496,7 +496,7 @@ input[type="number"] {
value="保存"
class="leader2Btn"
@click="saveBZPrice()"
>
> -->
</th>
</tr>
<tr v-show="totalList.SelfPayingExpendTotalPrice>0">
......@@ -524,49 +524,49 @@ input[type="number"] {
<td>景点门票</td>
<td>{{moneyFormat(OtherTotalPrice)}}</td>
<td>{{moneyFormat(totalScenicPrice)}}</td>
<td>
<!-- <td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.ScenicPrice" @change="getAllBZPrice"></el-input>
</td>
</td> -->
</tr>
<tr v-show="totalTrafficPrice>0">
<td>交通</td>
<td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalTrafficPrice)}}</td>
<td>
<!-- <td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.BusPrice" @change="getAllBZPrice"></el-input>
</td>
</td> -->
</tr>
<tr v-show="totalDinnerPrice>0">
<td>餐饮</td>
<td>{{moneyFormat(IncomeTotalPrice)}}</td>
<td>{{moneyFormat(totalDinnerPrice)}}</td>
<td>
<!-- <td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.DiningPrice" @change="getAllBZPrice"></el-input>
</td>
</td> -->
</tr>
<tr v-show="totalHotelPrice>0">
<td>酒店</td>
<td>{{moneyFormat(ExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalHotelPrice)}}</td>
<td>
<!-- <td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.HotelPrice" @change="getAllBZPrice"></el-input>
</td>
</td> -->
</tr>
</table>
<table border="0" cellspacing="1" class="leaderPayTable" v-if="TotalPriceData.length>0">
......@@ -575,7 +575,7 @@ input[type="number"] {
<th>预付合计</th>
<th>实际领款</th>
<th>实付合计</th>
<th>实际报账金额</th>
<!-- <th>实际报账金额</th> -->
<th>领队退款</th>
</tr>
<tr
......@@ -586,7 +586,7 @@ input[type="number"] {
<td>{{moneyFormat(item.PlanPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice)}}</td>
<td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
<td>{{index == 0 ? moneyFormat(AllBZPrice) : moneyFormat(item.ExpendTotalPrice)}}</td>
<!-- <td>{{index == 0 ? moneyFormat(AllBZPrice) : moneyFormat(item.ExpendTotalPrice)}}</td> -->
<td>{{index == 0 ? moneyFormat(item.PlanTotalPrice - AllBZPrice): moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)}}</td>
</tr>
<tr v-if="!TotalPriceData.length">
......@@ -698,6 +698,7 @@ input[type="number"] {
class="leader2Btn"
@click="goZhiDan(item)"
>
</td>
</tr>
<tr v-if="!TotalNav && !TotalNav.length">
......@@ -777,6 +778,48 @@ input[type="number"] {
<td colspan="5">暂无数据</td>
</tr>
</table>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
<tr>
<th colspan="7">稽核单据
</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<td colspan="3">{{item.TCNUMS}}</td>
<td colspan="3"><el-input
size="mini"
class="w150"
type="number"
v-model="item.price"></el-input></td>
<td colspan="1">
<input
type="button"
value="制稽核单"
class="leader2Btn"
@click="ZhiDanJiHe(item)">
</td>
</tr>
<tr>
<th width="140">序号</th>
<th>单号</th>
<th>费用说明</th>
<th>日期</th>
<th>备注</th>
<th>应付/应收金额</th>
<th>业务员</th>
</tr>
<template v-for="(item, index) in TotalNav">
<tr v-for="(Sitem, Sindex) in item.FinanceAuditList">
<td>{{Sindex+1}}</td>
<td><span class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', Sitem.FinanceId)">{{Sitem.FinanceId}}</span></td>
<td>{{Sitem.CostTypeName}}</td>
<td>{{Sitem.CreateDate}}</td>
<td>{{Sitem.Remark}}</td>
<td>{{Sitem.OriginalMoney}}</td>
<td>{{Sitem.CreateByStr}}</td>
</tr>
</template>
</table>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
<tr>
<th colspan="4">意见调查表</th>
......@@ -878,6 +921,29 @@ export default {
};
},
methods: {
// 稽核单据
ZhiDanJiHe: function(obj){
if(!obj.price) {
this.$message.error('请输入金额')
return
}
let userinfo = this.getLocalStorage()
let templateID = JSON.stringify([76, 77])
let TCIDARR = [obj.TCIDS];
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
SourceID: 0,
CostType: 57,
TCIDList: TCIDARR,
Money: obj.price,
};
let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${templateID}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
},
// 意见调查列表
goDIaoCha: function (obj){
let fullPath = `/investigationList?TCID=${obj.TCIDS}&blank=y&tab=问券调查列表`;
......
src/router/config.js
View file @ dcf71d32
......@@ -1788,6 +1788,13 @@ export default {
meta: {
title: '散卖酒店订单'
},
}, {
path: '/OpHotelOrderDetail', //操作 散卖酒店订单详情
name: 'OpHotelOrderDetail',
component: resolve => require(['@/components/TravelManager/TravelList/OpHotelOrderDetail'], resolve),
meta: {
title: '散卖酒店订单'
},
},{
path: '/HotelOrderTotal', //操作 散卖酒店订单统计
name: 'HotelOrderTotal',
......
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