Skip to content

S
SuperMan
Commit 4e10b00f authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 40ce9508 0e3a1ecc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2896 additions and 353 deletions
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 4e10b00f
...@@ -87,16 +87,19 @@ ...@@ -87,16 +87,19 @@
{{item.GuideName}} {{item.GuideName}}
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].ShopNum:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].ShopNum:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopName}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopName}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterTimeStr:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterTimeStr:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterNum:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterNum:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList"> <template v-for="subItem in item.CommonReport.PriceShopList">
...@@ -110,12 +113,13 @@ ...@@ -110,12 +113,13 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--佣金领取状况--> <!--佣金领取状况-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].CommissionStatusStr:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].CommissionStatusStr:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--凭证上传--> <!--凭证上传-->
<div v-for="subItem in item.CommonReport.PriceShopList" v-if="subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0"> <div v-for="subItem in item.CommonReport.PriceShopList" v-if="subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0">
<p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].imgList" title="点击下载" @click="downLoadPZ(img)" <p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].imgList" title="点击下载" @click="downLoadPZ(img)"
v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p> v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
</div> </div>
</td> </td>
...@@ -127,7 +131,8 @@ ...@@ -127,7 +131,8 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--导游佣金调整--> <!--导游佣金调整-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].GuideCommission:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].GuideCommission:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList"> <template v-for="subItem in item.CommonReport.PriceShopList">
...@@ -137,15 +142,18 @@ ...@@ -137,15 +142,18 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--其余扣除(返佣余额)--> <!--其余扣除(返佣余额)-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].OtherDeduct:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].OtherDeduct:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--返佣总计(返佣余额)--> <!--返佣总计(返佣余额)-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].BackTotalMoney:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].BackTotalMoney:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--汇率--> <!--汇率-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].DMCRate:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].DMCRate:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--地接OP凭证--> <!--地接OP凭证-->
...@@ -154,8 +162,8 @@ ...@@ -154,8 +162,8 @@
v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p> v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
</div> </div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0' > <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList" > <template v-for="subItem in item.CommonReport.PriceShopList">
<div> <div>
<!--subItem.ShopDetailsList--> <!--subItem.ShopDetailsList-->
<p style="cursor: pointer;color:blue;" @click="CreateBill(subItem.ShopDetailsList,outItem.StaticsReportList)">生成单据</p> <p style="cursor: pointer;color:blue;" @click="CreateBill(subItem.ShopDetailsList,outItem.StaticsReportList)">生成单据</p>
...@@ -313,31 +321,35 @@ ...@@ -313,31 +321,35 @@
}, },
//生成单据 //生成单据
CreateBill(ShopDetailsList, outItem) { CreateBill(ShopDetailsList, outItem) {
this.loading = true; var that = this;
var array = []; this.Confirm('是否生成财务单据？', function () {
outItem.forEach(subItem => { that.loading = true;
var obj = { var array = [];
LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0, outItem.forEach(subItem => {
LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "", var obj = {
TCID: subItem.TCID, LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0,
GuideId: subItem.GuideId != null ? subItem.GuideId : 0, LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "",
GuideName: subItem.GuideName != null ? subItem.GuideName : "", TCID: subItem.TCID,
TCNUM: subItem.TCNUMS, GuideId: subItem.GuideId != null ? subItem.GuideId : 0,
} GuideName: subItem.GuideName != null ? subItem.GuideName : "",
array.push(obj) TCNUM: subItem.TCNUMS,
}
array.push(obj)
});
var billMsg = {
ShopDetailsList: ShopDetailsList,
LeaderGuide: array
};
that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
that.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
} else {
that.Error(res.data.message);
}
}, err => {})
}); });
var billMsg = {
ShopDetailsList: ShopDetailsList,
LeaderGuide: array
};
this.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
} else {
this.$message.error(res.data.message)
}
}, err => {})
}, },
}, },
mounted() { mounted() {
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 4e10b00f
...@@ -577,55 +577,55 @@ ...@@ -577,55 +577,55 @@
<div class="btmAddStore" :class="{'fillShow':fillShow}"> <div class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div> <div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div>
<div style="height:250px;overflow-y: auto;"> <div style="height:250px;overflow-y: auto;">
<table class="impoTable" style="border-spacing: 0px 1px;"> <table class="impoTable" style="border-spacing: 0px 1px;" v-loading="tabLoading">
<thead> <thead>
<tr> <tr>
<th width="200">团号</th> <th width="200">团号</th>
<th>店名</th> <th>店名</th>
<th>进店时间</th> <th>进店时间</th>
<th>导游名称</th> <th>导游名称</th>
<th>领队名称</th> <th>领队名称</th>
<th>购物总额</th> <th>购物总额</th>
<th>组团社提成</th> <th>组团社提成</th>
<th>领队提成</th> <th>领队提成</th>
<th>导游提成</th> <th>导游提成</th>
<th>汇率</th> <th>汇率</th>
<th>币种</th> <th>币种</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="(item,index) in importData" :key="item.subCode"> <tr v-for="(item,index) in importData" :key="item.subCode">
<td :class="{'redType':item.TCIDExist==-1}"> <td :class="{'redType':item.TCIDExist==-1}">
<el-input v-model="item.TCNUM" class="w150"></el-input> <el-input v-model="item.TCNUM" class="w150"></el-input>
</td> </td>
<td :class="{'redType':item.ShoppingNameExist==-1}"> <td :class="{'redType':item.ShoppingNameExist==-1}">
<el-select clearable class="w150" v-model='item.ShoppingID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.ShoppingID' filterable :placeholder="$t('hotel.hotel_area')">
<el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td>{{item.EnterTime}}</td> <td>{{item.EnterTime}}</td>
<td :class="{'redType':item.GuideExist==-1}"> <td :class="{'redType':item.GuideExist==-1}">
<el-select clearable class="w150" v-model='item.GuideID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.GuideID' filterable :placeholder="$t('hotel.hotel_area')">
<el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td :class="{'redType':item.LeaderName==-1}"> <td :class="{'redType':item.LeaderName==-1}">
<el-select clearable class="w150" v-model='item.LeaderID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.LeaderID' filterable :placeholder="$t('hotel.hotel_area')">
<el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td>{{item.NowTotalPrice}}({{item.TotalPrice}}*{{item.Rate}})</td> <td>{{item.TotalPrice}}</td>
<td>{{item.NowGroupExtract}}({{item.GroupExtract}}*{{item.Rate}})</td> <td>{{item.GroupExtract}}</td>
<td>{{item.NowLeaderExtract}}({{item.LeaderExtract}}*{{item.Rate}})</td> <td>{{item.LeaderExtract}}</td>
<td>{{item.NowGuideExtract}}({{item.GuideExtract}}*{{item.Rate}})</td> <td>{{item.GuideExtract}}</td>
<td>{{item.Rate}}</td> <td>{{item.Rate}}</td>
<td :class="{'redType':item.CurrencyExist==-1}">{{item.Currency}}</td> <td :class="{'redType':item.CurrencyExist==-1}">{{item.Currency}}</td>
<td><span class="delInfo" @click="delInfo(index)">删除</span></td> <td><span class="delInfo" @click="delInfo(index)">删除</span></td>
</tr> </tr>
</thead> </thead>
</table> </table>
</div> </div>
<div class="btmBtn impotBtn"> <div class="btmBtn impotBtn">
<input type="button" class="normalBtn" @click="importInfo" value="确认导入" /> <input type="button" class="normalBtn" @click="importInfo" value="确认导入" />
...@@ -690,6 +690,8 @@ ...@@ -690,6 +690,8 @@
AddMsgProvinceList: [], AddMsgProvinceList: [],
//城市列表 //城市列表
AddMsgCityList: [], AddMsgCityList: [],
//表格Loading
tabLoading:false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 14, pageSize: 14,
...@@ -751,7 +753,6 @@ ...@@ -751,7 +753,6 @@
var imgUrl = this.domainManager().AliUrl + str; var imgUrl = this.domainManager().AliUrl + str;
this.imgArray.push(imgUrl); this.imgArray.push(imgUrl);
this.PicPathArray.push(str); this.PicPathArray.push(str);
// this.updatePic();
}); });
}, },
//更新购物店图片 //更新购物店图片
...@@ -773,7 +774,6 @@ ...@@ -773,7 +774,6 @@
delImg(index) { delImg(index) {
this.PicPathArray.splice(index, 1); this.PicPathArray.splice(index, 1);
this.imgArray.splice(index, 1); this.imgArray.splice(index, 1);
// this.updatePic();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
...@@ -931,7 +931,6 @@ ...@@ -931,7 +931,6 @@
this.addMsg.BusinessHours = ""; this.addMsg.BusinessHours = "";
} }
this.addMsg.PicPath = this.PicPathArray.toString(); this.addMsg.PicPath = this.PicPathArray.toString();
// console.log("addMsg",this.addMsg);
this.apipost( this.apipost(
"Shopping_Post_Set", "Shopping_Post_Set",
this.addMsg, this.addMsg,
...@@ -953,7 +952,7 @@ ...@@ -953,7 +952,7 @@
ID: ID ID: ID
}; };
this.imgArray = []; this.imgArray = [];
this.PicPathArray=[]; this.PicPathArray = [];
this.titleInfo = "修改购物店"; this.titleInfo = "修改购物店";
this.apipost( this.apipost(
"Shopping_Post_Get", "Shopping_Post_Get",
...@@ -1051,35 +1050,35 @@ ...@@ -1051,35 +1050,35 @@
this.importData[index].infoShow = true; this.importData[index].infoShow = true;
}, },
delInfo(index) { delInfo(index) {
this.$confirm("是否删除?", "提示", { var that = this;
confirmButtonText: "确定", this.Confirm('是否删除？删除后将不能恢复', function () {
cancelButtonText: "取消", that.Success("删除成功!");
type: "warning" that.importData.splice(index, 1);
}) });
.then(() => {
this.Success("删除成功!");
this.importData.splice(index, 1);
})
.catch(() => {
this.Info("已取消删除");
});
}, },
//导入数据
importInfo() { importInfo() {
let msg = this.importData; var that = this;
this.apipost( this.Confirm('是否导入此数据？', function () {
"ShoppingInfo_Post_Set", that.tabLoading = true;
msg, let msg = that.importData;
res => { that.apipost(
if (res.data.resultCode == 1) { "ShoppingInfo_Post_Set",
this.fillShow = false; msg,
this.Success("导入成功"); res => {
this.getList(); that.tabLoading = false;
} else { if (res.data.resultCode == 1) {
this.Error(res.data.message); that.fillShow = false;
} that.Success("导入成功");
}, that.getList();
err => {} } else {
); that.Error(res.data.message);
}
},
err => {}
);
});
}, },
getDownList() { getDownList() {
let msg = {}; let msg = {};
...@@ -1110,30 +1109,23 @@ ...@@ -1110,30 +1109,23 @@
// this.addMsg.Address = msg.address; // this.addMsg.Address = msg.address;
}, },
delShoppingStore(ID) { delShoppingStore(ID) {
this.$confirm("是否删除?", "提示", { var that = this;
confirmButtonText: "确定", this.Confirm('是否删除？删除后将不能恢复', function () {
cancelButtonText: "取消", that.Success("删除成功!");
type: "warning" var msg = {
}) ID: ID
.then(() => { };
this.Success("删除成功!"); that.apipost(
var msg = { "Shopping_Post_Remove",
ID: ID msg,
}; res => {
this.apipost( if (res.data.resultCode == 1) {
"Shopping_Post_Remove", that.getList();
msg, }
res => { },
if (res.data.resultCode == 1) { null
this.getList(); );
} });
},
null
);
})
.catch(() => {
this.Info("已取消删除!");
});
} }
}, },
mounted() { mounted() {
......
src/components/Ticketing/IndividualTicketOrder.vue 0 → 100644
View file @ 4e10b00f
This diff is collapsed.
src/components/Ticketing/IndividualTicketOrderDetails.vue 0 → 100644
View file @ 4e10b00f
This diff is collapsed.
src/components/Ticketing/individualTicket.vue
View file @ 4e10b00f
...@@ -470,6 +470,10 @@ ...@@ -470,6 +470,10 @@
<p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p> <p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
</div> </div>
</el-col> </el-col>
<el-col :span="2" class="vmiddle">
<el-button type="primary" size="mini" @click="goUrl('/IndividualTicketOrderDetails',item)">查看详情</el-button>
</el-col>
</el-row> </el-row>
<el-row :gutter="0"> <el-row :gutter="0">
...@@ -541,6 +545,17 @@ ...@@ -541,6 +545,17 @@
}; };
}, },
methods: { methods: {
goUrl(path, item) {
// console.log(item);
this.$router.push({
path: path,
query: {
ID: item.AirProductId,
blank: 'y',
tab: '散客机票订单详情'
}
});
},
getList() { getList() {
this.loading = true; this.loading = true;
if(this.msg.ID==''){ if(this.msg.ID==''){
...@@ -550,6 +565,7 @@ ...@@ -550,6 +565,7 @@
"ticket_get_GetAirTicketScatteringPageList", "ticket_get_GetAirTicketScatteringPageList",
this.msg, this.msg,
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
......
src/components/confirmationOrderDownLoad.vue
View file @ 4e10b00f
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
<a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') --> <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息--> <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" /> <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
......
src/plug/index.js
View file @ 4e10b00f
...@@ -149,11 +149,10 @@ export default { ...@@ -149,11 +149,10 @@ export default {
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN", GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
//google地图图片地址 //google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com", GoogleMapImageUrl: "http://super.oytour.com",
// "http://upload.oytour.com" //上传站点
UploadUrl: locationName.indexOf('oytour') !== -1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120", UploadUrl: locationName.indexOf('oytour') !== -1||locationName.indexOf('viitto')!==-1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
// 读取文件 //文件站点
ViittoFileUrl:'http://imgfile.oytour.com' ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130'
// UploadUrl: "http://upload.oytour.com"
}; };
return obj; return obj;
}, },
...@@ -228,6 +227,7 @@ export default { ...@@ -228,6 +227,7 @@ export default {
successCall(res); successCall(res);
}, faildCall) }, faildCall)
} }
//HTTP提交数据 //HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) { Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
...@@ -320,9 +320,7 @@ export default { ...@@ -320,9 +320,7 @@ export default {
successCall(res); successCall(res);
}).catch(function (res) {}); }).catch(function (res) {});
}, },
Vue.prototype.getCookieItem = function () {
return JSON.parse(this.getCookie("userInfo"))
},
Vue.prototype.getLocalStorage = function () { Vue.prototype.getLocalStorage = function () {
var localStorageData = window.localStorage["userInfo"]; var localStorageData = window.localStorage["userInfo"];
if (localStorageData !== undefined && localStorageData!='undefined') { if (localStorageData !== undefined && localStorageData!='undefined') {
...@@ -331,23 +329,7 @@ export default { ...@@ -331,23 +329,7 @@ export default {
return null; return null;
} }
}, },
Vue.prototype.getCookie = function (cookieName) {
var strCookie = document.cookie;
var arrCookie = strCookie.split("; ");
for (var i = 0; i < arrCookie.length; i++) {
var arr = arrCookie[i].split("=");
if (cookieName == arr[0]) {
return arr[1];
}
}
return "";
},
Vue.prototype.getLoginUser = function () {
return this.loginUser
},
Vue.prototype.setLoginUser = function (user) {
this.loginUser = user
}
//PDF预览 //PDF预览
Vue.prototype.previewPDF = function (url) { Vue.prototype.previewPDF = function (url) {
...@@ -470,6 +452,32 @@ export default { ...@@ -470,6 +452,32 @@ export default {
}); });
} }
}, },
//上传文件到本地服务器
Vue.prototype.UploadSelfFile=function(path,files,successCall)
{
if (files && files.length > 0) {
let nameList = new Array()
for (let index = 0; index < files.length; index++) {
nameList.push(this.random_string());
}
let that = this;
co(function* () {
for (let index = 0; index < files.length; index++) {
let fileName = nameList[index]
fileName = path + fileName + "." + files[index].name.split('.').pop()
var formData = new FormData();
var uploadUrl=that.domainManager().UploadUrl+"/Upload?filePath="+path;
formData.append("myfile", files[index]);
that.$http.post(uploadUrl, formData, {})
.then(res => {
successCall(res);
})
}
}).catch(function (err) {
console.log("上传文件出错"+err);
});
}
}
Vue.prototype.uploadBlob = function (path, files, successCall) { Vue.prototype.uploadBlob = function (path, files, successCall) {
if (files && files.length > 0) { if (files && files.length > 0) {
......
src/router/config.js
View file @ 4e10b00f
...@@ -1017,6 +1017,21 @@ export default { ...@@ -1017,6 +1017,21 @@ export default {
meta: { meta: {
title: '散客机票' title: '散客机票'
}, },
},
,{
path: '/IndividualTicketOrder', //散客今日机票订单
name: 'IndividualTicketOrder',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
meta: {
title: '散客机票今日订单'
},
},{
path: '/IndividualTicketOrderDetails', //散客机票订单详情
name: 'IndividualTicketOrderDetails',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrderDetails'], resolve),
meta: {
title: '散客机票订单详情'
},
},{ },{
path: '/PassengerList', //旅客名单 path: '/PassengerList', //旅客名单
name: 'PassengerList', name: 'PassengerList',
......
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