Skip to content

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

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

parents 1fb0d839 5e35c46a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4216 additions and 538 deletions
src/assets/img/supplierBg.png 0 → 100644
View file @ dbfe15fe
This diff is collapsed.
src/components/Hotel/HotelQueryList.vue
View file @ dbfe15fe
......@@ -58,6 +58,16 @@
</el-date-picker>
</span>
</li>
<li>
<span>
<em>供应商</em>
<el-select v-model="msg.Supplier" placeholder="请选择">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>酒店</em>
......@@ -252,6 +262,8 @@
Star: 0,
//价格等级
PriceLevel: 0,
//供应商
Supplier: 0,
},
beforeCheck: {
disabledDate: time => {
......@@ -297,6 +309,8 @@
showHQinfo: true,
//酒店温馨提示列表
HotelTipList: [],
//供应商列表
SupplierList: [],
HotelList: [],
dataList: [],
isShow: false,
......@@ -326,6 +340,16 @@
};
},
methods: {
// 获取供应商
initSupplier() {
this.apipost("supplier_post_GetAllList", {
Type: 1
}, res => {
if (res.data.resultCode === 1) {
this.SupplierList = res.data.data;
}
}, err => {});
},
GotoHotel(HotelId) {
this.$router.push({
path: "HotelManagement",
......@@ -559,6 +583,7 @@
},
},
mounted() {
this.initSupplier();
this.getBranchList();
this.getProvinceList(651, 1);
this.GetHotelList();
......@@ -581,6 +606,7 @@
.classHong {
background-color: rgb(255, 55, 55);
color: #fff;
}
.classWang {
......
src/components/Hotel/roomReservationsDetails.vue
View file @ dbfe15fe
......@@ -13,7 +13,7 @@
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</li>
</ul>
</div>
......@@ -56,7 +56,7 @@
<table class="hotelTable">
<tr>
<td colspan="2">
<p class="link" style="word-break: normal;text-align:left;"
<p class="link" style="word-break: normal;text-align:left;"
:class="{'Hotel_red':subItem.HotelChangeState==3}"
@click="goUrlR('HotelManagement',subItem.HotelId,'酒店管理')">{{subItem.HotelName}}</p>
</td>
......@@ -116,7 +116,11 @@
<td v-if="childIndex==0" :rowspan="5">
<div class="w150">
<!--:disabled="subItem.OPState==1"-->
<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')"
@visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'>
......@@ -124,6 +128,7 @@
<span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
</el-option>
</el-select>
<p style="padding-top: 5px;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
......@@ -135,14 +140,15 @@
</td>
<!-- 房间数 -->
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
</td>
<!-- 预定人数 -->
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false">
</el-input>
</td>
<!-- 尚差房间数 -->
<td>
......@@ -153,13 +159,13 @@
</td>
<!-- 单价/每人 -->
<td>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'>
</el-input>
</td>
<!-- 免减人数 -->
<td>
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
v-model='childItem.HotelDiscount' @input="calculationPrice(subItem)">
</el-input>
</td>
......@@ -170,7 +176,7 @@
<!--返佣-->
<td>
<p class="pHouseStyle link" @input="calculationPrice(subItem)">
<span class="spanlink" v-if='childItem.IsRebateRatio==0'
<span class="spanlink" v-if='childItem.IsRebateRatio==0 '
@click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
<span v-if='childItem.IsRebateRatio!=0'>{{childItem.RebateRatio}}</span>
</p>
......@@ -185,7 +191,7 @@
<tr>
<td width="70" style="text-align:right;">订房状态：</td>
<td>
<el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')">
<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>
......@@ -224,7 +230,8 @@
<tr>
<td width="70" style="text-align:right;">订团号：</td>
<td>
<el-input class='w135' v-model='subItem.ReserveNo'></el-input>
<el-input class='w135' v-model='subItem.ReserveNo'></el-input>
</td>
</tr>
<tr>
......@@ -233,7 +240,7 @@
<tr>
<td width="70" style="text-align:right;">备注：</td>
<td>
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
</td>
</tr>
</table>
......@@ -244,7 +251,7 @@
<template v-if="subItem.OPState!=1">
<span class="Hotel_red">OP选房确认</span>
</template>
<template>
<template v-if="IsOperation!=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>
......@@ -293,6 +300,7 @@
checkedsubIndex: '',
loading: false,
boxHeight: 0,
IsOperation:'',
}
},
methods: {
......@@ -410,6 +418,7 @@
NewCombinationNum: this.$route.query.NewCombinationNum
}, res => {
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ dbfe15fe
......@@ -423,7 +423,7 @@
</td>
<td width="80" class="_zhidan">
<input type="button"
v-if="isUpdate=='true' && item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" value="制单"
value="制单"
class="normalBtn" @click="goZhiDan(item)" />
</td>
</tr>
......@@ -501,7 +501,7 @@
}
});
},
goZhiDan: function (obj) {
goZhiDan2: function (obj) {
let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95
let totailMoney = 0
this.nav.forEach(x => {
......@@ -539,6 +539,21 @@
}
});
},
goZhiDan: function (obj) {
if (this.list.hotelNoSureInfo !== '') {
this.$confirm(`${this.list.hotelNoSureInfo},是否去制单？`, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.goZhiDan2(obj)
}).catch(() => {
return false
});
}else{
this.goZhiDan2(obj)
}
},
addOtherList(index, id) {
this.list.OtherOrderReportList.OtherList.push({
OrderType: '1',
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ dbfe15fe
......@@ -3,8 +3,8 @@
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
<input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
</li>
</ul>
</div>
......@@ -47,6 +47,7 @@
<td colspan="2">
<span style="padding-left:5px;" class="link"
@click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}</span>
</td>
</tr>
<tr>
......@@ -73,6 +74,7 @@
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
:key='itemHotel.ID'></el-option>
</el-select>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.UseDinnerTypeStr}}
......@@ -92,7 +94,9 @@
<td>
<span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
<span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span>
<template v-else>
{{childItem.PeoplePrice}}
</template>
</td>
<td>
<el-input class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2'
......@@ -115,6 +119,7 @@
付款方式：
</td>
<td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
......@@ -123,8 +128,9 @@
<el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</td>
</td>
</tr>
<tr>
<td width="60" style="text-align:right;">
......@@ -152,7 +158,7 @@
订团号：
</td>
<td style="text-align:left;">
<el-input class='w135 tcenter' v-model='subItem.ReserveNo'></el-input>
<el-input class='w135 tcenter' v-model='subItem.ReserveNo'></el-input>
</td>
</tr>
</table>
......@@ -179,6 +185,7 @@
flightTotal: 0,
GuestNum: 0,
loading: false,
IsOperation:'',
};
},
methods: {
......@@ -231,21 +238,27 @@
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
this.list = res.data.data.DiningList;
this.IsOperation = res.data.data.IsOperation;
this.list.forEach(item => {
item.DinnerList = [];
item.DiningSummaryList.forEach(x => {
x.DiningReserveType = x.DiningReserveType.toString();
this.calculationPrice(x);
var str=x.NewDiningName;
if(x.RealName)
{
str=x.RealName;
}
item.DinnerList.push({
Name: x.NewDiningName,
RealName: str,
ID: x.NewDiningID
})
if (x.ReserveNo == '' || x.ReserveNo == null) {
x.ReserveNo = this.$route.query.NewCombinationNum;;
}
})
})
});
} else {
this.Error(res.data.message);
}
......
src/components/SalesModule/enrollTotal.vue
View file @ dbfe15fe
......@@ -193,6 +193,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
......@@ -219,8 +220,8 @@
<td>
<p style="color:#FF9C00">￥{{item.preferPrice}}</p>
</td>
<td>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
......
src/components/SalesModule/groupTourOrder.vue
View file @ dbfe15fe
......@@ -1512,7 +1512,7 @@
<tbody v-for="(item,index) in list" :key="index">
<tr>
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
@click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
......@@ -1522,6 +1522,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
<p style="min-width: 180px;">发团：{{item.startDate}}</p>
<p>下单时间：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
</td>
......@@ -1709,7 +1710,7 @@
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
@click='getHouse(item)'>修改房型
</div>
<!-- <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div> -->
<div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission ==true" @click="transfer(item)">订单转团</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')"
@click='setChargeLoss(item)'>
<span v-if="item.isChargeLossOrders==1">恢复收损单</span>
......@@ -1738,13 +1739,14 @@
</tr>
<tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-remarkTitle" v-if="item.guestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
</td>
</tr>
......@@ -2159,7 +2161,7 @@
OrderUnitPrice: 0
},
SuperiorPeople: [],
TransferMission:'',//订单转团权限
}
},
......@@ -2652,7 +2654,7 @@
this.showID = data
},
getRemarks(obj) {
// 华国豪5-5新增
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate) {
this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
confirmButtonText: "确定",
......@@ -2683,7 +2685,7 @@
this.remarksMsg.isOrder = obj.isOrder
}
},
getDetail(obj) {
getDetail(obj) {
this.Ysze = false;
this.starTime = obj.startDate
this.endTime = obj.backDate
......@@ -2769,7 +2771,7 @@
this.Unit_PriceList = [];
this.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.tcid,
"MaxPeopleNum": MaxPeopleNum
"MaxPeopleNum": maxPeopleNum
}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) {
......@@ -3472,7 +3474,7 @@
err => {}
)
},
getDdlyList(id) {
getDdlyList(id) {
this.apipost(
'sellorder_get_GetSellClientSourceEnumList', {
typeId: id
......@@ -3711,6 +3713,9 @@
}
},
mounted() {
let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.TransferMission = userMenuCode.indexOf(',Sale_TurnGroup,') != -1 ? true : false;
this.userId = this.getLocalStorage().EmployeeId
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ dbfe15fe
......@@ -1526,6 +1526,7 @@
</div>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>下单时间：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
......@@ -1721,7 +1722,7 @@
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission == true" @click="transfer(item)">订单转团</div>
<div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
<!-- v-if="item.isUpdateOrderCommission" -->
<div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate,TCMsg.LatestCommissionMoney=item.latestCommissionMoney, TiChengLoading = true'>修改提成</div>
......@@ -1745,13 +1746,14 @@
</tr>
<tr style="height:20px">
<td colspan="15" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span class="RL-remarkTitle" v-if="item.guestList.length>0 && item.isOwn !=2">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0 && item.isOwn !=2">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
</td>
</tr>
......@@ -2013,7 +2015,7 @@
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission == true" @click="transfer(item)">订单转团</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
</div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button>
......@@ -2522,6 +2524,7 @@ export default {
OrderUnitPrice:0
},
SuperiorPeople:[],
TransferMission:'',//订单转团
};
},
components: {
......@@ -3097,7 +3100,7 @@ submitYSZEForm(){
this.getDdlyList(this.addMsg.CustomerType);
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, "MaxPeopleNum": MaxPeopleNum}, 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++) {
......@@ -3142,7 +3145,7 @@ submitYSZEForm(){
},
err => {}
);
} else {
}
},
......@@ -3224,7 +3227,7 @@ submitYSZEForm(){
);
},
getRemarks(obj) {
// 华国豪5-5新增
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate){
this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
confirmButtonText: "确定",
......@@ -3256,7 +3259,7 @@ submitYSZEForm(){
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
}
//HK 新加
if(this.userId==1 || this.userId==5|| this.positionId==168)
{
......@@ -4222,6 +4225,10 @@ submitYSZEForm(){
}
},
mounted() {
let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.TransferMission = userMenuCode.indexOf(',Sale_TurnGroup,') != -1 ? true : false;
this.userId = this.getLocalStorage().EmployeeId;
this.positionId=this.getLocalStorage().RB_Post_Id;
this.getEmployee();
......
src/components/Supplier/HotelInfo.vue 0 → 100644
View file @ dbfe15fe
This diff is collapsed.
src/components/Supplier/HotelManagement.vue
View file @ dbfe15fe
......@@ -276,7 +276,7 @@
</li>
<li>
<button class="hollowFixedBtn" type="button" @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="goSubInfo('HotelInfo')">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" type="button" @click="goSubInfo('HotelInfo2')">{{$t('pub.addBtn')}}</button>
</li>
</ul>
</div>
......@@ -325,8 +325,8 @@
</div>
</div>
<div class="btnList">
<button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
<button @click="goUrl('HotelProductManage2',item)" class="hotelBtn">报价与库存</button>
<button @click="goSubInfo('HotelInfo2',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
<button @click="goUrl('HotelProductManage3',item)" class="hotelBtn">报价与库存</button>
</div>
</div>
</div>
......@@ -390,7 +390,7 @@
var msg = {
hotelID: ID
};
that.apipost(
that.ApiPost2(
"hotel_post_Remove",
msg,
res => {
......@@ -419,7 +419,7 @@
this.msg.QDistrict = "";
}
if (this.msg.Country !== "") {
this.apipost(
this.ApiPost2(
"dict_post_Destination_GetChildList",
msg,
res => {
......@@ -437,7 +437,7 @@
},
//获取国家
getCountryList() {
this.apipost(
this.ApiPost2(
"dict_post_Destination_GetCountry", {},
res => {
this.countryList = res.data.data;
......@@ -450,8 +450,8 @@
if (this.msg.Status == "") {
this.msg.Status = "-1";
}
this.apipost(
"hotel_post_GetPageList",
this.ApiPost2(
"hotel_post_GetPageList_Supplier",
this.msg,
res => {
this.loading = false;
......@@ -491,7 +491,7 @@
},
//获取酒店类型列表
GetHotelTypeList() {
this.apipost(
this.ApiPost2(
"dmc_post_Get_GetHotelType", {},
res => {
if (res.data.resultCode == 1) {
......@@ -502,7 +502,7 @@
);
},
GetHotelPirceTypeList() {
this.apipost(
this.ApiPost2(
"dmc_post_Get_GetHotelPriceType", {},
res => {
if (res.data.resultCode == 1) {
......
src/components/Supplier/HotelProductCalendar.vue 0 → 100644
View file @ dbfe15fe
<template>
<div class="hotelProductCalendar">
<div class="hotelProductCalendar_month">
<div onselectstart="return false;">
<span>{{calendar.data.date&&calendar.data.date.split('-')[0]}}年</span>
<span>{{calendar.data.date&&calendar.data.date.split('-')[1]}}月</span>
</div>
<div>
<span>酒店库存表</span>
</div>
<div>
<i class="iconfont icon-cha" @click="calendarHide()"></i>
</div>
</div>
<div class="hotelProductCalendar_week">
<div>{{$t('hotel.hotel_Monday')}}</div>
<div>{{$t('hotel.hotel_Tuesday')}}</div>
<div>{{$t('hotel.hotel_Wednesday')}}</div>
<div>{{$t('hotel.hotel_Thursday')}}</div>
<div>{{$t('hotel.hotel_Friday')}}</div>
<div>{{$t('hotel.hotel_Saturday')}}</div>
<div>{{$t('hotel.hotel_Sunday')}}</div>
</div>
<div class="hotelProductCalendar_day">
<div v-for="(item, index) in calendar.data.days" :key="index">
<div :class="item.month===calendar.data.date?'nowMonth':'otherMonth'">
<span>{{item.date.getMonth()+1}}-{{item.date.getDate()}}</span>
</div>
<div v-if="item.data&&item.month===calendar.data.date" :class="stockColor(item.data.SubList[0].InventoryType)">
<template v-for="(childItem,childIndex) in item.data.SubList">
<p>
<span title="点击修改价格和库存信息">
价格：<span @click="goUrlA('2', item,childItem.BatchNumber)" class="text_underLine">{{childItem.CostPrice}}（{{childItem.CurrencyName}}）</span>
</span><br/>
<span title="点击跳转到总库存看板">
总库存：<span class="text_underLine" @click="goUrlB(item)">{{childItem.Inventory}}（间）</span>
</span><br/>
<span title="点击跳转到酒店查询">
剩余库存：<span class="text_underLine" @click="goUrlHotelTeam(item)">{{childItem.RemainingInventory}}（间）</span>
</span>
</p>
</template>
</div>
<div class="noStock" v-if="!item.data&&item.month===calendar.data.date">
<p><span>暂无数据</span></p>
<p><span @click="goUrlA('1', item,1)">立即新增</span></p>
</div>
<div class="hasStock" v-if="item.month!==calendar.data.date">
<p></p>
<p></p>
<p></p>
<p></p>
<p></p>
<p></p>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
props: {
'calendar': {
type: Object,
default: function () {
return {
show: false,
data: {}
}
}
}
},
methods: {
stockColor: function (type) {
if (type === 1) {
return 'hasStock hasStock_1'
} else if (type === 2) {
return 'hasStock hasStock_2'
} else if (type === 3) {
return 'hasStock hasStock_3'
} else if (type === 4) {
return 'hasStock hasStock_4'
} else if (type === 5) {
return 'hasStock hasStock_5'
}
},
calendarHide: function () {
this.calendar.show = false
this.calendar.data = {}
},
goUrlA: function (type, item,BatchNumber) {
this.$emit('goEdit', type, item.day,BatchNumber)
},
goUrlHotelTeam: function (item) {
this.$router.push({
name: 'HotelsTeam',
query: {
HotelId: item.data.HotelId,
StartDate: item.data.DayStr,
blank: 'y',
tab: '酒店相关团'
}
});
},
goUrlB: function (item) {
this.$router.push({
name: 'HotelTotalStock',
query: {
HotelId: this.hotelId,
blank: 'y',
tab: '总库存看板'
}
});
}
}
}
</script>
<style scoped>
.hotelProductCalendar {
width: 100%;
font-size: 0px;
box-sizing: border-box;
background-color: #f5f5f5;
}
.hotelProductCalendar_month {
position: relative;
width: 100%;
height: 50px;
line-height: 50px;
text-align: center;
background: #e95252;
border-radius: 4px 4px 0 0;
}
.hotelProductCalendar_month>div {
display: inline-block;
height: 50px;
line-height: 50px;
vertical-align: top;
}
.hotelProductCalendar_month>div:nth-child(1)>i {
display: inline-block;
font-size: 22px;
color: #ff7e7e;
cursor: pointer;
vertical-align: middle;
}
.hotelProductCalendar_month>div:nth-child(1)>input {
display: inline-block;
width: 60px;
height: 30px;
border-radius: 17px;
outline: none;
border: none;
color: #fff;
background: transparent;
font-size: 18px;
text-align: center;
vertical-align: middle;
}
.hotelProductCalendar_month>div:nth-child(1)>span {
display: inline-block;
padding: 0 5px;
font-size: 18px;
color: #fff;
vertical-align: middle;
}
.hotelProductCalendar_month>div:nth-child(2)>span {
display: inline-block;
padding: 0 20px;
font-size: 18px;
color: #fff;
}
.hotelProductCalendar_month>div:nth-child(3) {
position: absolute;
z-index: 1;
right: 0px;
top: 0px;
width: 50px;
text-align: center;
}
.hotelProductCalendar_month>div:nth-child(3)>i {
font-size: 12px;
color: #ffffff;
cursor: pointer;
}
.hotelProductCalendar_week {
width: 100%;
height: 28px;
background-color: #3fa783;
}
.hotelProductCalendar_week>div {
display: inline-block;
width: 14.2857%;
height: 28px;
line-height: 28px;
text-align: center;
font-size: 14px;
color: #FFFFFF;
}
.hotelProductCalendar_day {
width: 100%;
border-left: 1px solid #dddddd;
}
.hotelProductCalendar_day>div {
display: inline-block;
width: 14.2857%;
height: 148px;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
vertical-align: top;
}
.hotelProductCalendar_day>div>div:nth-child(1) {
width: 100%;
height: 28px;
line-height: 28px;
text-align: center;
}
.hotelProductCalendar_day>div>div:nth-child(1)>span {
font-size: 14px;
}
.hotelProductCalendar_day>div>.nowMonth {
background-color: #CCCCCC;
}
.hotelProductCalendar_day>div>.nowMonth>span {
color: #000000;
}
.hotelProductCalendar_day>div:nth-child(7n-1)>.nowMonth>span {
color: #e95252;
}
.hotelProductCalendar_day>div:nth-child(7n)>.nowMonth>span {
color: #e95252;
}
.hotelProductCalendar_day>div>.otherMonth {
background-color: #DDDDDD;
}
.hotelProductCalendar_day>div>.otherMonth>span {
color: #999999;
}
.hotelProductCalendar_day>div>.hasStock {
width: 100%;
height: 120px;
overflow-y: auto;
}
.hotelProductCalendar_day>div>.hasStock>p {
width: 100%;
min-height: 20px;
padding: 0 10px;
line-height: 19px;
font-size: 12px;
border-bottom: 1px dashed #ccc;
}
.hotelProductCalendar_day>div>.hasStock_1 {
color: #FFFFFF;
background-color: #ff3737;
}
.hotelProductCalendar_day>div>.hasStock_2 {
background-color: #ff99cc;
}
.hotelProductCalendar_day>div>.hasStock_3 {
background-color: #bcd6ee;
}
.hotelProductCalendar_day>div>.hasStock_4 {
background-color: #ffffff;
}
.hotelProductCalendar_day>div>.hasStock_5 {
background-color: #02F78E;
}
.hotelProductCalendar_day>div>.noStock {
padding: 30px 0 0 0;
width: 100%;
height: 120px;
}
.hotelProductCalendar_day>div>.noStock>p:nth-child(1) {
width: 100%;
font-size: 16px;
color: #999999;
text-align: center;
}
.hotelProductCalendar_day>div>.noStock>p:nth-child(2) {
margin: 10px 0 0 0;
width: 100%;
font-size: 12px;
color: #00C6FF;
text-align: center;
cursor: pointer;
}
.text_underLine {
cursor: pointer;
text-decoration: underline
}
</style>
src/components/Supplier/HotelProductManage.vue 0 → 100644
View file @ dbfe15fe
This diff is collapsed.
src/components/Supplier/HotelQueryList.vue
View file @ dbfe15fe
......@@ -89,7 +89,7 @@
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">
<div style="text-decoration: underline;cursor:pointer">
{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
</template>
......@@ -116,7 +116,7 @@
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge"
@click="GotoUrl(scope.row,index,scope.row.subList[index].UseInventory)">
>
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div>
<div class="Hotel_kong Com_hoteldiv">
......@@ -357,7 +357,7 @@
if (this.msg.EndDate == null) {
this.msg.EndDate = this.setEdate();
}
this.apipost("dict_post_HotelOffer_GetHotelStatics", this.msg,
this.ApiPost2("dict_post_HotelOffer_GetHotelStatics_Supplier", this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
......@@ -372,8 +372,8 @@
},
//获取酒店列表
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
this.ApiPost2(
"hotel_post_GetHasStockHotelList_Supplier", {
Country: 651,
IsMoreThanZero: 1
},
......@@ -445,7 +445,7 @@
},
//获取酒店列表
GetHotelTipList() {
this.apipost(
this.ApiPost2(
"hoteltip_get_GetPageList", this.queryMsg,
res => {
if (res.data.resultCode == 1) {
......@@ -457,7 +457,7 @@
);
},
SaveHotelTip() {
this.apipost(
this.ApiPost2(
"hoteltip_post_SetHotelTip", this.postMsg,
res => {
if (res.data.resultCode == 1) {
......@@ -475,7 +475,7 @@
RemoveHotelTip(Id) {
var that = this;
this.Confirm('是否要删除此数据?', function () {
that.apipost(
that.ApiPost2(
"hoteltip_post_RemoveHotelTip", {
ID: Id
},
......@@ -492,7 +492,7 @@
})
},
GetHotelTip(Id) {
this.apipost(
this.ApiPost2(
"hoteltip_get_GetHotelTip", {
ID: Id
},
......@@ -521,7 +521,7 @@
this.msg.City = 0;
this.cityList = [];
}
this.apipost(
this.ApiPost2(
"dict_post_Destination_GetChildList",
msg,
res => {
......@@ -535,7 +535,7 @@
);
},
getBranchList() {
this.apipost('admin_get_BranchGetList', {
this.ApiPost2('admin_get_BranchGetList', {
RB_Group_Id: '2',
Status: 0,
}, res => {
......@@ -549,10 +549,10 @@
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
uid: this.getLocalStorageSupplier().SupplierAccountId
};
let fileName = "酒店查询统计" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotelQuery", qMsg, fileName,
this.GetLocalFile("hotel_get_downloadHotelQuery_Supplier", qMsg, fileName,
res => {
this.loading = false;
});
......
src/components/Supplier/HotelSalesBoard.vue
View file @ dbfe15fe
......@@ -246,7 +246,7 @@
</el-select>
</span>
</li>
<li>
<li style="display:none;">
<span>
<em>供应商</em>
<el-select v-model="msg.Supplier" placeholder="请选择">
......@@ -362,7 +362,7 @@
},
methods: {
getBranchList() {
this.apipost('admin_get_BranchGetList', {
this.ApiPost2('admin_get_BranchGetList', {
RB_Group_Id: '2',
Status: 0,
}, res => {
......@@ -454,8 +454,8 @@
this.msg.Year = this.currentYear;
this.msg.Month = this.currentMonth;
this.DayData = [];
this.apipost(
"hotelreport_get_GetHotelPriceMonthStatisticsExt",
this.ApiPost2(
"hotelreport_get_GetHotelPriceMonthStatisticsExt_Supplier",
this.msg,
res => {
this.msg.loading = false;
......@@ -488,8 +488,8 @@
},
//获取酒店列表
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
this.ApiPost2(
"hotel_post_GetHasStockHotelList_Supplier", {
Country: 651,
IsMoreThanZero: 1
},
......@@ -515,7 +515,7 @@
this.msg.City = 0;
this.cityList = [];
}
this.apipost(
this.ApiPost2(
"dict_post_Destination_GetChildList",
msg,
res => {
......@@ -534,10 +534,10 @@
this.msg.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
uid: this.getLocalStorageSupplier().SupplierAccountId
};
let fileName = "酒店统计" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotelSalesBoard", qMsg, fileName,
this.GetLocalFile("hotel_get_downloadHotelSalesBoard_Supplier", qMsg, fileName,
res => {
this.msg.loading = false;
});
......@@ -545,9 +545,9 @@
this.Info("请选择要下载的酒店!");
}
},
// 获取供应商
// 获取供应商
initSupplier() {
this.apipost("supplier_post_GetAllList", {
this.ApiPost2("supplier_post_GetAllList", {
Type: 1
}, res => {
if (res.data.resultCode === 1) {
......@@ -567,7 +567,7 @@
this.currentMonth = myDate.getMonth() + 1;
this.msg.Year = this.currentYear;
this.msg.Month = this.currentDay;
this.initSupplier();
//this.initSupplier();
this.getBranchList();
this.GetHotelList();
this.initCalendar();
......
src/components/Supplier/HotelTotalStock.vue
View file @ dbfe15fe
......@@ -356,7 +356,7 @@
</el-select>
</span>
</li>
<li>
<li style="display:none;">
<span>
<em>供应商</em>
<el-select v-model="msg.Supplier" placeholder="请选择">
......@@ -389,7 +389,7 @@
</div>
<ul class='clearfix' v-loading="loading">
<li v-for="(item,index) in DataList">
<div class="hotelTS_item" @click="goUrlHotel('HotelSalesBoard',item.ID)">
<div class="hotelTS_item" @click="goUrlHotel('HotelSalesBoard2',item.ID)">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
<img v-else :src="item.PicPath" :onerror='defaultImg'>
<el-tooltip effect="dark" :content="item.Name" placement="top-start">
......@@ -470,7 +470,7 @@
if (this.msg.eDate == null) {
this.msg.eDate = this.setEdate()
}
this.apipost('hotel_post_GetStockPageList', this.msg, res => {
this.ApiPost2('hotel_post_GetStockPageList_Supplier', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.msg.total = res.data.data.count;
......@@ -492,8 +492,8 @@
},
//获取酒店列表
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
this.ApiPost2(
"hotel_post_GetHasStockHotelList_Supplier", {
Country: 651,
IsMoreThanZero: 1
},
......@@ -527,7 +527,7 @@
this.msg.City = 0;
this.cityList = [];
}
this.apipost(
this.ApiPost2(
"dict_post_Destination_GetChildList",
msg,
res => {
......@@ -542,7 +542,7 @@
},
// 获取供应商
initSupplier() {
this.apipost("supplier_post_GetAllList", {
this.ApiPost2("supplier_post_GetAllList", {
Type: 1
}, res => {
if (res.data.resultCode === 1) {
......@@ -554,7 +554,7 @@
mounted() {
this.msg.HotelId = this.$route.query.HotelId === undefined ? 0 : this.$route.query.HotelId;
this.initSupplier();
//this.initSupplier();
this.GetHotelList();
this.getProvinceList(651, 1);
this.getList();
......
src/components/Supplier/roomQuery.vue
View file @ dbfe15fe
This diff is collapsed.
src/components/SupplierIndex.vue 0 → 100644
View file @ dbfe15fe
This diff is collapsed.
src/components/SupplierLogin.vue 0 → 100644
View file @ dbfe15fe
<style>
@import "../assets/css/login.css";
.Supplier_Login .item img {
width: 100%;
}
.Supplier_Left_Line,
.Supplier_Right_Line {
background-color: #5182E4;
}
.Supplier_Login .login-Div input.input {
caret-color: #5182E4;
}
.Supplier_Login .login_Title {
font-size: 28px;
color: #fff;
width: 100%;
text-align: center;
}
.Supplier_Login .loginXI {
font-size: 20px;
color: #fff;
margin-top: 18px;
opacity: 0.6;
}
.Supplier_Login .login-Div .loginBtn:hover {
background-color: #5182E4;
}
</style>
<template>
<div class="login-box Supplier_Login">
<div class="homepage-hero-module">
<div :style="{'height':'100vh'}">
<div class="item">
<img :style="{'height':'100vh'}" src="../assets/img/supplierBg.png" />
</div>
</div>
</div>
<form class="login-Div">
<div v-if="isShow==1">
<div class="mainTitle">
<div class="login_Title">
{{groupModel.GroupName?groupModel.GroupName:''}}
</div>
<div class="loginXI">供应商登录</div>
</div>
<div class="login-commonBotm T1">
<i class="icon-login-name iconfont icon-user11"></i>
<input class="input" @focus="name_bline=true" @blur="name_bline=false" maxlength="20"
autocomplete="new-password" v-model="userInfo.name" style="background-color:transparent !important;"
type="text" :placeholder="$t('login.login_account')" @keyup.enter="doLogin" />
<div class="name_bline_left Supplier_Left_Line" :class="name_bline==true?'_bline_w':''"></div>
<div class="name_bline_right Supplier_Right_Line" :class="name_bline==true?'_bline_w':''"></div>
</div>
<div class="error-msg">
<div v-show="nameIsShow"><img src="../assets/img/login-error-tips.png" />{{ nameErrorMsg }}</div>
</div>
<div class="login-commonBotm">
<i class="icon-login-password iconfont icon-mima"></i>
<input class="input" @focus="pwd_bline=true" @blur="pwd_bline=false" maxlength="20"
autocomplete="new-password" v-model="userInfo.password" style="background-color:transparent !important"
type="password" :placeholder="$t('login.login_password')" @keyup.enter="doLogin" />
<div class="pwd_bline_left Supplier_Left_Line" :class="pwd_bline==true?'_bline_w':''"></div>
<div class="pwd_bline_right Supplier_Right_Line" :class="pwd_bline==true?'_bline_w':''"></div>
</div>
<div class="error-msg">
<div v-show="passwordIsShow"><img src="../assets/img/login-error-tips.png" />{{ passwordErrorMsg }}</div>
</div>
<button type="button" class="loginBtn" :class="{'loginIng':loginState==1}" :disabled="loginState==1"
@click="doLogin">{{loginState==1?'登录中...':'登录'}}</button>
</div>
</form>
</div>
</template>
<script>
export default {
name: "login-box",
data() {
return {
userInfo: {
name: "",
password: "",
Domain: ""
},
groupModel: {},
timer: null,
isShow: 1,
fixStyle: "",
nameIsShow: false,
passwordIsShow: false,
nameErrorMsg: "",
passwordErrorMsg: "",
name_bline: false,
pwd_bline: false,
loginState: 0,
height: 0,
clock: null,
crtIndex: 0,
};
},
mounted() {
this.init();
let that = this;
this.clock = setInterval(() => {
that.init()
}, 1000);
let _audio = this.$refs.audio;
try {
_audio.playbackRate = 0.5;
} catch (error) {}
this.getGroup();
this.initData();
window.onresize = () => {
const windowWidth = document.body.clientWidth;
const windowHeight = document.body.clientHeight;
const windowAspectRatio = windowHeight / windowWidth;
let videoWidth;
let videoHeight;
if (windowAspectRatio < 0.5625) {
videoWidth = windowWidth;
videoHeight = videoWidth * 0.5625;
this.fixStyle = {
height: windowWidth * 0.5625 + "px",
width: windowWidth + "px",
"margin-bottom": (windowHeight - videoHeight) / 2 + "px",
"margin-left": "initial"
};
} else {
videoHeight = windowHeight;
videoWidth = videoHeight / 0.5625;
this.fixStyle = {
height: windowHeight + "px",
width: windowHeight / 0.5625 + "px",
"margin-left": (windowWidth - videoWidth) / 2 + "px",
"margin-bottom": "initial"
};
}
};
window.onresize();
},
methods: {
init() {
let over = true;
let maxHeight = 0;
if (!this.$refs['swiper'])
return false;
this.$refs['swiper'].forEach(x => {
if (x.complete) {
maxHeight = x.height > maxHeight ? x.height : maxHeight
} else {
over = false;
return false
}
});
if (over) {
this.height = maxHeight;
clearInterval(this.clock);
let that = this;
that.change();
setInterval(() => {
that.change()
}, 8000)
}
},
//初始化数据
initData() {
//判断是否是线上环境
if (!this.isOnline()) {
this.userInfo.name = "13551126756";
this.userInfo.password = "123456";
}
this.userInfo.Domain = window.location.hostname
},
change() {
if (this.crtIndex < this.imgs.length - 1)
this.crtIndex++
else
this.crtIndex = 0
},
getGroup() { //获取集团
let Domain = window.location.hostname
this.ApiPost2('admin_get_GetModelByDomain', {
'Domain': Domain
}, res => {
this.groupModel = res.data.data;
document.title = "欢迎使用 " + this.groupModel.GroupName + " ERP系统";
}, err => {})
},
doLogin() {
if (this.userInfo.name == "") {
this.nameIsShow = true;
this.nameErrorMsg = "请输入用户名";
return;
} else if (this.userInfo.password == "") {
this.passwordIsShow = true;
this.passwordErrorMsg = "请输入密码";
return;
} else {
this.nameIsShow = false;
this.passwordIsShow = false;
}
this.loginState = 1;
var msg = {
EmAccount: this.userInfo.name,
EmPassword: this.userInfo.password
};
this.ApiPost2(
"supplier_get_UserLogin",
msg,
response => {
var jsonData = response.data;
if (jsonData.resultCode == 1) {
//登录成功
var userData = jsonData.data;
var userJson = JSON.stringify(userData);
localStorage.userInfo = userJson;
this.$router.push({
path: "/SupplierIndex"
});
} else {
this.$notify.error({
title: "提示",
customClass: "msgTips",
message: response.data.message,
showClose: false,
duration: 3000
});
}
},
err => {}
);
}
}
};
</script>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ dbfe15fe
......@@ -1539,6 +1539,7 @@
style="color:red">({{item.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
<p>下单时间：{{item.CreateDate}}</p>
<p v-if="item.TradeWay ==1">{{item.PlatformOrder}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位
......@@ -1682,14 +1683,15 @@
</tr>
<tr>
<td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-remarkTitle" v-if="item.GuestList.length>0">名单:</span>
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</p>
<p class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
</p>
<!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<span>房间信息：{{item.OrderGuestHouseStr}}</span>
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
</tr>
......@@ -1744,6 +1746,7 @@
style="color:red">({{childItem.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{childItem.CommissionSPeopleName}}</div>
<p>下单时间：{{childItem.CreateDate}}</p>
<p v-if="childItem.TradeWay ==1">{{childItem.PlatformOrder}}</p>
<p v-if='childItem.CommissionMoney' style="color:red">提成：{{childItem.CommissionMoney}}</p>
<p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}}
</p>
......@@ -1944,14 +1947,15 @@
</tr>
<tr>
<td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-remarkTitle" v-if="childItem.GuestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="childItem.GuestList.length>0">
<span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
<span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span>
</td>
</tr>
......@@ -2262,14 +2266,14 @@
</tr>
<tr>
<td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-remarkTitle" v-if="item.GuestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
</tr>
......
src/components/busManagement/BusInfo.vue
View file @ dbfe15fe
This diff is collapsed.
src/components/busManagement/busStatistics.vue
View file @ dbfe15fe
......@@ -138,23 +138,22 @@
<div class="w80">{{item.GuideName}}</div>
</td>
<td>
<div class="w80">{{item.CommonReport.BusList[0].MainBusTypeStr}} </div>
<div class="w80">{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}} </div>
</td>
<td v-for="(x,ww) in item.CommonReport.BusList" style="vertical-align: top;">
<td v-for="(x,ww) in item.CommonReport.BusPlanListReport" style="vertical-align: top;">
<div class="w100">
<p class="pDateStyle">{{x.PlanDateStr}}</p>
<p class="pDateStyle">
<template v-for="(childItem,childIndex) in x.DetailList">
{{ (childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"")+(childItem.UseTypeStr!=""?childItem.UseTypeStr:"") }}
<template v-if="x.DetailList.length>1 && x.DetailList.length-1!=childIndex"><br /></template>
</template>
<template v-if="x.OrderState>-1">
<br />
<span style="color: #4BCA81;"
v-if="(x.DetailList[0].AirportPickUpStr!='' ||x.DetailList[0].UseTypeStr!='')">√</span>
<template v-for="(childItem,childIndex) in x.BusPlanOrderList">
<p class="pDateStyle" v-if="childIndex==0"> {{childItem.PlanDateStr}}</p>
<p class="pDateStyle">
{{(childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"") }}
<span style="color: #4BCA81;" v-if="(childItem.AirportPickUpStr!='')">√</span>
<span style="color: #E95252;" v-else>X</span>
</template>
</p>
<template v-if="x.BusPlanOrderList.length>1 && x.BusPlanOrderList.length-1!=childIndex">
<br />
</template>
</p>
</template>
</div>
</td>
<td v-for="is in item.isCha"></td>
......@@ -166,12 +165,12 @@
</td>
<td>
<div class="w150">
{{GetTotalPrice(item.CommonReport.BusList,item.CommonReport.HouseStatistics.RealityNum)}}
{{GetTotalPrice(item.CommonReport.BusPlanListReport,item.CommonReport.HouseStatistics.RealityNum)}}
</div>
</td>
<td>
<div class="w100">
{{GetPeiChe(item.CommonReport.BusList)}}
{{GetPeiChe(item.CommonReport.BusPlanListReport)}}
</div>
</td>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
......@@ -242,9 +241,11 @@
GetTotalPrice(obj) { //车费总价
let totalPrice = 0;
obj.forEach(busInfo => {
if (busInfo.CostPrice != undefined) {
totalPrice += busInfo.CostPrice ;
}
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.CostPrice != undefined) {
totalPrice += subItem.CostPrice;
}
});
});
return totalPrice;
},
......@@ -271,7 +272,7 @@
let DayNum = 0;
obj.forEach((busInfo, index) => {
if (index == 0) {
busInfo.DetailList.forEach(subItem => {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
jieji += subItem.AirportPickUpStr + ",";
} else {
......@@ -281,7 +282,7 @@
});
} else if (index == (obj.length - 1)) {
busInfo.DetailList.forEach(subItem => {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
songji += subItem.AirportPickUpStr + ",";
} else {
......@@ -289,9 +290,7 @@
}
});
} else {
if (busInfo.OrderState > -1) {
DayNum += 1;
}
DayNum += 1;
}
});
if (parseInt(DayNum) > 0) {
......@@ -379,7 +378,7 @@
},
getList() {
this.loading = true
this.apipost('bus_Get_GetBusUniteCombinationNumService', this.msg, res => {
this.apipost('bus_Get_GetBusUniteCombinationNumService_V2', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
......@@ -391,8 +390,9 @@
}
this.DataList.forEach(outItem => {
outItem.StaticsReportList.forEach(item => {
if (item.CommonReport.BusList.length < res.data.data.pageData.columnsCount) {
item.isCha = res.data.data.pageData.columnsCount - item.CommonReport.BusList.length;
if (item.CommonReport.BusPlanListReport.length < res.data.data.pageData.data.length) {
item.isCha = res.data.data.pageData.columnsCount - item.CommonReport.BusPlanListReport
.length;
} else {
item.isCha = 0;;
}
......@@ -400,7 +400,7 @@
})
this.$forceUpdate();
} else {
this.$message.error(res.data.message);
this.Error(res.data.message);
}
}, err => {})
},
......@@ -414,7 +414,7 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
......
src/components/leaderPay2.vue
View file @ dbfe15fe
......@@ -343,7 +343,13 @@ input[type="number"] {
</p>
</td>
<td width="80" class="_zhidan">
<input v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
<input v-if="TimeXiao"
type="button"
value="制单"
class="leader2Btn"
@click="goZhiDan(item)"
>
<input v-else-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
type="button"
value="制单"
class="leader2Btn"
......@@ -414,6 +420,7 @@ export default {
TotalPriceData: [],
blankUrl: "",
TotalNav: [],
TimeXiao: false,
};
},
methods: {
......@@ -511,6 +518,8 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.nav = res.data.data;
let time = this.nav[0].StartDateStr
this.TimeXiao = time < '2019-05-01' ? true : false
} else {
this.Error(res.data.message);
}
......
src/components/public/leftNav.vue
View file @ dbfe15fe
......@@ -56,11 +56,11 @@
<ul class="clearfix flash_menu_left">
<li v-if="ShortcutMenu.length<1" class="fl" >
<div @click="singleMenUlayerShow2 = true, singleMenUlayerShow = false">
<i
<i
class="iconfont icon-mui-icon-add add_more"></i>
</div>
<p @click="singleMenUlayerShow2 = true, singleMenUlayerShow = false">新增快捷菜单</p>
</li>
<li v-for="(item, index) in ShortcutMenu" class="fl" >
<i v-if="singleMenUlayerShow2" class="iconfont icon-Close" @click="deleteFlash(item, index)"></i>
......@@ -116,7 +116,7 @@
this.$forceUpdate()
},
// 添加快捷菜单
addFlash: function (item, index, fIndex) {
addFlash: function (item, index, fIndex) {
item.IsShortcutMenu = item.IsShortcutMenu === 1 ? 2 : 1
if (item.IsShortcutMenu === 1) {
let repeat = false
......@@ -184,7 +184,7 @@
})
this.ShortcutMenu = ShortcutMenu
}
}
})
this.activeName = this.items[0].MenuName
......@@ -274,8 +274,8 @@
.flash_menu{
text-align: center;
position: relative;
margin: 5px;
padding: 10px;
margin: 5px;
padding: 10px;
width: 97px;
}
.flash_menu .menu_icon i.iconfont{
......
src/plug/index.js
View file @ dbfe15fe
This diff is collapsed.
src/router/config.js
View file @ dbfe15fe
This diff is collapsed.
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