Skip to content

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

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

parents c47542f9 2721a048
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 106 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ db71fdb6
......@@ -814,7 +814,7 @@
<!-- <th width="100px">账户余额</th> -->
<th>金额</th>
<th width="70">币种</th>
<th width="50px">汇率</th>
<th width="150px">汇率</th>
<!-- <th>手续费</th> -->
<th width="100px">总金额</th>
<!-- <th>操作</th> -->
......@@ -869,7 +869,7 @@
<td>
<el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{Math.round(i.allMoney * 100) / 100}}</td>
<td>{{i.allMoney}}</td>
</tr>
</template>
<tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
......@@ -1310,6 +1310,7 @@ export default {
let allMoney = 0
this.payMsgList.forEach(x=>{
allMoney+= parseFloat(x.allMoney);
x.allMoney=Math.round(x.allMoney * 100) / 100;
})
this.allMoney = Math.round(allMoney * 100) / 100;
},
......@@ -1506,8 +1507,10 @@ export default {
let fee = this.payMsgList[index].Fee,
Rate = this.payMsgList[index].Rate==0?1:this.payMsgList[index].Rate,
Money = this.payMsgList[index].OriginalMoney;
Rate=Rate*100;
Rate=Rate*100;
this.payMsgList[index].allMoney = Math.round(((Money*Rate)+fee) * 100) / 100 / 100;
// console.log('this.payMsgList[index].allMoney', this.payMsgList[index].allMoney)
} else {
this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee);
this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate);
......
src/components/FinancialModule/JumpReport.vue
View file @ db71fdb6
......@@ -851,6 +851,10 @@ export default {
if(this.$route.query.BranchId){
this.msg.RB_Branch_Id=parseInt(this.$route.query.BranchId);
}
if(this.$route.query.IsFormEasyReport){
this.msg.IsFormEasyReport=parseInt(this.$route.query.IsFormEasyReport);
}
if(this.$route.query.CostIds){
let arr = this.$route.query.CostIds ? this.$route.query.CostIds.split(',') : []
if (arr.length) {
......@@ -868,7 +872,6 @@ export default {
this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId;
this.msg.EmployeeId= userInfo.EmployeeId;
this.msg.IsFormEasyReport=1;
this.financeinfo_post_GetList();
this.financeinfo_post_GetCostTypeList();
this.FinancialFlowTemplate_post_GetList();
......@@ -953,7 +956,6 @@ export default {
})
console.log(this.msg.CostTypeIDs)
}
this.msg.IsFormEasyReport=1;
this.loading= true;
this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
......@@ -980,7 +982,7 @@ export default {
this.$message.error(res.data.message);
}
this.msg.TCID= this.msg.TCID=0?this.msg.TCID:'';
this.queryInfoInit();
// this.queryInfoInit();
this.currentPage = parseInt(this.msg.pageIndex);
},err=>{})
},
......@@ -1298,6 +1300,7 @@ export default {
OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
}
this.msg = msg;
},
......
src/components/FinancialModule/ReportForm/AnnualRanking.vue
View file @ db71fdb6
......@@ -423,11 +423,12 @@
<div v-show="type==0 || type==8">
<div class="year">{{msg.Year}}年机票罚金排名</div>
<el-table border
@cell-click="TicketCellClick"
:cell-class-name="CellName"
:header-cell-class-name="HeaderName"
:data="AirPenalty"
style="width: 100%">
<el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
<el-table-column fixed prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
<el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column>
<el-table-column sortable prop="February" label="二月" min-width="100"> </el-table-column>
<el-table-column sortable prop="March" label="三月" min-width="100"> </el-table-column>
......@@ -488,6 +489,80 @@
this.GetList();
},
methods:{
// 机票罚金跳转
TicketCellClick(row, column, cell){
let year=this.msg.Year;
let month=0;
let BranchId=0;
let CostIds=53;
let IsFormEasyReport=2;
if(column.property=="BranchName" || column.property=="FirstQuarter" || column.property=="SecondQuarter" || column.property=="HalfReport" || column.property=="ThirdQuarter" || column.property=="FourthQuarter" || column.property=="LastHalfReport"|| column.property=="Total"){
return;
}
if(column.property=="January"){
month=1;
BranchId=row.BranchId;
}
if(column.property=="February"){
month=2;
BranchId=row.BranchId;
}
if(column.property=="March"){
month=3;
BranchId=row.BranchId;
}
if(column.property=="March"){
month=3;
BranchId=row.BranchId;
}
if(column.property=="April"){
month=4;
BranchId=row.BranchId;
}
if(column.property=="May"){
month=5;
BranchId=row.BranchId;
}
if(column.property=="June"){
month=6;
BranchId=row.BranchId;
}
if(column.property=="July"){
month=7;
BranchId=row.BranchId;
}
if(column.property=="August"){
month=8;
BranchId=row.BranchId;
}
if(column.property=="September"){
month=9;
BranchId=row.BranchId;
}
if(column.property=="October"){
month=10;
BranchId=row.BranchId;
}
if(column.property=="November"){
month=11;
BranchId=row.BranchId;
}
if(column.property=="December"){
month=12;
BranchId=row.BranchId;
}
this.$router.push({
path: "/JumpReport",
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:CostIds,
IsFormEasyReport:IsFormEasyReport,
blank: "y"
}
});
},
HeaderName({row, column}){
if(column.property=="Total" || column.property=="HalfReport" || column.property=="LastHalfReport"){
return "TableRed"
......
src/components/LeaderManagement/leaderArrangement.vue
View file @ db71fdb6
......@@ -132,13 +132,13 @@
}
.leaderArrangement .Assied > div:first-child {
margin-left: 40px;
margin-left: 20px;
text-align: center;
}
.leaderArrangement .AssList {
float: left;
margin-right: 10px;
margin:5px 10px 0 0;
height: 80px;
line-height: 1;
text-align: center;
......@@ -445,7 +445,7 @@
<el-col :span="2">
<div class="forSaling">{{item.TCStateStr}}{{$t('hotel.hotel_Inthe')}}</div>
</el-col>
<el-col :span="3">
<el-col :span="5">
<div class="notAssigned" v-if="item.LeaderId===0&&item.GuideId===0">
{{$t('leader.leader_notAssigned')}}
</div>
......@@ -542,8 +542,12 @@
countryList: "",
pickerOptions1: {
disabledDate: time => {
let endTime = new Date(this.msg.QEndDateStr);
return endTime.getTime() < time.getTime();
if (this.msg.QEndDateStr == null) {
return false;
} else {
let endTime = new Date(this.msg.QEndDateStr)
return endTime.getTime() < time.getTime()
}
}
},
pickerOptions2: {
......@@ -577,7 +581,6 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
console.log(this.dataList,'dataListssssssssss');
} else {
this.Error(res.data.message);
}
......@@ -611,7 +614,6 @@
if (res.data.resultCode == 1) {
this.LeaderList = res.data.data.pageData;
this.noTaskLeaderMsg.PageCount = res.data.data.pageCount;
console.log(this.LeaderList,'leaderlist');
} else {
this.Error(res.data.message);
}
......@@ -806,6 +808,10 @@
mounted() {
this.msg.QTCID = this.$route.query.id;
if(this.msg.QTCID!=undefined){
this.msg.QStartDateStr='';
this.msg.QEndDateStr='';
}
this.getCountryList();
this.GetTeamSaleStateList();
this.getList();
......
src/components/LeaderManagement/leaderPay.vue
View file @ db71fdb6
......@@ -68,7 +68,7 @@
{{item.CostPrice*(Number(item.TransferNum)+1)+item.HighSpeedPrice}}
</td>
<td class="jdtd" valign="middle">
{{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
{{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.PayType ==5 ?'实物抵扣' :'')))):''}}
</td>
<td class="jdtd" valign="middle">
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ db71fdb6
......@@ -65,9 +65,11 @@
<span v-if="item.PayType === 1">现付</span>
<span v-else-if="item.PayType === 2">公司结算</span>
<span v-else-if="item.PayType === 3">预付</span>
<span v-else-if="item.PayType ===6">合团公司支付</span>
<span v-else-if="item.PayType === 7">自由活动-无用车</span>
<span v-else-if="item.PayType === 6">合团公司支付</span>
<span v-else-if="item.PayType === 8">酒店接送~免車資</span>
<span v-else></span>
</br>
</br>
<span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td>
<td>
......@@ -77,7 +79,9 @@
<span v-if="item.HighSpeedPayType === 1">现付</span>
<span v-else-if="item.HighSpeedPayType === 2">公司结算</span>
<span v-else-if="item.HighSpeedPayType === 3">预付</span>
<span v-else-if="item.HighSpeedPayType ===6">合团公司支付</span>
<span v-else-if="item.HighSpeedPayType ===6">合团公司支付</span>
<span v-else-if="item.HighSpeedPayType === 7">自由活动-无用车</span>
<span v-else-if="item.HighSpeedPayType === 8">酒店接送~免車資</span>
<span v-else></span>
</br>
<span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
......@@ -187,8 +191,8 @@
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="5">
{{subItem.Remarks}}
......@@ -261,8 +265,8 @@
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
......@@ -337,8 +341,8 @@
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
......@@ -598,14 +602,15 @@
busTotalPrice(obj) {
let totalPrice = 0
obj.forEach(item => {
totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0) + Number(item.StopPrice)
totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(
item.HighSpeedPrice) : 0) + Number(item.StopPrice)
})
return this.moneyFormat(totalPrice)
},
hotelTotalPrice(obj) {
let totalPrice = 0
obj.forEach(x => {
if(x.PayStyle === 1){
if (x.PayStyle === 1) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1 - x.RebateRatio / 100)
} else {
totalPrice += 0
......@@ -618,7 +623,7 @@
obj.forEach(x => {
totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
})
if(sObj.PayStyle !== 1) {
if (sObj.PayStyle !== 1) {
totalPrice = 0
}
return this.moneyFormat(totalPrice)
......@@ -628,7 +633,7 @@
obj.forEach(x => {
totalPrice += x.PeoplePrice * (x.UsePeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
})
if(sObj.PayStyle !== 1) {
if (sObj.PayStyle !== 1) {
totalPrice = 0
}
return this.moneyFormat(totalPrice)
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ db71fdb6
......@@ -70,7 +70,7 @@
<td v-if="childIndex==0" :rowspan="3">
<el-select class='w160 sel' v-model='subItem.NewDiningID' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getDingList(item)' @change='sendValue(subItem,item)'>
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.Name' :value='itemHotel.ID'
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
:key='itemHotel.ID'></el-option>
</el-select>
</td>
......
src/components/SalesModule/groupTourOrder.vue
View file @ db71fdb6
......@@ -1709,7 +1709,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'" @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>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ db71fdb6
......@@ -1782,7 +1782,7 @@
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;" class="groupTourOrder_remarks_btn"></el-button>
<el-button v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder" slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;" class="groupTourOrder_remarks_btn"></el-button>
</el-popover>
</div>
</div>
......
src/components/SalesModule/productQuery.vue
View file @ db71fdb6
......@@ -709,7 +709,7 @@
<th width="100">日期</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>
<template v-for="subItem in item.HotelOrderListReports">
<tr v-for="(childItem,childIndex) in subItem.SubList">
......@@ -732,12 +732,6 @@
</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="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)"> {{childItem.CreateDateStr}}</template>
</td>
</tr>
</template>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ db71fdb6
......@@ -1238,7 +1238,6 @@
err => {}
)
},
//验证大小
checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum)
......
src/components/busManagement/BusInfo.vue
View file @ db71fdb6
......@@ -129,6 +129,7 @@
background: #EAEAEA !important;
text-align: center;
}
.disClick {
background-color: #d1d1d1;
color: #fff;
......@@ -265,20 +266,24 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="付款方式" min-width="150" >
<el-table-column label="付款方式" min-width="150">
<template slot-scope="scope">
<el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')">
<el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')"
@change="PayTypeChange(scope.row)">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
<el-option label='合团公司支付' :value='6'></el-option>
<el-option label='自由活动-无用车' :value='7'></el-option>
<el-option label="酒店接送~免車資" :value='8'></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="合团支付团号" min-width="150" >
<el-table-column label="合团支付团号" min-width="150">
<template slot-scope="scope">
<el-input class='w120' type="text" v-model='scope.row.PayTypeTCNUM' v-show="scope.row.PayType==6"></el-input>
<el-input class='w120' type="text" v-model='scope.row.PayTypeTCNUM' v-show="scope.row.PayType==6">
</el-input>
</template>
</el-table-column>
<el-table-column label="定团号" min-width="230">
......@@ -319,12 +324,14 @@
<el-table-column label="高速费用付款方式" min-width="150">
<template slot-scope="scope">
<div>
<el-select class='sel' v-model='scope.row.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')">
<el-select class='sel' v-model='scope.row.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')" @change="PayTypeChange(scope.row)">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
<el-option label='合团公司支付' :value='6'></el-option>
<el-option label='自由活动-无用车' :value='7'></el-option>
<el-option label="酒店接送~免車資" :value='8'></el-option>
</el-select>
</div>
</template>
......@@ -357,8 +364,10 @@
</el-table-column>
</el-table>
<div class="upBtnList">
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)" :disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)" :disabled="disButton" value="保存" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)"
:disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)"
:disabled="disButton" value="保存" />
</div>
</el-form>
</div>
......@@ -511,12 +520,20 @@
};
},
methods: {
PayTypeChange(obj) {
if (obj.PayType == 7) {
obj.CostPrice = 0;
}
if (obj.HighSpeedPayType == 7) {
obj.HighSpeedPrice = 0;
}
},
/*获取车辆成本价格*/
getBusPrice(obj) {
let tempCostFee = 0;
var tempHighSpeedFee = 0;
if (obj.BusType) {
obj.PayType=2;
obj.PayType = 2;
obj.HighSpeedPayType = 1;
let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
if (busTypeObj) {
......@@ -534,17 +551,15 @@
tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee);
}
});
if(obj.HighSpeedPrice==0)
{
obj.HighSpeedPrice = tempHighSpeedFee;
if (obj.HighSpeedPrice == 0) {
obj.HighSpeedPrice = tempHighSpeedFee;
}
if(obj.CostPrice==0)
{
obj.CostPrice = tempCostFee;
if (obj.CostPrice == 0) {
obj.CostPrice = tempCostFee;
}
}
}else{
obj.PayType=null;
} else {
obj.PayType = null;
}
},
AddSubItem(item) {
......
src/plug/index.js
View file @ db71fdb6
......@@ -121,7 +121,7 @@ export default {
domainUrl = "http://192.168.2.214:8082"; //214主域名
domainUrl = "http://192.168.2.65:8025"; //214主域名
// domainUrl = "http://192.168.0.119:8082";
domainUrl = "http://192.168.2.16:8083";
domainUrl = "http://127.0.0.1";
// domainUrl = "http://reborn.oytour.com"
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
......@@ -312,25 +312,25 @@ export default {
if (msg == null || msg == "") {
msg = {}
}
var apiNewurl = this.domainManager().DomainUrl;
var apiNewurl = this.domainManager().PostUrl;
var timestamp = (new Date()).valueOf();
apiNewurl = apiNewurl + "/Api/Trip/" + cmd;
if (this.$route.path.toLowerCase() == "/signature") {
this.$router.push({
path: '/signature'
})
} else {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/supplierLogin") {
this.$router.push({
path: '/login'
path: '/supplierLogin'
})
}
}
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
if (this.getLocalStorageSupplier() != null) {
token = this.getLocalStorageSupplier().Token;
key = this.getLocalStorageSupplier().SecretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
......@@ -340,7 +340,7 @@ export default {
"timestamp": timestamp,
"token": token,
"sign": md5Str,
"uid": this.getLocalStorage().EmployeeId
"uid": this.getLocalStorageSupplier()!=null?this.getLocalStorageSupplier().SupplierAccountId:0
}
this.$http.post(apiNewurl, postData, {
......@@ -352,7 +352,7 @@ export default {
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({
path: '/login'
path: '/supplierLogin'
});
} else if (res.resultCode == 10005) {
this.$router.go(-1);
......@@ -465,6 +465,15 @@ export default {
}
},
//获取登录的供应商信息
Vue.prototype.getLocalStorageSupplier = function () {
var localStorageData = window.localStorage["SupplierInfo"];
if (localStorageData !== undefined && localStorageData != 'undefined') {
return JSON.parse(localStorageData);
} else {
return null;
}
},
//PDF预览
Vue.prototype.previewPDF = function (url) {
......
src/router/config.js
View file @ db71fdb6
import login from '../components/Login'
import supplierLogin from '../components/SupplierLogin'
import index from '../components/index'
import supplierIndex from '../components/SupplierIndex'
export default {
routes: [{
path: '/',
......@@ -696,46 +698,6 @@ export default {
title: '酒店查询统计'
},
},
{
path: '/HotelManagement2', //供应商->酒店管理
name: 'HotelManagement2',
component: resolve => require(['@/components/Supplier/HotelManagement'], resolve),
meta: {
title: '酒店管理'
},
},
{
path: '/HotelSalesBoard2', //供应商->酒店统计
name: 'HotelSalesBoard2',
component: resolve => require(['@/components/Supplier/HotelSalesBoard'], resolve),
meta: {
title: '酒店统计'
},
},
{
path: '/HotelTotalStock2', //供应商->总库存看板
name: 'HotelTotalStock2',
component: resolve => require(['@/components/Supplier/HotelTotalStock'], resolve),
meta: {
title: '总库存看板'
},
},
{
path: '/roomQuery2', //供应商->定房查询
name: 'roomQuery2',
component: resolve => require(['@/components/Supplier/roomQuery'], resolve),
meta: {
title: '定房查询'
},
},
{
path: '/HotelQueryList2', //供应商->酒店查询
name: 'HotelQueryList2',
component: resolve => require(['@/components/Supplier/HotelQueryList'], resolve),
meta: {
title: '酒店查询'
},
},
{
path: '/RestauranOrder', //餐厅订单信息
name: 'RestauranOrder',
......@@ -3404,6 +3366,56 @@ export default {
meta: {
title: '领队报账'
}
}
},
{
path: '/supplierLogin',//供应商登录
name: 'supplierLogin',
component: supplierLogin
},
{
path: '/supplierIndex',//供应商首页
name: 'supplierIndex',
component: supplierIndex,
children: [ {
path: '/HotelManagement2', //供应商->酒店管理
name: 'HotelManagement2',
component: resolve => require(['@/components/Supplier/HotelManagement'], resolve),
meta: {
title: '酒店管理'
},
},
{
path: '/HotelSalesBoard2', //供应商->酒店统计
name: 'HotelSalesBoard2',
component: resolve => require(['@/components/Supplier/HotelSalesBoard'], resolve),
meta: {
title: '酒店统计'
},
},
{
path: '/HotelTotalStock2', //供应商->总库存看板
name: 'HotelTotalStock2',
component: resolve => require(['@/components/Supplier/HotelTotalStock'], resolve),
meta: {
title: '总库存看板'
},
},
{
path: '/roomQuery2', //供应商->定房查询
name: 'roomQuery2',
component: resolve => require(['@/components/Supplier/roomQuery'], resolve),
meta: {
title: '定房查询'
},
},
{
path: '/HotelQueryList2', //供应商->酒店查询
name: 'HotelQueryList2',
component: resolve => require(['@/components/Supplier/HotelQueryList'], resolve),
meta: {
title: '酒店查询'
},
}]
},
]
}
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