Skip to content

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

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

parents ce2909d4 0060f8c9
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 488 deletions
src/assets/css/summaryLogin.css
View file @ c5dd3e67
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
font-size:18px; font-size:18px;
color:#333333; color:#333333;
} }
.Summary_login_Div .icon-login-name,.icon-login-password{ .Summary_login_Div .icon-login-name, .Summary_login_Div .icon-login-password{
width:16px; width:16px;
height:15px; height:15px;
display:inline-block; display:inline-block;
......
src/components/FinancialModule/BasicDocuments.vue
View file @ c5dd3e67
...@@ -271,6 +271,8 @@ ...@@ -271,6 +271,8 @@
background-color: white; background-color: white;
padding: 15px; padding: 15px;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
max-height: 400px;
overflow: auto;
} }
.page_bdm .chongdi_list em{ .page_bdm .chongdi_list em{
font-size: 14px; font-size: 14px;
...@@ -591,7 +593,7 @@ ...@@ -591,7 +593,7 @@
<span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span> <span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span>
</div> </div>
<div v-if="shifouChongDi" class="chongdi_list"> <div v-if="shifouChongDi" class="chongdi_list">
<!-- <div> <div>
<em>发团时间：</em> <em>发团时间：</em>
<el-date-picker class="h34" <el-date-picker class="h34"
@change="timeAdd(1)" @change="timeAdd(1)"
...@@ -600,7 +602,7 @@ ...@@ -600,7 +602,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="-"> range-separator="-">
</el-date-picker> </el-date-picker>
</div> --> </div>
<div class="_kehu"> <div class="_kehu">
<em>{{$t('fnc.khleixing')}}：</em> <em>{{$t('fnc.khleixing')}}：</em>
<el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1"> <el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1">
...@@ -902,7 +904,7 @@ ...@@ -902,7 +904,7 @@
<span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span> <span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span>
</div> </div>
<div v-if="shifouChongDi" class="chongdi_list"> <div v-if="shifouChongDi" class="chongdi_list">
<!-- <div> <div>
<em>发团时间：</em> <em>发团时间：</em>
<el-date-picker class="h34" <el-date-picker class="h34"
@change="timeAdd(1)" @change="timeAdd(1)"
...@@ -911,7 +913,7 @@ ...@@ -911,7 +913,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="-"> range-separator="-">
</el-date-picker> </el-date-picker>
</div> --> </div>
<div class="_kehu"> <div class="_kehu">
<em>{{$t('fnc.khleixing')}}：</em> <em>{{$t('fnc.khleixing')}}：</em>
<el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1"> <el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1">
...@@ -1470,7 +1472,6 @@ export default { ...@@ -1470,7 +1472,6 @@ export default {
methods:{ methods:{
// 单选计算 // 单选计算
checkdIteam(item){ checkdIteam(item){
console.log(item.checked)
if (item.checked) { if (item.checked) {
if (item.HangingAccountsTypeStr === '收') { if (item.HangingAccountsTypeStr === '收') {
this.ChongDiMoney += item.Money this.ChongDiMoney += item.Money
...@@ -1514,7 +1515,6 @@ export default { ...@@ -1514,7 +1515,6 @@ export default {
this.apipost('Financial_post_GetHangingAccountList', this.ChongDiMsg, res=>{ this.apipost('Financial_post_GetHangingAccountList', this.ChongDiMsg, res=>{
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
console.log(data)
data.map(item=>{ data.map(item=>{
item.checked = false item.checked = false
}) })
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ c5dd3e67
...@@ -1217,6 +1217,26 @@ export default { ...@@ -1217,6 +1217,26 @@ export default {
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
{
field: "GZIncome",
// formatter: this.moneyFormat,
title: "挂账收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "CDIncome",
// formatter: this.moneyFormat,
title: "冲抵收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{ {
field: "ShiJiLiRun", field: "ShiJiLiRun",
formatter: this.moneyFormat, formatter: this.moneyFormat,
......
src/components/SalesModule/addPassenger.vue
View file @ c5dd3e67
...@@ -1860,9 +1860,10 @@ ...@@ -1860,9 +1860,10 @@
let OrderId = this.addMsg.OrderId; let OrderId = this.addMsg.OrderId;
let IsBed = this.addMsg.IsBed; let IsBed = this.addMsg.IsBed;
let Sex = this.addMsg.Sex; let Sex = this.addMsg.Sex;
if(Sex ==1 || Sex == 2) {
this.apipost( this.apipost(
"sellorder_post_GetHouseDetailsByOrderID", "sellorder_post_GetHouseDetailsByOrderID",
{TCIDs:TCIDs,OrderId:OrderId,Sex:Sex,IsBed:IsBed}, {TCIDs: TCIDs, OrderId: OrderId, Sex: Sex, IsBed: IsBed},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.roomlist = res.data.data; this.roomlist = res.data.data;
...@@ -1870,8 +1871,10 @@ ...@@ -1870,8 +1871,10 @@
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, },
err => {} err => {
}
); );
}
}, },
getHouselist(Sex,TCID,OrderId,IsBed){ getHouselist(Sex,TCID,OrderId,IsBed){
if(Sex ==1 || Sex == 2){ if(Sex ==1 || Sex == 2){
...@@ -1887,14 +1890,17 @@ ...@@ -1887,14 +1890,17 @@
}, },
err => {} err => {}
); );
}else {
this.$message.error('请选择性别');
} }
}, },
addhouse(){ addhouse(){
let orderId = this.addMsg.OrderId; let orderId = this.addMsg.OrderId;
let sex = this.addMsg.Sex; let sex = this.addMsg.Sex;
if(sex ==1 || sex == 2) {
this.apipost( this.apipost(
"sellorder_get_BatchSetOrderHouse_V2", "sellorder_get_BatchSetOrderHouse_V2",
{orderId:orderId,sex:sex,}, {orderId: orderId, sex: sex,},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Roominformation() this.Roominformation()
...@@ -1902,32 +1908,56 @@ ...@@ -1902,32 +1908,56 @@
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, },
err => {} err => {
}
); );
}
}, },
authentication() { authentication() {
let IdCard = this.addMsg.IdCard;
if (this.$route.query.guestId == 0) { if (this.$route.query.guestId == 0) {
if(IdCard.length == 18){
this.apipost( this.apipost(
"sellorder_post_GetGusetByIDCard", "sellorder_post_GetGusetByIDCard",
{IdCard: this.addMsg.IdCard,}, {IdCard: this.addMsg.IdCard,},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let obj = res.data.data; let obj = res.data.data;
this.addMsg = obj;
this.addMsg.SurName = obj.SurName;
this.addMsg.Name = obj.Name;
this.addMsg.ESurName = obj.ESurName;
this.addMsg.EName = obj.EName;
this.addMsg.Sex = obj.Sex.toString(); this.addMsg.Sex = obj.Sex.toString();
this.addMsg.MobilePhone = obj.MobilePhone;
this.addMsg.Birthday = obj.Birthday;
this.addMsg.BirthdayAddress = obj.BirthdayAddress;
this.addMsg.PassportNo = obj.PassportNo;
this.addMsg.PassportAddress = obj.PassportAddress;
this.addMsg.PassportIssued = obj.PassportIssued;
this.addMsg.PassportExpiry = obj.PassportExpiry;
this.addMsg.Nationality = obj.Nationality;
this.addMsg.Marriage = obj.Marriage.toString(); this.addMsg.Marriage = obj.Marriage.toString();
if (this.addMsg.Marriage == "0") { if (this.addMsg.Marriage == "0") {
this.addMsg.Marriage = ""; this.addMsg.Marriage = "";
} }
this.addMsg.IsCriminalRecord = obj.IsCriminalRecord === null ? '' : obj.IsCriminalRecord.toString(); this.addMsg.Address = obj.Address;
this.addMsg.IsDepartureRecord = obj.IsDepartureRecord.toString(); this.addMsg.AddressDetail = obj.AddressDetail;
this.addMsg.IdentityType = obj.IdentityType;
this.addMsg.HistoryRecord = obj.HistoryRecord;
this.addMsg.Duty = obj.Duty;
this.addMsg.Remarks = obj.Remarks;
this.addMsg.IsHightSchool = obj.IsHightSchool;
this.addMsg.IsRecommend = obj.IsRecommend;
this.addMsg.Id = this.$route.query.guestId; this.addMsg.Id = this.$route.query.guestId;
this.addMsg.TCID = this.$route.query.TCID; this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId; this.addMsg.OrderId = this.$route.query.orderId;
this.Roominformation() //调取下房间信息 this.Roominformation() //调取下房间信息
} else { } else {
this.$message.error(res.data.message); // this.$message.error(res.data.message);
} }
}, },
err => { err => {
...@@ -1935,6 +1965,7 @@ ...@@ -1935,6 +1965,7 @@
); );
} }
} }
}
}, },
mounted() { mounted() {
this.getCountry(); this.getCountry();
......
src/components/Supplier/roomQuery2.vue
View file @ c5dd3e67
...@@ -6,7 +6,15 @@ ...@@ -6,7 +6,15 @@
<li> <li>
<span> <span>
<em>月份</em> <em>月份</em>
<el-date-picker v-model="msg.MonthStr" type="monthrange" range-separator="至" start-placeholder="开始月份" <!-- <el-date-picker v-model="msg.MonthStr" type="monthrange" range-separator="至" start-placeholder="开始月份"
end-placeholder="结束月份">
</el-date-picker> -->
<el-date-picker
v-model="msg.MonthStr"
type="monthrange"
range-separator="至"
start-placeholder="开始月份"
end-placeholder="结束月份"> end-placeholder="结束月份">
</el-date-picker> </el-date-picker>
</span> </span>
...@@ -38,191 +46,10 @@ ...@@ -38,191 +46,10 @@
<th width="100">酒店使用情况</th> <th width="100">酒店使用情况</th>
<th width="100">操作</th> <th width="100">操作</th>
</tr> </tr>
<tr v-if="dataList.length==0">
<td colspan="9">暂无数据</td>
</tr>
<template v-for="(item,index) in dataList">
<template v-for="(subItem,subIndex) in item.subList">
<tr v-for="(childItem,childIndex) in subItem.hotelList" :class="{roomQuerySplitTrCss:index%2!=0}">
<td v-if="childIndex==0&&subIndex==0" :rowspan="item.RowSpan">
{{item.NewCombinationNum}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.StartCityNames}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.TCNUMS}}
</td>
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<span v-if="subItem.TCState==3&&subItem.Status==1">正常</span>
<span v-else>取消</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.LineteamIdNames}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.TotalSeat}}/{{subItem.RealityYSeatNum}}/{{subItem.RealityESeatNum}}/{{subItem.RealityFSeatNum}}
</td>
<td>
{{childItem.CheckInDateStr}}
</td>
<td class="tdLeft">
<template v-if="childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.SupplierHotelStatus==0"> {{childItem.NewHotelName}}</template>
<template v-else-if="childItem.SupplierHotelStatus==1">
<a style="color:#7abd53">{{childItem.NewHotelName}}</a></template>
<template v-else-if="childItem.SupplierHotelStatus==2">
<a style="color:blue">{{childItem.NewHotelName}}</a>
</template>
(
<template v-if="subItem.TotalSeat/2!=childItem.SupplierBookNum">
<a style="font-weight:bold; color:red;" title="总机位数和预订间数不相符"> {{childItem.SupplierBookNum}} </a>
</template>
<template v-else>
<a style="font-weight:bold;"> {{childItem.SupplierBookNum}} </a>
</template>
间)</template>
<template v-else>
组团社自理
</template>
</td>
<td>
<!--<span >
<template v-if="childItem.SupplierId==UserInfo.SupplierId">
<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==0?"[地接-未操作]":"[地接-暂定]")}}</template>
</template>
</span>
-->
<template v-if="childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.SupplierHotelStatus==0">未操作</template>
<template v-else-if="childItem.SupplierHotelStatus==1"><a style="color:#7abd53">操作中</a></template>
<template v-else-if="childItem.SupplierHotelStatus==2"><a style="color:blue">操作完成</a></template>
</template>
</td>
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<el-tooltip class="item" effect="dark" content="操作信息" placement="top-start">
<el-popover placement="bottom" width="500" trigger="click">
<table>
<tr>
<th width="90">
时间
</th>
<th width="160">
酒店
</th>
<th width="100">
数量
</th>
<th width="100">
状态
</th>
</tr>
<tr v-for="opItem in CurrentHotelList">
<template v-if="opItem.SupplierId==UserInfo.SupplierId">
<td>
{{opItem.CheckInDateStr}}
</td>
<td style="padding-right:10px;">
{{opItem.NewHotelName}}
</td>
<td>
<el-input style="width:60px;" v-model='opItem.SupplierBookNum' type='text'
placeholder="预订数量">
</el-input> 间
</td>
<td>
<el-select v-model="opItem.SupplierHotelStatus" filterable class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option label='未操作' :value='0' :key='0'>
</el-option>
<el-option label='操作中' :value='1' :key='1'>
</el-option>
<el-option label='操作完成' :value='2' :key='2'>
</el-option>
</el-select>
</td>
</template>
</tr>
</table>
<p class="alcenter mt10">
<input type="button" value="保存" @click="SaveSupplierData(CurrentHotelList)" class="normalBtn" />
</p>
<a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference"
@click="GetItemHotelData(subItem.hotelList)">操作</a>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="日志信息" placement="top-start">
<el-popover placement="bottom" width="500" trigger="click">
<table border="0" cellspacing="1" cellpadding="0" class="queryLogTable"
style=" border-collapse:collapse;">
<tr>
<th width="100"
style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">
操作人</th>
<th width="100"
style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">
日期</th>
<th width="100"
style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">
操作时间</th>
<th width="190"
style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">
内容</th>
</tr>
<template v-if="LogsList.length>0">
<tr v-for="(item,index) in LogsList">
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">
{{item.CreateByName}}</td>
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">
{{item.UseTimeStr}}</td>
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">
{{item.CreateTimeStr}}
</td>
<td style="height: 35px; font-size: 12px;text-align:left;border:1px solid #d1d1d1;">
{{item.Remarks}}</td>
</tr>
</template>
<tr v-else>
<td colspan="5">暂无数据...</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange2"
:current-page.sync="queryLogMsg.currentPage" :page-size="queryLogMsg.pageSize"
layout="total,prev, pager, next, jumper" :total="queryLogMsg.total">
</el-pagination>
<a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference"
@click="getLogsList(subItem.TCID)">日志</a>
</el-popover>
</el-tooltip>
<a style="text-decoration:underline;color:blue;cursor:pointer"
@click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
<template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
<template v-else>添加投诉</template>
</a>
<a style="text-decoration:underline;color:red;cursor:pointer" v-if="subItem.Complain_Extend.Id>0"
@click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
</td>
</tr>
<template v-if="subItem.SupplierRemarks">
<tr v-if="subIndex==0" :class="{roomQuerySplitTrCss:index%2!=0}">
<td colspan="9" class="redTip">
<p>备注：{{subItem.SupplierRemarks}}</p>
</td>
</tr>
</template>
</template>
</template>
</table> </table>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> </el-pagination>
</div> </div>
</template> </template>
<script> <script>
...@@ -230,7 +57,7 @@ ...@@ -230,7 +57,7 @@
data() { data() {
return { return {
loading: false, loading: false,
currentPage: 1,
total: 0, total: 0,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
...@@ -286,29 +113,10 @@ ...@@ -286,29 +113,10 @@
}, },
//当前酒店列表 //当前酒店列表
CurrentHotelList: [], CurrentHotelList: [],
pickerBeginDateBefore: {
disabledDate: time => {
if (this.msg.EndDate == null) {
return false;
} else {
let endTime = new Date(this.msg.EndDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartDate)
return startTime.getTime() >= time.getTime()
}
}
} }
}, },
methods: { methods: {
handleCurrentChange2(val) {
this.queryLogMsg.pageIndex = val;
this.getLogsList();
},
//获取日志 //获取日志
getLogsList(TCID) { getLogsList(TCID) {
if (TCID) { if (TCID) {
...@@ -321,147 +129,19 @@ ...@@ -321,147 +129,19 @@
} }
}, err => {}) }, err => {})
}, },
GetItemHotelData(hotelList) {
this.CurrentHotelList = JSON.parse(JSON.stringify(hotelList));
},
//删除投诉
DeleteSupplierComplain(Id) {
if (Id > 0) {
var that = this;
this.Confirm("是否此投诉信息删除?", function () {
var msg = {
Id: Id
};
that.ApiPost2("supplierComplain_Post_RemoveSupplierComplain", msg,
res => {
if (res.data.resultCode == 1) {
that.Success('删除成功！');
that.getList();
} else {
that.Error(res.data.data);
}
}, null);
});
}
},
getLineList() {
this.ApiPost2("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.ApiPost2(
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1";
this.LineTeamList = res.data.data;
}
}
);
},
AddSupplierComplain(id, tcid) {
this.$router.push({
name: 'AddSupplierComplaints',
query: {
Id: id,
TCID: tcid,
blank: 'y',
tab: '供应商投诉'
}
})
},
goUrlR(path, obj, title) {
this.$router.push({
name: path,
query: {
"ID": obj,
blank: 'y',
tab: title
}
})
},
goUrlT(path, obj, title) {
this.$router.push({
name: path,
query: {
"id": obj,
blank: 'y',
tab: title
}
})
},
goUrl(path, obj, outItem, title) {
this.$router.push({
name: path,
query: {
"id": obj.TCIDS,
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
getList() { getList() {
this.loading = true; this.loading = true;
this.ApiPost2('dmcstatistics_post_GetUniteCombinationNumService_Supplier', this.msg, res => { this.ApiPost2('dmcstatistics_post_GetUniteCombinationNumService_Supplier_V2', this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; console.log(res.data);
this.dataList = res.data.data.pageData; // this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
//获取酒店列表
GetHotelList() {
this.ApiPost2(
"hotel_post_GetHasStockHotelList_Supplier", {
Country: 651,
IsMoreThanZero: 1
},
res => {
if (res.data.resultCode == 1) {
this.HotelList = res.data.data;
}
},
err => {}
);
},
//保存酒店新
SaveSupplierData(hotelList) {
this.ApiPost2(
"dmcstatistics_post_SetNewHotelOrder_Supplier", hotelList,
res => {
if (res.data.resultCode == 1) {
this.Success("操作成功!");
this.getList();
} else {
this.Error("操作失败!");
}
},
err => {}
);
},
//下载Excel //下载Excel
DownLoadHotel() { DownLoadHotel() {
this.loading = true; this.loading = true;
...@@ -476,86 +156,6 @@ ...@@ -476,86 +156,6 @@
this.loading = false; this.loading = false;
}); });
}, },
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.ApiPost2('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表
getLineTeamList() {
this.msg.LineteamId = 0
let msg = {
lineID: this.msg.LineId,
placeID: this.msg.PlaceID,
isTOOP: 1
}
this.ApiPost2('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data
}
})
},
//获取航空公司
getAirlineList() {
this.ApiPost2(
'airline_post_GetList', {},
res => {
if (res.data.resultCode == 1) {
this.queryCommonData.AirlineList = res.data.data
}
},
err => {}
)
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
}
this.ApiPost2(
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.queryCommonData.EmployeeList = res.data.data
}
},
err => {}
)
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
}
this.ApiPost2(
'admin_get_BranchGetList',
msg,
res => {
if (res.data.resultCode == 1) {
this.queryCommonData.BranchList = res.data.data;
}
},
err => {}
)
},
}, },
mounted() { mounted() {
this.UserInfo = this.getLocalStorageSupplier(); this.UserInfo = this.getLocalStorageSupplier();
...@@ -577,11 +177,6 @@ ...@@ -577,11 +177,6 @@
} else { } else {
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
} }
this.getLinePlaceList();
this.getAirlineList();
this.getEmployeeList();
this.getCompanyList();
this.GetHotelList();
this.getList(); this.getList();
}, },
} }
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ c5dd3e67
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters" <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice> :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<TravelPrice @saveMsg="PostConfig.IsUpdateHotel=1,SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0" <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
:PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice> :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice>
<TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1" <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2> :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ c5dd3e67
...@@ -814,8 +814,8 @@ ...@@ -814,8 +814,8 @@
</tr> </tr>
<template v-for="(subItem,subIndex) in priceData.PriceHotelList"> <template v-for="(subItem,subIndex) in priceData.PriceHotelList">
<tr v-for="(childItem,childIndex) in subItem.SubList"> <tr v-for="(childItem,childIndex) in subItem.SubList">
<td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0" <td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0" :rowspan="subItem.SubList.length">
:rowspan="subItem.SubList.length">{{subItem.UseDay}}</td> {{subItem.UseDay}}</td>
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}} {{childItem.HotelName}}
</td> </td>
...@@ -864,13 +864,17 @@ ...@@ -864,13 +864,17 @@
</template> </template>
</table> </table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="saveHoteluseDetail()" v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)" <button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
:class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp; v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)" :class="{'disClick':!isSaved}">{{btnText}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=2;saveHoteluseDetail(2)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp;
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}" <button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button> @click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
<template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1"> <template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1">
<br/> <br />
<span style="color:red;font-weight:bold;" >※ 地接已关闭酒店操作,如需修改请联系地接OP.</span> <span style="color:red;font-weight:bold;">※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
</template> </template>
</div> </div>
</el-dialog> </el-dialog>
...@@ -921,9 +925,10 @@ ...@@ -921,9 +925,10 @@
uploadList: [], uploadList: [],
CheckedVaule: 1, //选中值 CheckedVaule: 1, //选中值
UnCheckedVaule: 2, //没选中 UnCheckedVaule: 2, //没选中
UnCheckedLessPrice: 0,//不少价 UnCheckedLessPrice: 0, //不少价
isSaved: true, isSaved: true,
btnText: '保存', btnText: '保存',
btnTongBu: '同步酒店',
//日期数组 //日期数组
days: [], days: [],
dateString: "2016-01-02", dateString: "2016-01-02",
...@@ -1575,14 +1580,22 @@ ...@@ -1575,14 +1580,22 @@
}, },
//保存酒店使用情况 //保存酒店使用情况
saveHoteluseDetail() { saveHoteluseDetail(type) {
var that = this; var that = this;
this.Confirm("是否确定提交选中的酒店?", function () { var str = "是否确定提交选中的酒店?";
if (type == 2) {
str = "是否同步行程酒店到地接?";
}
this.Confirm(str, function () {
if (that.isSaved) { if (that.isSaved) {
that.isSaved = false; that.isSaved = false;
that.$emit("saveMsg"); that.$emit("saveMsg");
} }
that.btnText = '保存中...' if (type == 2) {
that.btnTongBu = "同步酒店...";
} else {
that.btnText = '保存...';
}
}); });
}, },
//取消 //取消
...@@ -1602,7 +1615,8 @@ ...@@ -1602,7 +1615,8 @@
//保存完成初始化 //保存完成初始化
initStatus() { initStatus() {
this.isSaved = true; this.isSaved = true;
this.btnText = '保存' this.btnText = '保存';
this.btnTongBu = "同步酒店";
}, },
//获取酒店信息 //获取酒店信息
getHotelList(item, event) { getHotelList(item, event) {
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ c5dd3e67
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
<td> <td>
<span class="spanlink" v-if='childItem.PeoplePrice==0' <span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('ticketManagement',subItem,'门票管理')">设置</span> @click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
<span v-else>
{{childItem.PeoplePrice}}
</span>
</td> </td>
<td> <td>
{{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}} {{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
......
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