Skip to content

S
SuperMan
Commit 71137e35 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents e42cb070 30be9636
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1438 additions and 1362 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 71137e35
......@@ -290,7 +290,7 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 71137e35
......@@ -377,7 +377,7 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......
src/components/Hotel/ChangeHotel.vue
View file @ 71137e35
This diff is collapsed.
src/components/Hotel/roomQuery.vue
View file @ 71137e35
......@@ -173,7 +173,7 @@
total: 0,
msg: {
pageIndex: 1,
pageSize: 5,
pageSize: 8,
SelectType: 1,
StartDate: '',
EndDate: '',
......@@ -181,7 +181,6 @@
HotelId: 0,
//日期
DateStr: "",
//出团公司
OutBranchIds: [],
LineId: 14,
......@@ -193,7 +192,6 @@
TCNUM: '',
PriceStatus: 0,
CombinationNum: ''
},
//分公司类表
companyList: [],
......
src/components/Hotel/roomReservations.vue
View file @ 71137e35
......@@ -2,16 +2,6 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<!-- <li>
<span>
<em>线路</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li> -->
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
......@@ -106,10 +96,10 @@
<th width="120">机位总数/(Y/E/F)</th>
<th width="120">占床/不占床</th>
<th width="80">实际用房数</th>
<th>操作</th>
<th></th>
<th></th>
<th>备注</th>
<th>操作</th>
</tr>
<tr v-if="list.length==0">
<td colspan="10">暂无数据</td>
......@@ -188,6 +178,11 @@
{{item.CommonReport.HouseStatistics.RealityRoomNum}}
</div>
</td>
<td>
<div class="w80 link" style="margin:auto;">
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div>
</td>
<td style="vertical-align: top;">
<div class="w260">
<p class="pDateStyle">时间</p>
......@@ -207,7 +202,11 @@
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
<span class="colorE95252">{{childItem.HotelOrderState==1?"[OK]":"[暂定]"}}</span>{{childItem.NewHotelName}}
<span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
</span>{{childItem.NewHotelName}}
</p>
<p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
<p class="pDateStyle">
......@@ -226,11 +225,7 @@
{{item.Remarks}}
</div>
</td>
<td>
<div class="w80 link" style="margin:auto;">
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div>
</td>
</tr>
<tr>
<td :colspan="item.colNum" style="text-align: left!important;padding-left: 20px;">
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 71137e35
......@@ -115,7 +115,7 @@
</td>
<td v-if="childIndex==0" :rowspan="5">
<div class="w150">
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')" :disabled="subItem.OPState==1"
@visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'>
......@@ -181,6 +181,19 @@
<!-- 付款方式 -->
<td v-if="childIndex==0" :rowspan="5">
<table class="hotelTable">
<tr>
<td width="70" style="text-align:right;">订房状态：</td>
<td>
<el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='确定' :value='1'></el-option>
<el-option label='暂定' :value='2'></el-option>
</el-select>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td width="70" style="text-align:right;">付款方式：</td>
<td>
......@@ -215,17 +228,22 @@
</td>
<!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5">
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="新增" placement="top-start">
<el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
</el-tooltip>
<el-tooltip v-if="item.HotelOrderList.length>1" class="item" effect="dark" content="删除"
placement="top-start">
<el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
</el-button>
</el-tooltip>
<template v-if="subItem.OPState!=1">
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="新增" placement="top-start">
<el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
</el-tooltip>
<el-tooltip v-if="item.HotelOrderList.length>1" class="item" effect="dark" content="删除"
placement="top-start">
<el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
</el-button>
</el-tooltip>
</template>
<template v-else>
<span class="Hotel_red">OP选房确认</span>
</template>
</td>
</tr>
</template>
......@@ -296,7 +314,8 @@
var subItem = item.HotelOrderList[subIndex];
if (subItem.OrderID > 0) {
that.apipost('dmcstatistics_post_DeleteHotelOrder', {
ID: subItem.OrderID
ID: subItem.OrderID,
TCID: subItem.TCID
}, res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
......
src/components/SalesModule/Lowpricemanagement.vue
View file @ 71137e35
......@@ -31,7 +31,7 @@
</tr>
<tr v-for="(item,index) in dataList">
<td>{{item.CreateByStr}}</td>
<td>{{item.CreateDate}}</td>
<td>{{item.CreateDate.replace('T', ' ')}}</td>
<td>{{item.OrderId}}</td>
<td>{{item.OrderUnitPrice}}</td>
<td>{{item.ApplyPrice}}</td>
......@@ -40,8 +40,8 @@
<td>{{item.ApplyReason}}</td>
<td>
<el-row v-if="item.ApplyState === 0">
<button class="normalBtn" type="primary" @click="outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons">同意</button>
<button class="hollowFixedBtn" @click="outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason">拒绝</button>
<button class="normalBtn" type="primary" @click="outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons, GetApplyLessPrice(item)">同意</button>
<button class="hollowFixedBtn" @click="outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason, GetApplyLessPrice(item, 1)">拒绝</button>
</el-row>
</td>
</tr>
......@@ -52,8 +52,11 @@
</div>
<el-dialog custom-class='w450' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :rules="rules" ref="addMsg" label-width="100px">
<el-form-item label="优惠金额" prop="Description">
<el-input class='w217' v-model="addMsg.ApplyPrice"></el-input>
<el-form-item label="成交单价" prop="Description">
<el-input v-if="EmployeeId === 1" class='w217' v-model="addMsg.ApplyPrice"></el-input>
<el-select v-model='addMsg.ApplyPrice' v-else>
<el-option v-for="price in Unit_PriceList" :label='price.LessMoney' :value='price.ID' :key='price.ID'></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('system.label_info')" prop="Description">
<el-input maxlength='250' class='w217' type="textarea" v-model="addMsg.Reasons"></el-input>
......@@ -110,12 +113,71 @@
verSionMsg: {
Status: 0
},
EmployeeId: -11,
Unit_PriceList: []
}
},
mounted() {
this.getList()
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId
},
methods: {
GetApplyLessPrice: function (obj ,type) {
this.addMsg.ApplyPrice = ''
console.log(obj)
this.Unit_PriceList = [];
if (type) {
var objk = {
ID: '',
LessMoney: ''
}
objk.ID = obj.OrderUnitPrice;
objk.LessMoney = obj.OrderUnitPrice;
this.Unit_PriceList.push(objk);
return false
}
let msg = {
ID: obj.OrderId,
userId: obj.UpdateBy
}
this.apipost("lessprice_post_GetApplyLessPrice", msg, res => {
if (res.data.resultCode == 1) {
let LessMoney = res.data.data.LessMoney;
let OrderOldPrice = res.data.data.OrderOldPrice;
console.log('res.data.data', res.data.data,'LessMoney', LessMoney, OrderOldPrice)
if (parseFloat(LessMoney)>0){
for (var i = 0; i <= parseInt(LessMoney)/10; i++) {
var objk = {
ID: '',
LessMoney: ''
}
objk.ID = OrderOldPrice-i*10;
objk.LessMoney = OrderOldPrice-i*10;
this.Unit_PriceList.push(objk);
}
if(this.Unit_PriceList.findIndex(markers => markers.ID == OrderOldPrice)<0) {
var objk = {
ID: '',
LessMoney: ''
}
objk.ID = OrderOldPrice;
objk.LessMoney = OrderOldPrice;
this.Unit_PriceList.push(objk);
}
}
else{
var objk = {
ID: '',
LessMoney: ''
}
objk.ID = OrderOldPrice;
objk.LessMoney = OrderOldPrice;
this.Unit_PriceList.push(objk);
}
}
}, err => {})
},
getList() { //获取列表数据
this.apipost("lessprice_get_GetLesspriceOrderPageList", this.msg, res => {
if (res.data.resultCode == 1) {
......
src/components/SalesModule/groupTourOrder.vue
View file @ 71137e35
......@@ -2757,9 +2757,11 @@
},
err => {}
)
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList = [];
this.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.tcid
"TCID": obj.tcid,
"MaxPeopleNum": MaxPeopleNum
}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) {
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 71137e35
......@@ -3090,9 +3090,9 @@ submitYSZEForm(){
this.isShowLayer = false;
this.isShowLayer2 = true;
}
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.tcid}, res => {
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.tcid, "MaxPeopleNum": MaxPeopleNum}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 71137e35
......@@ -3136,10 +3136,11 @@
this.isShowLayer = false;
this.isShowLayer2 = true;
}
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList = [];
this.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.TCID
"TCID": obj.TCID,
"MaxPeopleNum": MaxPeopleNum
}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 71137e35
......@@ -485,8 +485,8 @@
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
<span>已设定清位</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
</div>
</div>
......@@ -562,41 +562,41 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th>
<th style="border-right:1px solid #E5E5E5">占房时间</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th>
</tr>
</table>
<div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr v-for="subItem in item.HotelOrderListReports">
<td width="100">
<template v-for="subItem in item.HotelOrderListReports">
<tr v-for="(childItem,childIndex) in subItem.SubList">
<td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:20px;">
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}}
<a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
【<a style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
<template v-else v-for="childItem in subItem.SubList">
<div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</template>
</template>
】
</a>
<a v-if="(childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0))&& childItem.UseCount>0 " style="color:green">
【使用: {{childItem.UseCount}} 间 {{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}} 】
</a>
</td>
<td>
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].CreateDateStr}}
</div>
<template v-else v-for="childItem in subItem.SubList">
<div></div>
</template>
</template>
<template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)"> {{childItem.CreateDateStr}}</template>
</td>
</tr>
</table>
</div>
</template>
</table>
<span slot="reference" class="price">酒店信息</span>
</el-popover>
</p>
......@@ -1478,8 +1478,8 @@
name: 'TeamBalancePayment',
query: {
id: id,
OutBranchId:OutBranchId,
IsHaveAuth:true,
OutBranchId: OutBranchId,
IsHaveAuth: true,
blank: 'y',
tab: '团队收支明细'
}
......
src/components/administrative/ExaminationStatistics.vue
View file @ 71137e35
......@@ -469,7 +469,7 @@ export default {
this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth()+1);
let cont = dt.getMonth()
for(let i = 1; i <= cont; i ++){
for(let i = 1; i <= (cont+1); i ++){
let o = i < 10 ? '0'+i : i;
this.periodsList.push({
label: `2019${o}`,
......
src/components/index.vue
View file @ 71137e35
......@@ -826,7 +826,7 @@
<button class="normalBtn" @click="updateTeamName">保存</button>
</div>
</el-dialog>
<el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie">
<el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie2">
<div>
<p style="text-align: right; padding: 5px 0;font-size: 12px;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
<div v-html="detailMessage.Content">
......@@ -841,7 +841,7 @@
</el-dialog>
<a class="weOytour" ref="weOytour" href="http://we.oytour.com:8110/" target="view_window">Preface</a>
<el-dialog custom-class='w800 PingFangSC _saleRnk' title="销售排行" :visible.sync="saleRnkShow" center :before-close="closeChangeMachie">
<saleRnk/>
<saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie"/>
</el-dialog>
<div v-show="mazip==0" id="downzip">
<div>
......@@ -1085,6 +1085,7 @@ export default {
},
detailMessage: {},
downLoadList: [],
NewSaleRnkInfo: {},
};
},
filters: {
......@@ -1428,6 +1429,7 @@ export default {
this.app_user_workflow_MyAuditCount();
this.refreshSysNoteDate();
this.GetUserIsRead();
this.getNewSaleRnkInfo()
},
created() {
//页面刚进入时开启长连接
......@@ -1452,6 +1454,36 @@ export default {
}
},
methods: {
getNewSaleRnkInfo: function(){
let msg = {
StartDate: ''
}
this.apipost(
"orderank_post_GetDetails",
msg,
res => {
if (res.data.resultCode == 1) {
// console.log('res.data.datares.data.datares.data.data',res)
this.NewSaleRnkInfo = res.data.data
let New = this.NewSaleRnkInfo.StartDateMonth + this.NewSaleRnkInfo.StartDateDay
let arr = localStorage.saleRnkInfo ? JSON.parse(localStorage.saleRnkInfo) : []
let rep = false
for(let i = 0; i < arr.length; i++){
if (arr[i] === New) {
rep = true
return
}
}
if (!rep) {
this.saleRnkShow = true
arr.push(this.NewSaleRnkInfo.StartDateMonth + this.NewSaleRnkInfo.StartDateDay)
}
localStorage.saleRnkInfo = JSON.stringify(arr)
}
},
err => {}
);
},
downloadSingle(obj){
// let reg = /^http(s)?:\/\/(.*?)\//
// this.downloadFileRename(obj.Url.replace(reg,''),obj.Name);
......@@ -1459,8 +1491,12 @@ export default {
dom.href = obj.Url;
dom.click();
},
closeChangeMachie2(done){
this.outerVisibleNot = false
},
closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
done();
// done();
this.saleRnkShow= false
},
GetUserIsRead(){
this.apipost('app_user_notice_GetUserIsRead',{},res=>{
......@@ -4230,7 +4266,16 @@ export default {
margin-top:-30px;
margin-left:155px;
}
._saleRnk.el-dialog--center{
z-index: 2019523;
}
._saleRnk.el-dialog--center .el-dialog__body{
padding: 0;
max-height: 800px;
}
._saleRnk.el-dialog--center{
margin-top: 45px !important;
margin-bottom: 0 !important;
height: 850px;
}
</style>
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 71137e35
......@@ -583,7 +583,7 @@
<template slot="prepend">同行清位时间</template>
</el-input>
</el-form-item>
<el-form-item >
<el-form-item>
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SaleClearOrderHour"
@keyup.native="checkInteger(priceData,'SaleClearOrderHour')"
@blur="checkInteger(priceData,'SaleClearOrderHour')">
......@@ -805,62 +805,63 @@
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
<tr>
<th>日期</th>
<th>酒店</th>
<th>占房时间</th>
<th>更换酒店</th>
<th>操作</th>
</tr>
<tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;
<span v-if="subItem.UseCount>0 && item.SubList.length==1">
<a style="color:green">{{subItem.Status==1?"【OK】":"【暂定】"}}</a>
【<span style="color:green">本团使用：{{subItem.UseCount}}
{{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】
</span>
【<span style="color:#E95252;" >剩余：{{subItem.RemainingInventory}}
</span>】
&nbsp;&nbsp;
<el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
@change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
</div>
</div>
</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
<span v-if="subItem.UseCount>0 && item.SubList.length==1">
<span style="color:green;white-space:nowrap;">{{subItem.CreateDateStr}}</span>
</span>
</div>
</div>
</td>
<td>
<el-select class="w180" v-model="item.NewHotelId" @visible-change="getHotelList(item,$event)"
@change="changeHotelList()" filterable>
<el-option :key="0" label="请选择" :value="0"></el-option>
<el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
<span style="float: left">{{subItem.Name}}</span>
<span style="float: right; color:red; font-size: 13px">剩余:{{subItem.Inventory}} /
价格:{{subItem.CostPrice}}</span>
</el-option>
</el-select>
</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
<span v-if="subItem.UseCount>0 && item.SubList.length==1">
<span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(item)">删除</span>
</span>
</div>
</div>
</td>
<th width="100">日期</th>
<th width="150">酒店</th>
<th width="240">酒店情况</th>
<th width="100">占房时间</th>
<th width="100">更换酒店</th>
<th width="60">操作</th>
</tr>
<template v-for="(subItem,subIndex) in priceData.PriceHotelList">
<tr v-for="(childItem,childIndex) in subItem.SubList">
<td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0"
:rowspan="subItem.SubList.length">{{subItem.UseDay}}</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</template>
】
</a>
【<span style="color:green">本团使用：{{childItem.UseCount}}
{{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}}</span>】
</span>
<span style="color:#E95252;" v-if="childItem.HotelName!='温馨的家'"> 【剩余：{{childItem.RemainingInventory}}】
</span>
</td>
<td>
<template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)">
{{childItem.CreateDateStr}}</template>
</td>
<td v-if="childIndex==0" :rowspan="subItem.SubList.length">
<el-select class="w180" v-model="subItem.NewHotelId" @visible-change="getHotelList(subItem,$event)"
@change="changeHotelList()" filterable>
<el-option :key="0" label="请选择" :value="0"></el-option>
<el-option v-for="hotelItem in subItem.HotelList" :key="hotelItem.ID" :label="hotelItem.Name"
:value="hotelItem.ID">
<span style="float: left">{{hotelItem.Name}}</span>
<span style="float: right; color:red; font-size: 13px">剩余:{{hotelItem.Inventory}} /
价格:{{hotelItem.CostPrice}}</span>
</el-option>
</el-select>
</td>
<td>
<span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(subItem)">删除</span>
</span>
</td>
</tr>
</template>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="saveHoteluseDetail()"
......@@ -1103,7 +1104,7 @@
//选中的酒店数组
ChooseHotelArray: [],
//销售清位时间
SaleClearOrderHour:0,
SaleClearOrderHour: 0,
};
}
this.returnPriceList.push(objItem);
......@@ -1646,7 +1647,7 @@
that.apipost("hoteluse_post_DeleteHotelUse", delMsg, res => {
if (res.data.resultCode == 1) {
that.Success("操作成功!");
item.SubList[0].UseCount=0;
item.SubList[0].UseCount = 0;
} else {
that.Error(res.data.message);
}
......
src/components/systemLogs.vue
View file @ 71137e35
<style>
.sysLog_Content {
border-left: 2px solid #D2D2D2;
margin: 40px 0 0 40px;
height:90%;
overflow-y: auto;
}
.sysLog_List {
position: relative;
margin: 0 0 20px 16px;
margin-left: 10px;
border-left:1px solid #d1d1d1;
padding:0 0 20px 17px;
}
.sysLog_List:first-child{
margin-top:5px;
}
.sysLog_List:last-child{
border-left:0;
}
.sysCircle {
display: inline-block;
width: 13px;
......
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